Skip to content

Commit

Permalink
fixes AI controlled status displays and jukeboxes on shuttles
Browse files Browse the repository at this point in the history
github hura
  • Loading branch information
unid15 committed Sep 16, 2015
1 parent c96c052 commit 8852f28
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
7 changes: 5 additions & 2 deletions code/game/machinery/status_display.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,11 @@ var/global/list/status_displays = list() //This list contains both normal status
if("Emergency shuttle timer")
mode = MODE_SHUTTLE_TIMER
if("Text message")
message1 = input(A, "Write the first line: ", "Status display", message1)
message2 = input(A, "Write the second line: ", "Status display", message2)
var/msg1 = input(A, "Write the first line: ", "Status display", message1) //First line
var/msg2 = input(A, "Write the second line: ", "Status display", message2) //Second line
mode = MODE_MESSAGE

set_message(msg1, msg2)
if("Picture")
var/new_icon = input(A, "Load an image to be desplayed on [src].", "Status display") in status_display_images

Expand Down Expand Up @@ -369,6 +371,7 @@ var/global/list/status_display_images = list(

if(new_icon)
src.mode = MODE_EMOTION
src.emotion = new_icon
src.set_picture(status_display_images[new_icon])

/obj/machinery/ai_status_display/process()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/media/jukebox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ var/global/list/loopModeNames=list(
var/pick_allowed = 1 //Allows you to pick songs
var/access_unlocked = 0 //Allows you to access settings

machine_flags = WRENCHMOVE | FIXED2WORK | EMAGGABLE | MULTITOOL_MENU | SCREWTOGGLE
machine_flags = WRENCHMOVE | FIXED2WORK | EMAGGABLE | MULTITOOL_MENU | SCREWTOGGLE | SHUTTLEWRENCH
mech_flags = MECH_SCAN_FAIL
emag_cost = 0 // because fun/unlimited uses.

Expand Down
7 changes: 7 additions & 0 deletions html/changelogs/unid_hellokitty.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
author: Unid

delete-after: True

changes:
- bugfix: Jukebox can be wrenched to shuttle floors now
- bugfix: Fixed behaviour of AI-controlled status displays

0 comments on commit 8852f28

Please sign in to comment.