Merge pull request #8007 from matt81093/pet_collars_fixes

FIXES PET COLLARS (ACTUALLY DOORS BUT WHATEVER)
This commit is contained in:
Crazy Lemon
2017-09-15 10:53:15 -07:00
committed by GitHub
+7 -2
View File
@@ -76,8 +76,13 @@
var/mob/living/M = AM
if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent shock spam.
M.last_bumped = world.time
if(!M.restrained() && M.mob_size > MOB_SIZE_SMALL)
bumpopen(M)
if(!M.restrained())
if(M.mob_size > MOB_SIZE_SMALL)
bumpopen(M)
else if(ispet(M))
var/mob/living/simple_animal/A = AM
if(A.collar)
bumpopen(M)
return
if(istype(AM, /obj/mecha))