Merge pull request #3350 from Citadel-Station-13/upstream-merge-31584

[MIRROR] Fixes ruins spawning over shuttle docks
This commit is contained in:
LetterJay
2017-10-13 23:36:10 -04:00
committed by GitHub
3 changed files with 112 additions and 109 deletions
+5 -1
View File
@@ -192,7 +192,7 @@
var/last_dock_time
/obj/docking_port/stationary/Initialize()
/obj/docking_port/stationary/Initialize(mapload)
. = ..()
SSshuttle.stationary += src
if(!id)
@@ -201,6 +201,10 @@
name = "dock[SSshuttle.stationary.len]"
baseturf_cache = typecacheof(baseturf_type)
if(mapload)
for(var/turf/T in return_turfs())
T.flags_1 |= NO_RUINS_1
#ifdef DOCKING_PORT_HIGHLIGHT
highlight("#f00")
#endif