Merge pull request #3128 from Citadel-Station-13/upstream-merge-31180

[MIRROR] removes carp piggyback exploit
This commit is contained in:
LetterJay
2017-10-04 18:43:31 -04:00
committed by GitHub
+2 -2
View File
@@ -90,8 +90,6 @@
new impact_effect_type(target_loca, target, src)
return 0
var/mob/living/L = target
if(L.buckled && ismob(L.buckled))
L = L.buckled
if(blocked != 100) // not completely blocked
if(damage && L.blood_volume && damage_type == BRUTE)
var/splatter_dir = dir
@@ -178,6 +176,8 @@
var/mob/living/picked_mob = pick(mobs_list)
if(!prehit(picked_mob))
return FALSE
if(ismob(picked_mob.buckled))
picked_mob = picked_mob.buckled
picked_mob.bullet_act(src, def_zone)
qdel(src)
return TRUE