Tiger requests

This commit is contained in:
Kyep
2017-12-30 21:10:14 -08:00
parent 6d813c07e4
commit daea0d3530
3 changed files with 12 additions and 7 deletions
-3
View File
@@ -57,9 +57,6 @@
if(moving_diagonally) //no mob swap during diagonal moves.
return 1
if(ispet(src))
return 1
if(!M.buckled && !M.has_buckled_mobs())
var/mob_swap
//the puller can always swap with it's victim if on grab intent
@@ -28,4 +28,15 @@
overlays.Cut()
if(collar)
overlays += "[icon_state]collar"
overlays += "[icon_state]tag"
overlays += "[icon_state]tag"
/mob/living/simple_animal/pet/start_pulling(atom/movable/AM)
if(isliving(AM) && !ispet(AM))
return
..()
/mob/living/simple_animal/pet/MobBump(mob/M)
if(ispet(M))
return ..()
spreadFire(M)
return 1
-3
View File
@@ -15,9 +15,6 @@
return
stop_pulling()
if(ispet(src) && isliving(AM) && !ispet(AM))
return
if(AM.pulledby)
visible_message("<span class='danger'>[src] has pulled [AM] from [AM.pulledby]'s grip.</span>")
AM.pulledby.stop_pulling() //an object can't be pulled by two mobs at once.