Merge branch 'master' into landmines

_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm

@@ -894,7 +894,7 @@
 /area/ruin/unpowered/corprejectrooms)
 "vP" = (
 /obj/structure/bed,
-/obj/item/bedsheet/cult,
+/obj/item/bedsheet/dorms,
 /turf/open/floor/carpet/lone,
 /area/ruin/unpowered/corprejectrooms)
 "wl" = (

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -70,7 +70,10 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "hD" = (
 /obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor/engine/cult,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
 /area/ruin/powered)
 "hI" = (
 /obj/item/reagent_containers/food/drinks/beer,
@@ -128,12 +131,17 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "mi" = (
 /obj/effect/decal/remains/human,
-/mob/living/simple_animal/hostile/construct/juggernaut/hostile{
-	health = 450;
-	maxHealth = 450;
-	name = "Right Hand of the Elder"
+/obj/item/flashlight/lamp/green{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/cigbutt/cigarbutt{
+	pixel_x = -7;
+	pixel_y = 8
 	},
-/turf/open/floor/engine/cult,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
 /area/ruin/powered)
 "mI" = (
 /obj/structure/flora/ausbushes/fullgrass,
@@ -323,7 +331,7 @@
 "AM" = (
 /obj/effect/decal/cleanable/blood/gibs/down,
 /obj/item/pickaxe,
-/turf/open/floor/engine/cult,
+/turf/open/floor/wood,
 /area/ruin/powered)
 "AN" = (
 /obj/structure/closet/cabinet,
@@ -349,10 +357,11 @@
 /turf/open/floor/carpet,
 /area/ruin/powered)
 "Cl" = (
-/obj/structure/sacrificealtar,
 /obj/effect/decal/cleanable/blood/old,
-/obj/item/kitchen/knife/bloodletter,
-/turf/open/floor/engine/cult,
+/obj/structure/chair/comfy/brown,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
 /area/ruin/powered)
 "Dm" = (
 /obj/structure/flora/grass/brown,
@@ -382,13 +391,12 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "EF" = (
 /obj/effect/decal/cleanable/blood/gibs/torso,
-/obj/effect/decal/remains/human,
-/mob/living/simple_animal/hostile/construct/juggernaut/hostile{
-	health = 450;
-	maxHealth = 450;
-	name = "Left Hand of the Elder"
-	},
-/turf/open/floor/engine/cult,
+/obj/structure/safe,
+/obj/item/ammo_box/a12g/slug,
+/obj/item/kitchen/knife/combat,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
 /area/ruin/powered)
 "FR" = (
 /obj/effect/decal/cleanable/blood/splatter,
@@ -486,17 +494,9 @@
 /area/ruin/powered)
 "PQ" = (
 /obj/effect/decal/cleanable/blood/splatter,
-/mob/living/simple_animal/hostile/illusion{
-	deathmessage = "disperses into the air in a cloud of red mist, you feel slightly more at ease.";
-	desc = "You can't quite make out what you're seeing.";
-	faction = list("cult");
-	health = 500;
-	maxHealth = 500;
-	melee_damage_lower = 10;
-	melee_damage_upper = 30;
-	name = "Village Elder"
-	},
-/turf/open/floor/engine/cult,
+/mob/living/simple_animal/hostile/frontier/ranged/trooper,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
 /area/ruin/powered)
 "Qt" = (
 /obj/effect/decal/cleanable/blood/footprints{
@@ -566,7 +566,7 @@
 "WH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bed,
-/obj/item/bedsheet/cult,
+/obj/item/bedsheet/dorms,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "Ze" = (