Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net

This commit is contained in:
mwerezak
2014-07-16 16:17:26 -04:00
11 changed files with 386 additions and 391 deletions

View File

@@ -14,7 +14,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/binary/pump
icon = 'icons/atmos/pump.dmi'
icon_state = "map"
icon_state = "map_off"
level = 1
name = "gas pump"
@@ -38,6 +38,7 @@ Thus, the two variables affect pump operation are set in New():
var/datum/radio_frequency/radio_connection
/obj/machinery/atmospherics/binary/pump/on
icon_state = "map_on"
on = 1

View File

@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/binary/pump/high_power
icon = 'icons/atmos/volume_pump.dmi'
icon_state = "map"
icon_state = "map_off"
level = 1
name = "high power gas pump"
@@ -10,9 +10,10 @@
/obj/machinery/atmospherics/binary/pump/high_power/on
on = 1
icon_state = "map_on"
/obj/machinery/atmospherics/binary/pump/high_power/update_icon()
if(!powered())
icon_state = "off"
else
icon_state = "[on ? "on" : "off"]"
icon_state = "[on ? "on" : "off"]"