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

initial changes

Browse Source
This commit is contained in:
kevinz000
2020-01-19 16:13:05 -07:00
parent fce73c84c7
commit 90fcb4cc14
6 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pool/pool_structures.dm
+12 -7
View File
@@ -11,13 +11,18 @@
layer = ABOVE_MOB_LAYER
dir = EAST
/obj/structure/pool/ladder/attack_hand(mob/living/user as mob)
if(Adjacent(user) && user.y == y && user.swimming == 0)
user.swimming = TRUE
user.forceMove(get_step(user, get_dir(user, src))) //Either way, you're getting IN or OUT of the pool.
else if(user.loc == loc && user.swimming == TRUE)
user.swimming = FALSE
user.forceMove(get_step(user, turn(dir, 180)))
/obj/structure/pool/ladder/attack_hand(mob/living/user)
. = ..()
if(.)
return
var/is_swimming = SEND_SIGNAL(user, COMSIG_IS_SWIMMING)
if(!is_swimming)
if(user.CanReach(src))
user.AddElement(/datum/element/swimming)
user.forceMove(get_step(src, dir))
else
if(user.loc == loc)
user.forceMove(get_step(src, turn(dir, 180))) //If this moves them out the element cleans up after itself.
/obj/structure/pool/Rboard
name = "JumpBoard"