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

# Conflicts:
#	code/game/area/Space Station 13 areas.dm
This commit is contained in:
Mark van Alphen
2019-05-03 18:30:07 +02:00
149 changed files with 4033 additions and 1045 deletions
@@ -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