Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

This commit is contained in:
Aurorablade
2016-12-01 18:04:07 -05:00
48 changed files with 692 additions and 252 deletions
@@ -25,21 +25,12 @@
for(var/i = 1, i <= amount, i++)
new content_mob(loc)
already_opened = 1
..()
. = ..()
/obj/structure/closet/critter/close()
..()
return 1
/obj/structure/closet/critter/attack_hand(mob/user as mob)
src.add_fingerprint(user)
if(src.loc == user.loc)
to_chat(user, "<span class='notice'>It won't budge!</span>")
toggle()
else
toggle()
/obj/structure/closet/critter/corgi
name = "corgi crate"
content_mob = /mob/living/simple_animal/pet/corgi