shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compile, jump board crash to ground

Browse Source
This commit is contained in:
kevinz000
2020-01-25 17:25:15 -07:00
parent 19f1eba015
commit ebff6c9f38
6 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pool/pool_drain.dm
+20 -20
View File
@@ -14,7 +14,7 @@
/// Drain mode suction range
var/drain_suck_range = 6
/// Parent controller
var/obj/machinery/pool/controller/pool_controller
var/obj/machinery/pool/controller/controller
/// Cycles left for fill/drain while active
var/cycles_left = 0
/// Mobs we are swirling around
@@ -28,8 +28,8 @@
return ..()
/obj/machinery/pool/drain/Destroy()
pool_controller.linked_drain = null
pool_controller = null
controller.linked_drain = null
controller = null
whirling_mobs = null
return ..()
@@ -40,11 +40,11 @@
if(!I.anchored && (I.w_class == WEIGHT_CLASS_SMALL))
step_towards(I, src)
if((I.w_class == WEIGHT_CLASS_TINY) && (get_dist(I, src) == 0))
I.forceMove(pool_controller.linked_filter)
I.forceMove(controller.linked_filter)
if(active)
if(filling)
if(timer-- > 0)
playsound(src, 'sound/efefcts/fillingwatter.ogg', 100, TRUE)
if(cycles_left-- > 0)
playsound(src, 'sound/effects/fillingwatter.ogg', 100, TRUE)
for(var/obj/O in orange(min(fill_push_range, 10), src))
if(!O.anchored)
step_away(O, src)
@@ -57,16 +57,16 @@
P.update_ion()
for(var/obj/effect/waterspout/S in range(1, src))
qdel(S)
pool_controller.drained = FALSE
if(pool_controller.bloody < 1000)
pool_controller.bloody /= 2
controller.drained = FALSE
if(controller.bloody < 1000)
controller.bloody /= 2
else
pool_controller.bloody /= 4
pool_controller.update_color()
controller.bloody /= 4
controller.update_color()
filling = FALSE
active = FALSE
else
if(timer-- > 0)
if(cycles_left-- > 0)
playsound(src, 'sound/effects/pooldrain.ogg', 100, TRUE)
playsound(src, "water_wade", 60, TRUE)
for(var/obj/O in orange(min(drain_suck_range, 10), src))
@@ -81,18 +81,18 @@
playsound(src, pick('sound/misc/crack.ogg','sound/misc/crunch.ogg'), 50, TRUE)
if(H.lying) //down for any reason
H.adjustBruteLoss(5)
to_chat(whirlm, "<span class='danger'>You're caught in the drain!</span>")
to_chat(H, "<span class='danger'>You're caught in the drain!</span>")
else
whirlm.apply_damage(4, BRUTE, pick("l_leg", "r_leg")) //drain should only target the legs
to_chat(whirlm, "<span class='danger'>Your legs are caught in the drain!</span>")
H.apply_damage(4, BRUTE, pick("l_leg", "r_leg")) //drain should only target the legs
to_chat(H, "<span class='danger'>Your legs are caught in the drain!</span>")
else
for(var/turf/open/pool/P in controller.linked_turfs)
P.filled = FALSE
P.update_icon()
for(var/obj/efefct/whirlpool/W in range(1, src))
for(var/obj/effect/whirlpool/W in range(1, src))
qdel(W)
linked_controller.drained = TRUE
linked_controller.mistoff()
linked_controller.mist_off()
active = FALSE
filling = TRUE
@@ -111,11 +111,11 @@
name = "Filter"
icon_state = "filter"
desc = "The part of the pool where all the IDs, ATV keys, and pens, and other dangerous things get trapped."
var/obj/machinery/pool/controller/pool_controller
var/obj/machinery/pool/controller/controller
/obj/machinery/pool/filter/Destroy()
pool_controller.linked_filter = null
pool_controller = null
controller.linked_filter = null
controller = null
return ..()
/obj/machinery/pool/filter/emag_act(mob/living/user)