Merge remote-tracking branch 'upstream/master'

_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm

@@ -1698,10 +1698,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/beach/oceantown/shop)
-"ww" = (
-/obj/structure/statue/sandstone/assistant,
-/turf/open/floor/plating/asteroid/sand/lit,
-/area/overmap_encounter/planetoid/beachplanet/explored)
 "wF" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/structure/flora/ausbushes/brflowers,
@@ -7687,7 +7683,7 @@ sa
 sa
 Ud
 sa
-ww
+sa
 sa
 Ud
 sa

_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

@@ -192,7 +192,9 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "bU" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/statue/sandstone/assistant,
+/obj/item/kirbyplants{
+	icon_state = "plant-10"
+	},
 /obj/machinery/light_switch{
 	pixel_y = 21;
 	pixel_x = -10

_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm

@@ -2024,7 +2024,6 @@
 /turf/open/floor/engine/hull/interior,
 /area/overmap_encounter/planetoid/lava/explored)
 "Hl" = (
-/obj/structure/statue/sandstone/assistant,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/contraband/random{
 	pixel_y = -32
@@ -2380,7 +2379,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/crashed_starwalker)
 "Mk" = (
-/obj/structure/statue/sandstone/assistant,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/pod/light,

_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm

@@ -2155,6 +2155,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/stormtrooper,
 /turf/open/floor/plasteel/dark,
 /area/ruin/lavaland/factory/dorms)
 "tN" = (
@@ -6370,7 +6371,7 @@ LP
 vE
 DB
 Cc
-KX
+yQ
 Gn
 hv
 JO
@@ -6424,7 +6425,7 @@ vE
 EU
 Vw
 Id
-KX
+yQ
 PR
 KX
 PR
@@ -6478,7 +6479,7 @@ ab
 vQ
 LL
 Kg
-KX
+yQ
 Gw
 KX
 Gw
@@ -6532,7 +6533,7 @@ yQ
 yQ
 yQ
 yQ
-KX
+yQ
 KX
 KX
 KX

_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm

@@ -2002,7 +2002,7 @@
 	},
 /obj/item/ammo_box/magazine/m9mm_rattlesnake,
 /obj/item/ammo_box/magazine/m9mm_rattlesnake,
-/obj/item/storage/pistolcase/ringneck,
+/obj/item/gun/ballistic/automatic/pistol/rattlesnake/no_mag,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/rockplanet/shippingdocksecure)
 "rK" = (

_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm

@@ -1447,7 +1447,7 @@
 /obj/machinery/door/airlock/hatch{
 	welded = 1
 	},
-/turf/template_noop,
+/turf/open/floor/plating,
 /area/ruin/whitesands/pubbycrash/split)
 "ET" = (
 /obj/structure/cable/yellow{

_maps/RandomRuins/WasteRuins/wasteplanet_yard.dmm

@@ -3042,10 +3042,10 @@
 	icon_state = "0-2"
 	},
 /obj/structure/closet/wall/directional/west,
-/obj/item/gun/ballistic/revolver,
 /obj/item/clothing/suit/hooded/wintercoat/captain,
 /obj/item/storage/firstaid/o2,
 /obj/machinery/light/small/broken/directional/north,
+/obj/item/gun/ballistic/revolver/viper/indie,
 /turf/open/floor/plasteel/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_shipbreaking/ship)
 "Mf" = (

_maps/shuttles/independent/independent_mudskipper.dmm

@@ -1016,6 +1016,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo)
+"xR" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "mudskipper_window"
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/aft)
 "xU" = (
 /obj/machinery/power/terminal{
 	dir = 1
@@ -1051,7 +1059,7 @@
 /obj/machinery/door/poddoor/shutters{
 	id = "mudskipper_window"
 	},
-/obj/structure/window/fulltile,
+/obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "yB" = (
@@ -1431,7 +1439,7 @@
 	dir = 4;
 	id = "mudskipper_bridge"
 	},
-/obj/effect/spawner/structure/window,
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/ship/bridge)
 "Gq" = (
@@ -1811,7 +1819,7 @@
 /obj/machinery/door/poddoor/shutters{
 	id = "mudskipper_window"
 	},
-/obj/structure/window/fulltile,
+/obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
 /area/ship/hallway/aft)
 "PU" = (
@@ -1823,10 +1831,10 @@
 "Qt" = (
 /obj/structure/grille,
 /obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/structure/window/reinforced/fulltile,
 /obj/machinery/door/poddoor/shutters{
 	id = "mudskipper_window"
 	},
-/obj/structure/window/fulltile,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Qu" = (
@@ -2224,7 +2232,7 @@
 /obj/machinery/door/poddoor/shutters{
 	id = "mudskipper_window"
 	},
-/obj/structure/window/fulltile,
+/obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
 /area/ship/hallway/aft)
 "XI" = (
@@ -2278,7 +2286,7 @@
 /obj/machinery/door/poddoor/shutters{
 	id = "mudskipper_window"
 	},
-/obj/structure/window/fulltile,
+/obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
 /area/ship/crew)
 "Yi" = (
@@ -2566,7 +2574,7 @@ cs
 hX
 cs
 cs
-Xm
+xR
 yg
 XK
 Ni

_maps/shuttles/inteq/inteq_colossus.dmm

@@ -2224,9 +2224,7 @@
 	name = "folder"
 	},
 /obj/item/pen/fourcolor,
-/obj/item/stamp/hos{
-	name = "vanguard's rubber stamp"
-	},
+/obj/item/stamp/inteq/vanguard,
 /obj/item/reagent_containers/food/drinks/coffee{
 	pixel_y = 20
 	},
@@ -4212,9 +4210,7 @@
 	desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'";
 	name = "folder"
 	},
-/obj/item/stamp/law{
-	name = "master at arms' rubber stamp"
-	},
+/obj/item/stamp/inteq/maa,
 /obj/item/table_bell{
 	pixel_y = 13
 	},

_maps/shuttles/inteq/inteq_hound.dmm

@@ -2343,9 +2343,7 @@
 /obj/item/gps{
 	pixel_x = 12
 	},
-/obj/item/stamp/hos{
-	name = "vanguard's rubber stamp"
-	},
+/obj/item/stamp/inteq/vanguard,
 /obj/item/pen/fountain,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)

_maps/shuttles/inteq/inteq_talos.dmm

@@ -2529,9 +2529,7 @@
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
-/obj/item/stamp/hos{
-	name = "vanguard's rubber stamp"
-	},
+/obj/item/stamp/inteq/vanguard,
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -5797,9 +5795,7 @@
 	desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'";
 	name = "folder"
 	},
-/obj/item/stamp/law{
-	name = "master at arms' rubber stamp"
-	},
+/obj/item/stamp/inteq/maa,
 /obj/item/table_bell{
 	pixel_x = -15
 	},
@@ -7830,9 +7826,7 @@
 /obj/item/megaphone/cargo{
 	name = "engineering megaphone"
 	},
-/obj/item/stamp/ce{
-	name = "honorable artificer's rubber stamp"
-	},
+/obj/item/stamp/inteq/artificer,
 /obj/item/clothing/glasses/meson/engine,
 /obj/item/clothing/glasses/welding,
 /obj/item/pipe_dispenser,