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

Update living.dm

Browse Source
This commit is contained in:
Novacat
2019-09-28 03:45:36 -04:00
committed by GitHub
parent ece9471329
commit 57ae028bfa
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -5
View File
@@ -1281,11 +1281,7 @@ default behaviour is:
var/turf/end_T = get_turf(target)
if(end_T)
add_attack_logs(src,M,"Thrown via grab to [end_T.x],[end_T.y],[end_T.z]")
<<<<<<< HEAD
src.drop_from_inventory(G) //VOREStation Addition: grab exploit fix
=======
src.drop_from_inventory(G)
>>>>>>> 2ec5dbb... Merge pull request #6463 from Heroman3003/grabfix
src.drop_from_inventory(item)
if(!item || !isturf(item.loc))
@@ -1367,4 +1363,4 @@ default behaviour is:
CLONE:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=clone'>[getCloneLoss()]</a>
BRAIN:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=brain'>[getBrainLoss()]</a>
</font>
"}
"}