mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 14:07:51 +01:00
Tiger requests
This commit is contained in:
@@ -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
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user