From 43065cb0620faa9acee1c8dedc3b8d062e0a0b0c Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 14 Jan 2020 11:12:10 +1000 Subject: [PATCH] Changes harpoons push mode to teleport user and not everything else (pull mode unchanged) --- .../modules/vore/fluffstuff/guns/bsharpoon.dm | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/code/modules/vore/fluffstuff/guns/bsharpoon.dm b/code/modules/vore/fluffstuff/guns/bsharpoon.dm index 0f7bc335a1..e8ffea51cd 100644 --- a/code/modules/vore/fluffstuff/guns/bsharpoon.dm +++ b/code/modules/vore/fluffstuff/guns/bsharpoon.dm @@ -62,18 +62,25 @@ var/turf/FromTurf = mode ? get_turf(user) : get_turf(A) var/turf/ToTurf = mode ? get_turf(A) : get_turf(user) - for(var/obj/O in FromTurf) - if(O.anchored) continue - if(prob(5)) - O.forceMove(pick(trange(24,user))) - else - O.forceMove(ToTurf) + if(mode) + if(user in FromTurf) + if(prob(5)) + user.forceMove(pick(trange(24,user))) + else + user.forceMove(ToTurf) + else + for(var/obj/O in FromTurf) + if(O.anchored) continue + if(prob(5)) + O.forceMove(pick(trange(24,user))) + else + O.forceMove(ToTurf) - for(var/mob/living/M in FromTurf) - if(prob(5)) - M.forceMove(pick(trange(24,user))) - else - M.forceMove(ToTurf) + for(var/mob/living/M in FromTurf) + if(prob(5)) + M.forceMove(pick(trange(24,user))) + else + M.forceMove(ToTurf) /obj/item/weapon/bluespace_harpoon/attack_self(mob/living/user as mob) return chande_fire_mode(user)