This commit is contained in:
kevinz000
2020-01-25 17:13:11 -07:00
parent 483e1b2757
commit 19f1eba015
4 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -281,12 +281,12 @@
if(href_list["IncreaseTemp"])
if(CanUpTemp(usr))
temperature++
handle_temp()
update_temp()
interact_delay = world.time + 15
if(href_list["DecreaseTemp"])
if(CanDownTemp(usr))
temperature--
handle_temp()
update_temp()
interact_delay = world.time + 15
if(href_list["Activate Drain"])
if((drainable || issilicon(usr) || IsAdminGhost(usr)) && !linked_drain.active)
@@ -369,7 +369,7 @@
var/M = new /obj/effect/mist(W)
linked_mist += M
/obj/machinery/pool/controller/proc/mistoff() //Delete all /obj/effect/mist from all linked pool tiles.
/obj/machinery/pool/controller/proc/mist_off() //Delete all /obj/effect/mist from all linked pool tiles.
for(var/M in linked_mist)
qdel(M)
mist_state = FALSE
+1 -1
View File
@@ -62,7 +62,7 @@
pool_controller.bloody /= 2
else
pool_controller.bloody /= 4
pool_controller.changecolor()
pool_controller.update_color()
filling = FALSE
active = FALSE
else
+4 -4
View File
@@ -22,7 +22,7 @@
var/obj/machinery/pool/controller/P = holder
var/list/status = list()
status += "The blue light is [P.drainable ? "on" : "off"]."
status += "The red light is [P.tempunlocked ? "on" : "off"]."
status += "The red light is [P.temperature_unlocked ? "on" : "off"]."
status += "The yellow light is [P.shocked ? "on" : "off"]."
return status
@@ -32,7 +32,7 @@
if(POOL_WIRE_DRAIN)
P.drainable = FALSE
if(POOL_WIRE_TEMP)
P.tempunlocked = FALSE
P.temperature_unlocked = FALSE
if(WIRE_SHOCK)
P.shocked = !P.shocked
addtimer(CALLBACK(P, /obj/machinery/autolathe.proc/reset, wire), 60)
@@ -47,9 +47,9 @@
P.drainable = TRUE
if(POOL_WIRE_TEMP)
if(mend)
P.tempunlocked = FALSE
P.temperature_unlocked = FALSE
else
P.tempunlocked = TRUE
P.temperature_unlocked = TRUE
if(WIRE_ZAP)
P.shock(usr, 50)
if(WIRE_SHOCK)