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

Merge branch 'the-p-o-o-l' of https://github.com/Detective-Google/Citadel-Station-13 into the-p-o-o-l

Browse Source
This commit is contained in:
Detective Google
2020-02-13 00:12:13 -06:00
parent b6cbb3f505 a8aa9ac24b
commit c34617d42a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pool/pool_drain.dm
+1 -1
View File
@@ -94,7 +94,7 @@
H.adjustBruteLoss(2)
to_chat(H, "<span class='danger'>You're caught in the drain!</span>")
else
H.apply_damage(2.5, BRUTE, pick("l_leg", "r_leg")) //drain should only target the legs
H.apply_damage(2.5, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_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)
code/modules/pool/pool_main.dm
+1 -1
View File
@@ -74,7 +74,7 @@
/turf/open/pool/Exit(atom/movable/AM, atom/newloc)
if(!AM.has_gravity(src))
return ..()
if(isliving(AM) || istype(AM, /obj/structure))
if(isliving(AM) || isstructure(AM))
if(AM.throwing)
return ..() //WHEEEEEEEEEEE
if(istype(AM, /obj/structure) && isliving(AM.pulledby))