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

# Conflicts:
#	icons/obj/toy.dmi
This commit is contained in:
Mark van Alphen
2019-05-03 18:31:45 +02:00
149 changed files with 4031 additions and 1043 deletions

View File

@@ -44,6 +44,10 @@
name = "cow crate"
content_mob = /mob/living/simple_animal/cow
/obj/structure/closet/critter/pig
name = "pig crate"
content_mob = /mob/living/simple_animal/pig
/obj/structure/closet/critter/goat
name = "goat crate"
content_mob = /mob/living/simple_animal/hostile/retaliate/goat