Merge branch 'master' into Spookytime

2019-10-11 21:51:48 +01:00
parent 29f7be9aca f57fa7f471
commit 7bce68bb11
91 changed files with 577 additions and 328 deletions
@@ -78463,6 +78463,7 @@
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "dbq" = (
+/mob/living/simple_animal/hostile/retaliate/goose,
 /turf/open/floor/wood{
 	icon_state = "wood-broken6"
 	},
@@ -54391,6 +54391,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
+"ggg" = (
+/mob/living/simple_animal/hostile/retaliate/goose,
+/turf/open/floor/wood,
+/area/maintenance/department/crew_quarters/dorms)
 "gih" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
@@ -99284,7 +99288,7 @@ cBk
 jhD
 cBo
 alQ
-alb
+ggg
 cBw
 noC
 aiS