Merge branch 'master' into upstream-merge-31045

This commit is contained in:
LetterJay
2017-10-01 01:17:52 -04:00
committed by GitHub
260 changed files with 7134 additions and 5672 deletions
@@ -57,7 +57,6 @@
girder_type = /obj/structure/destructible/clockwork/wall_gear
baseturf = /turf/open/floor/clockwork/reebe
var/obj/effect/clockwork/overlay/wall/realappearence
var/obj/structure/destructible/clockwork/cache/linkedcache
/turf/closed/wall/clockwork/Initialize()
..()