Merge branch 'master' into upstream-merge-32249

This commit is contained in:
deathride58
2017-12-04 23:15:38 +00:00
committed by GitHub
112 changed files with 1764 additions and 717 deletions
@@ -44131,7 +44131,6 @@
/area/maintenance/aft)
"cdM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/mob/living/simple_animal/mouse,
/turf/open/floor/plating,
/area/maintenance/aft)
"cdN" = (