diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index 97bf61779f..71dbbf7057 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 930f83813a..46234a0651 100644
--- a/code/modules/mapping/ruins.dm
+++ b/code/modules/mapping/ruins.dm
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 
 /proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins)
@@ -106,3 +107,113 @@
 
 	qdel(src)
 	return TRUE
+=======
+
+
+/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins)
+	if(!z_levels || !z_levels.len)
+		WARNING("No Z levels provided - Not generating ruins")
+		return
+
+	for(var/zl in z_levels)
+		var/turf/T = locate(1, 1, zl)
+		if(!T)
+			WARNING("Z level [zl] does not exist - Not generating ruins")
+			return
+
+	var/overall_sanity = 100
+	var/list/ruins = potentialRuins.Copy()
+
+	var/is_picking = FALSE
+	var/last_checked_ruin_index = 0
+	while(budget > 0 && overall_sanity > 0)
+		// Pick a ruin
+		var/datum/map_template/ruin/ruin = null
+		if(ruins && ruins.len)
+			last_checked_ruin_index++ //ruins with no cost come first in the ruin list, so they'll get picked really often
+			if(is_picking)
+				ruin = ruins[pick(ruins)]
+			else
+				var/ruin_key = ruins[last_checked_ruin_index] //get the ruin's key via index
+				ruin = ruins[ruin_key] //use that key to get the ruin datum itself
+				if(ruin.cost >= 0) //if it has a non-negative cost, cancel out and pick another, to ensure true randomness
+					is_picking = TRUE
+					ruin = ruins[pick(ruins)]
+		else
+			log_world("Ruin loader had no ruins to pick from with [budget] left to spend.")
+			break
+		// Can we afford it
+		if(ruin.cost > budget)
+			overall_sanity--
+			continue
+		// If so, try to place it
+		var/sanity = 100
+		// And if we can't fit it anywhere, give up, try again
+
+		while(sanity > 0)
+			sanity--
+			var/width_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(ruin.width / 2)
+			var/height_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(ruin.height / 2)
+			var/z_level = pick(z_levels)
+			var/turf/T = locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z_level)
+			var/valid = TRUE
+
+			for(var/turf/check in ruin.get_affected_turfs(T,1))
+				var/area/new_area = get_area(check)
+				if(!(istype(new_area, whitelist)) || check.flags_1 & NO_RUINS_1)
+					valid = FALSE
+					break
+
+			if(!valid)
+				continue
+
+			log_world("Ruin \"[ruin.name]\" placed at ([T.x], [T.y], [T.z])")
+
+			var/obj/effect/ruin_loader/R = new /obj/effect/ruin_loader(T)
+			R.Load(ruins,ruin)
+			if(ruin.cost >= 0)
+				budget -= ruin.cost
+			if(!ruin.allow_duplicates)
+				for(var/m in ruins)
+					var/datum/map_template/ruin/ruin_to_remove = ruins[m]
+					if(ruin_to_remove.id == ruin.id) //remove all ruins with the same ID, to make sure that ruins with multiple variants work properly
+						ruins -= ruin_to_remove.name
+						last_checked_ruin_index--
+			break
+
+	if(!overall_sanity)
+		log_world("Ruin loader gave up with [budget] left to spend.")
+
+
+/obj/effect/ruin_loader
+	name = "random ruin"
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "syndballoon"
+	invisibility = 0
+
+/obj/effect/ruin_loader/proc/Load(list/potentialRuins, datum/map_template/template)
+	var/list/possible_ruins = list()
+	for(var/A in potentialRuins)
+		var/datum/map_template/T = potentialRuins[A]
+		if(!T.loaded)
+			possible_ruins += T
+	if(!template && possible_ruins.len)
+		template = safepick(possible_ruins)
+	if(!template)
+		return FALSE
+	var/turf/central_turf = get_turf(src)
+	for(var/i in template.get_affected_turfs(central_turf, 1))
+		var/turf/T = i
+		for(var/mob/living/simple_animal/monster in T)
+			qdel(monster)
+		for(var/obj/structure/flora/ash/plant in T)
+			qdel(plant)
+	template.load(central_turf,centered = TRUE)
+	template.loaded++
+	var/datum/map_template/ruin = template
+	if(istype(ruin))
+		new /obj/effect/landmark/ruin(central_turf, ruin)
+
+	qdel(src)
+	return TRUE
+>>>>>>> 4cbfc4a... Merge pull request #31584 from AnturK/ruinshuttle
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 22368c92fb..5b55d4672d 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -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