Merge pull request #10881 from Ghommie/Ghommie-cit552

This commit is contained in:
kevinz000
2020-02-06 00:41:28 -07:00
committed by Dip
parent 730307bc05
commit f318dbe1b2
25 changed files with 469 additions and 452 deletions
+2 -2
View File
@@ -162,10 +162,10 @@ mob/living/get_effective_size()
else
if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle")
tmob.visible_message("<span class='danger'>[src] snatches up [tmob] underneath their tail!</span>", "<span class='userdanger'>[src]'s tail winds around you and snatches you in its coils!</span>")
tmob.mob_pickup_micro_feet(H)
//tmob.mob_pickup_micro_feet(H)
else
tmob.visible_message("<span class='danger'>[src] stomps down on [tmob], curling their toes and picking them up!</span>", "<span class='userdanger'>[src]'s toes pin you down and curl around you, picking you up!</span>")
tmob.mob_pickup_micro_feet(H)
//tmob.mob_pickup_micro_feet(H)
return 1
if(abs(tmob.get_effective_size()/get_effective_size()) >= 2)