Merge branch 'upMaster' into updates

This commit is contained in:
Hawk_v3
2018-10-21 03:48:41 +01:00
47 changed files with 4165 additions and 2712 deletions

View File

@@ -122,7 +122,7 @@
/obj/structure/largecrate/animal/wolfgirl
name = "Wolfgirl Crate"
desc = "A sketchy looking crate with airholes that shakes and thuds every now and then. Someone seems to be demanding they be let out."
starts_with = list(/mob/living/simple_animal/retaliate/awoo)
starts_with = list(/mob/living/simple_animal/retaliate/wolfgirl)
/obj/structure/largecrate/animal/fennec
name = "Fennec Crate"