diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 97bf61779f9..71dbbf70571 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -61,6 +61,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define UNUSED_TRANSIT_TURF_1 2 #define CAN_BE_DIRTY_1 4 // If a turf can be made dirty at roundstart. This is also used in areas. #define NO_DEATHRATTLE_1 16 // Do not notify deadchat about any deaths that occur on this turf. +#define NO_RUINS_1 32 //Blocks ruins spawning in the area //#define CHECK_RICOCHET_1 32 //Same thing as atom flag. /* diff --git a/code/modules/mapping/ruins.dm b/code/modules/mapping/ruins.dm index 208effabc3c..89d9d07a14b 100644 --- a/code/modules/mapping/ruins.dm +++ b/code/modules/mapping/ruins.dm @@ -50,7 +50,7 @@ for(var/turf/check in ruin.get_affected_turfs(T,1)) var/area/new_area = get_area(check) - if(!(istype(new_area, whitelist))) + if(!(istype(new_area, whitelist)) || check.flags_1 & NO_RUINS_1) valid = FALSE break diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index fd3d7571f14..d5ad26f57c4 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -193,7 +193,7 @@ var/last_dock_time -/obj/docking_port/stationary/Initialize() +/obj/docking_port/stationary/Initialize(mapload) . = ..() SSshuttle.stationary += src if(!id) @@ -202,6 +202,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