Absolut cleanup.

This commit is contained in:
PsiOmega
2014-08-25 16:48:06 +02:00
parent 23576ffdb6
commit 4ffe5f411b

View File

@@ -10,7 +10,6 @@
// Use to show shuttle ETA/ETD times
// Alert status
// And arbitrary messages set by comms computer
/obj/machinery/status_display
icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
@@ -41,7 +40,7 @@
// new display
// register for radio system
New()
/obj/machinery/status_display/New()
..()
spawn(5) // must wait for map loading to finish
if(radio_controller)
@@ -49,14 +48,13 @@
// timed process
process()
/obj/machinery/status_display/process()
if(stat & NOPOWER)
remove_display()
return
update()
emp_act(severity)
/obj/machinery/status_display/emp_act(severity)
if(stat & (BROKEN|NOPOWER))
..(severity)
return
@@ -64,8 +62,7 @@
..(severity)
// set what is displayed
proc/update()
/obj/machinery/status_display/proc/update()
if(friendc && mode!=4) //Makes all status displays except supply shuttle timer display the eye -- Urist
set_picture("ai_friend")
return
@@ -137,7 +134,7 @@
line1 = ""
update_display(line1, line2)
examine()
/obj/machinery/status_display/examine()
set src in view()
. = ..()
switch(mode)
@@ -145,7 +142,7 @@
usr << "The display says:<br>\t<xmp>[message1]</xmp><br>\t<xmp>[message2]</xmp>"
proc/set_message(m1, m2)
/obj/machinery/status_display/proc/set_message(m1, m2)
if(m1)
index1 = (length(m1) > CHARS_PER_LINE)
message1 = m1
@@ -160,29 +157,29 @@
message2 = ""
index2 = 0
proc/set_picture(state)
/obj/machinery/status_display/proc/set_picture(state)
picture_state = state
remove_display()
overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
proc/update_display(line1, line2)
/obj/machinery/status_display/proc/update_display(line1, line2)
var/new_text = {"<div style="font-size:[FONT_SIZE];color:[FONT_COLOR];font:'[FONT_STYLE]';text-align:center;" valign="top">[line1]<br>[line2]</div>"}
if(maptext != new_text)
maptext = new_text
proc/get_shuttle_timer_arrival()
/obj/machinery/status_display/proc/get_shuttle_timer_arrival()
var/timeleft = emergency_shuttle.estimate_arrival_time()
if(timeleft < 0)
return ""
return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
proc/get_shuttle_timer_departure()
/obj/machinery/status_display/proc/get_shuttle_timer_departure()
var/timeleft = emergency_shuttle.estimate_launch_time()
if(timeleft < 0)
return ""
return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
proc/get_supply_shuttle_timer()
/obj/machinery/status_display/proc/get_supply_shuttle_timer()
var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
if (!shuttle)
return "Error"
@@ -194,15 +191,13 @@
return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
return ""
proc/remove_display()
/obj/machinery/status_display/proc/remove_display()
if(overlays.len)
overlays.Cut()
if(maptext)
maptext = ""
receive_signal(datum/signal/signal)
/obj/machinery/status_display/receive_signal(datum/signal/signal)
switch(signal.data["command"])
if("blank")
mode = 0
@@ -222,8 +217,6 @@
if(supply_display)
mode = 4
/obj/machinery/ai_status_display
icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
@@ -239,23 +232,21 @@
var/emotion = "Neutral"
process()
/obj/machinery/ai_status_display/process()
if(stat & NOPOWER)
overlays.Cut()
return
update()
emp_act(severity)
/obj/machinery/ai_status_display/emp_act(severity)
if(stat & (BROKEN|NOPOWER))
..(severity)
return
set_picture("ai_bsod")
..(severity)
proc/update()
/obj/machinery/ai_status_display/proc/update()
if(mode==0) //Blank
overlays.Cut()
return
@@ -294,7 +285,6 @@
set_picture("ai_facepalm")
if("Friend Computer")
set_picture("ai_friend")
return
if(mode==2) // BSOD
@@ -302,7 +292,7 @@
return
proc/set_picture(var/state)
/obj/machinery/ai_status_display/proc/set_picture(var/state)
picture_state = state
if(overlays.len)
overlays.Cut()