cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 18:46:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6444 from Heroman3003/harpoonening

Browse Source 
Changes harpoons push mode to teleport user and not everything else
This commit is contained in:
Novacat
2020-01-15 17:50:04 -05:00
committed by GitHub
parent e8d40f86f3 43065cb062
commit a5b768eccc
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/guns/bsharpoon.dm
+18 -11
View File
@@ -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)