Merge branch 'development' into map-development

This commit is contained in:
skull132
2017-05-03 21:04:38 +03:00
committed by GitHub
35 changed files with 353 additions and 75 deletions
@@ -77,3 +77,13 @@
name = "chicken crate"
held_count = 5
held_type = /mob/living/simple_animal/chick
/obj/structure/largecrate/animal/dog
name = "dog carrier"
held_type = /mob/living/simple_animal/hostile/commanded/dog
/obj/structure/largecrate/animal/dog/amaskan
held_type = /mob/living/simple_animal/hostile/commanded/dog/amaskan
/obj/structure/largecrate/animal/dog/pug
held_type = /mob/living/simple_animal/hostile/commanded/dog/pug