cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 14:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into power-net

Browse Source 
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/pipes.dm
This commit is contained in:
mwerezak
2014-07-18 15:02:07 -04:00
parent 46533d299c c4abe1f5d5
commit c46904a3b6
77 changed files with 1578 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/ATMOSPHERICS/components/binary_devices/pump.dm
View File

@@ -42,7 +42,6 @@ Thus, the two variables affect pump operation are set in New():
on = 1
/obj/machinery/atmospherics/binary/pump/update_icon()
if(!powered())
icon_state = "off"
@@ -108,7 +107,7 @@ Thus, the two variables affect pump operation are set in New():
sink.add_thermal_energy(power_draw)
handle_power_draw(power_draw)
else
handle_power_draw(idle_power_usage)
handle_power_draw(idle_power_usage)
if(network1)
network1.update = 1
@@ -247,7 +246,7 @@ Thus, the two variables affect pump operation are set in New():
return
/obj/machinery/atmospherics/binary/pump/Topic(href,href_list)
if(..()) return
if(..()) return
if(href_list["power"])
on = !on
@@ -291,5 +290,5 @@ Thus, the two variables affect pump operation are set in New():
"[user] unfastens \the [src].", \
"\blue You have unfastened \the [src].", \
"You hear ratchet.")
new /obj/item/pipe(loc, make_from=src)
new /obj/item/pipe(loc, make_from=src)
del(src)

2
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
View File

@@ -16,4 +16,4 @@
if(!powered())
icon_state = "off"
else
icon_state = "[on ? "on" : "off"]"
icon_state = "[on ? "on" : "off"]"

11
code/ATMOSPHERICS/components/unary/vent_pump.dm
View File

@@ -83,8 +83,13 @@
air_contents.volume = 1000
/obj/machinery/atmospherics/unary/vent_pump/update_icon(var/safety = 0)
if(!check_icon_cache())
if(!check_icon_cache())
return
if (!node)
on = 0
//broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0
if(!on)
return 0
overlays.Cut()
@@ -355,7 +360,7 @@
if(signal.data["checks_toggle"] != null)
pressure_checks = (pressure_checks?0:3)
if(signal.data["direction"] != null)
pump_direction = text2num(signal.data["direction"])
@@ -398,7 +403,7 @@
if(signal.data["init"] != null)
name = signal.data["init"]
return
if(signal.data["status"] != null)
spawn(2)
broadcast_status()