cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source
This commit is contained in:
PsiOmega
2015-02-26 08:22:25 +01:00
parent 586ab164f8 f14922f1f8
commit e7653e1ed5
97 changed files with 1252 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,7 +204,7 @@
/obj/machinery/atmospherics/binary/passive_gate/Topic(href,href_list)
if(..()) return
if(..()) return 1
if(href_list["toggle_valve"])
unlocked = !unlocked

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

@@ -190,7 +190,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 1
if(href_list["power"])
use_power = !use_power

2
code/ATMOSPHERICS/components/omni_devices/filter.dm
View File

@@ -155,7 +155,7 @@
return null
/obj/machinery/atmospherics/omni/filter/Topic(href, href_list)
if(..()) return
if(..()) return 1
switch(href_list["command"])
if("power")
if(!configuring)

2
code/ATMOSPHERICS/components/omni_devices/mixer.dm
View File

@@ -172,7 +172,7 @@
return data
/obj/machinery/atmospherics/omni/mixer/Topic(href, href_list)
if(..()) return
if(..()) return 1
switch(href_list["command"])
if("power")

2
code/ATMOSPHERICS/components/trinary_devices/filter.dm
View File

@@ -199,7 +199,7 @@
/obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
if(..())
return
return 1
usr.set_machine(src)
src.add_fingerprint(usr)
if(href_list["filterset"])

2
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
View File

@@ -156,7 +156,7 @@
return
/obj/machinery/atmospherics/trinary/mixer/Topic(href,href_list)
if(..()) return
if(..()) return 1
if(href_list["power"])
use_power = !use_power
if(href_list["set_press"])

3
code/ATMOSPHERICS/components/unary/cold_sink.dm
View File

@@ -93,6 +93,8 @@
ui.set_auto_update(1)
/obj/machinery/atmospherics/unary/freezer/Topic(href, href_list)
if(..())
return 1
if(href_list["toggleStatus"])
use_power = !use_power
update_icon()
@@ -107,7 +109,6 @@
set_power_level(new_setting)
add_fingerprint(usr)
return 1
/obj/machinery/atmospherics/unary/freezer/process()
..()

3
code/ATMOSPHERICS/components/unary/heat_source.dm
View File

@@ -113,6 +113,8 @@
ui.set_auto_update(1)
/obj/machinery/atmospherics/unary/heater/Topic(href, href_list)
if(..())
return 1
if(href_list["toggleStatus"])
use_power = !use_power
update_icon()
@@ -127,7 +129,6 @@
set_power_level(new_setting)
add_fingerprint(usr)
return 1
//upgrading parts
/obj/machinery/atmospherics/unary/heater/RefreshParts()