09-10 merge

_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_arena.dmm

@@ -115,7 +115,7 @@
 	},
 /mob/living/basic/mining/hivelord/no_wander{
 	color = "red";
-	name = "gate guardian";
+	name = "gate guardian"
 	},
 /turf/open/lava/smooth/lava_land_surface{
 	slowdown = 0
@@ -309,7 +309,7 @@
 	},
 /mob/living/basic/mining/hivelord/no_wander{
 	color = "red";
-	name = "gate guardian";
+	name = "gate guardian"
 	},
 /turf/open/lava/smooth/lava_land_surface{
 	slowdown = 0
@@ -627,7 +627,7 @@
 	},
 /mob/living/basic/mining/hivelord/no_wander{
 	color = "red";
-	name = "gate guardian";
+	name = "gate guardian"
 	},
 /turf/open/indestructible/boss,
 /area/lavaland/surface/outdoors)
@@ -777,7 +777,7 @@
 	},
 /mob/living/basic/mining/hivelord/no_wander{
 	color = "red";
-	name = "gate guardian";
+	name = "gate guardian"
 	},
 /turf/open/indestructible/boss,
 /area/lavaland/surface/outdoors)

_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm

@@ -1741,6 +1741,8 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/structure/table/reinforced,
+/obj/item/storage/backpack/duffelbag/synth_treatment_kit/trauma/advanced/unzipped,
 /turf/open/floor/iron/white,
 /area/ruin/syndicate_lava_base/medbay)
 "rQ" = (

_maps/RandomRuins/SpaceRuins/dangerous_research.dmm

@@ -1984,10 +1984,7 @@
 /obj/effect/decal/cleanable/glass,
 /obj/item/shard,
 /obj/item/stack/sheet/iron,
-/mob/living/simple_animal/hostile/heretic_summon/rust_spirit{
-	AIStatus = 1;
-	stop_automated_movement = 0
-	},
+/mob/living/basic/heretic_summon/rust_walker,
 /turf/open/floor/plating/rust,
 /area/ruin/space/has_grav/dangerous_research/lab)
 "zR" = (
@@ -3717,10 +3714,7 @@
 /turf/open/floor/engine/airless,
 /area/ruin/space/has_grav/dangerous_research/maint)
 "Xh" = (
-/mob/living/simple_animal/hostile/heretic_summon/rust_spirit{
-	AIStatus = 1;
-	stop_automated_movement = 0
-	},
+/mob/living/basic/heretic_summon/rust_walker,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
@@ -3862,10 +3856,7 @@
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/dangerous_research/medical)
 "YZ" = (
-/mob/living/simple_animal/hostile/heretic_summon/rust_spirit{
-	AIStatus = 1;
-	stop_automated_movement = 0
-	},
+/mob/living/basic/heretic_summon/rust_walker,
 /turf/open/floor/plating/rust,
 /area/ruin/space/has_grav/dangerous_research/lab)
 "Zc" = (

_maps/RandomRuins/SpaceRuins/skyrat/clothing_facility.dmm

@@ -57,14 +57,14 @@
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/powered/skyrat/clothing_facility)
 "n" = (
-/obj/item/card/id/advanced/colourable{
-	pixel_y = 6
-	},
+/obj/item/card/id/advanced/silver/generic,
 /obj/structure/rack,
-/obj/item/card/id/advanced/colourable{
+/obj/item/card/id/advanced/silver/generic{
 	pixel_y = 3
 	},
-/obj/item/card/id/advanced/colourable,
+/obj/item/card/id/advanced/silver/generic{
+	pixel_y = 6
+	},
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/powered/skyrat/clothing_facility)
 "o" = (

_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm

@@ -1891,6 +1891,8 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line,
 /obj/effect/turf_decal/siding/dark,
 /obj/structure/extinguisher_cabinet/directional/west,
+/obj/structure/table/glass,
+/obj/item/storage/backpack/duffelbag/synth_treatment_kit/trauma/advanced/unzipped,
 /turf/open/floor/iron/white/diagonal,
 /area/ruin/space/has_grav/skyrat/interdynefob/medbay)
 "hZ" = (

_maps/map_files/Birdshot/birdshot.dmm

@@ -26928,7 +26928,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/holopad,
-/mob/living/simple_animal/sloth/citrus,
+/mob/living/basic/sloth/citrus,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "jHE" = (
@@ -32991,15 +32991,10 @@
 /turf/open/floor/iron,
 /area/station/security/checkpoint/escape)
 "lLq" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 1
-	},
-/obj/effect/turf_decal/box/corners{
-	dir = 4
-	},
 /obj/machinery/firealarm/directional/east,
 /obj/effect/decal/cleanable/oil,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/box,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "lLr" = (
@@ -37938,13 +37933,10 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/station/science/xenobiology)
 "nyf" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
-/obj/effect/turf_decal/box/corners,
 /obj/machinery/camera/autoname/directional/east,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/structure/table,
+/obj/item/food/cornchips/green,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "nyi" = (
@@ -54250,9 +54242,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/retaliate/goat{
-	name = "Pete"
-	},
+/mob/living/basic/goat/pete,
 /obj/machinery/duct,
 /turf/open/floor/iron/freezer,
 /area/station/service/kitchen/coldroom)