From 3b1847c77b482072d4bfc623cc6afd03953a7418 Mon Sep 17 00:00:00 2001
From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com>
Date: Tue, 24 Dec 2024 13:43:17 +0100
Subject: [PATCH] some minor upkeep while I'm here

---
 .../independent/independent_scarab.dmm        | 26 +++++++++++++------
 _maps/shuttles/inteq/inteq_talos.dmm          | 21 +++++----------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm
index 074ecce40bf8..6a415575a2cc 100644
--- a/_maps/shuttles/independent/independent_scarab.dmm
+++ b/_maps/shuttles/independent/independent_scarab.dmm
@@ -277,9 +277,9 @@
 /area/ship/engineering)
 "dJ" = (
 /obj/structure/closet/crate/trashcart,
-/obj/item/trash/chips,
-/obj/item/trash/can,
-/obj/item/trash/sosjerky,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage,
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
@@ -1167,7 +1167,7 @@
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
 /obj/structure/closet/crate/bin,
 /obj/effect/spawner/random/maintenance,
-/obj/item/trash/chips,
+/obj/effect/spawner/random/trash/garbage,
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/crew)
@@ -1580,6 +1580,10 @@
 	},
 /obj/structure/railing,
 /obj/machinery/light/directional/west,
+/obj/item/stamp/captain{
+	pixel_x = -7;
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "sG" = (
@@ -2449,7 +2453,9 @@
 	dir = 1
 	},
 /obj/machinery/light/small/directional/east,
-/obj/effect/spawner/random/bedsheet,
+/obj/effect/spawner/random/bedsheet{
+	dir = 4
+	},
 /turf/open/floor/carpet,
 /area/ship/crew/dorm)
 "Dt" = (
@@ -2615,7 +2621,7 @@
 /area/ship/hallway/starboard)
 "FP" = (
 /obj/structure/closet/crate/bin,
-/obj/item/trash/boritos,
+/obj/effect/spawner/random/trash/garbage,
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -2797,6 +2803,7 @@
 /obj/item/clothing/head/hardhat/white,
 /obj/effect/turf_decal/box,
 /obj/item/storage/box/ammo/c38,
+/obj/item/clothing/accessory/holster,
 /obj/item/megaphone/cargo,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -3704,7 +3711,9 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/starboard)
 "Rs" = (
-/obj/machinery/door/airlock/maintenance/external,
+/obj/machinery/door/airlock/maintenance/external{
+	req_ship_access = 0
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
@@ -4095,7 +4104,8 @@
 "Xd" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green{
-	pixel_y = 7
+	pixel_y = 7;
+	layer = 3.22
 	},
 /turf/open/floor/carpet,
 /area/ship/crew/dorm)
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index 451dd88f8a1b..c6179ebd182f 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -1411,8 +1411,7 @@
 /area/ship/hallway/central)
 "iO" = (
 /obj/machinery/door/airlock/maintenance{
-	dir = 8;
-	req_ship_access = 0
+	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/abandoned,
 /turf/open/floor/plating,
@@ -3466,8 +3465,7 @@
 /area/ship/crew/cryo)
 "uo" = (
 /obj/machinery/door/airlock/maintenance{
-	dir = 8;
-	req_ship_access = 0
+	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/abandoned,
 /obj/structure/cable{
@@ -4270,8 +4268,7 @@
 /area/ship/engineering/communications)
 "zB" = (
 /obj/machinery/door/airlock/maintenance{
-	dir = 8;
-	req_ship_access = 0
+	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/abandoned,
 /obj/structure/cable{
@@ -6686,8 +6683,7 @@
 /area/ship/storage/starboard)
 "QW" = (
 /obj/machinery/door/airlock/maintenance{
-	dir = 8;
-	req_ship_access = 0
+	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/abandoned,
 /obj/structure/cable{
@@ -7276,8 +7272,7 @@
 /area/ship/storage/starboard)
 "Uy" = (
 /obj/machinery/door/airlock/maintenance{
-	dir = 8;
-	req_ship_access = 0
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -7912,8 +7907,7 @@
 /area/ship/crew/dorm)
 "YD" = (
 /obj/machinery/door/airlock/maintenance{
-	dir = 8;
-	req_ship_access = 0
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -7946,8 +7940,7 @@
 /area/ship/storage/starboard)
 "YX" = (
 /obj/machinery/door/airlock/maintenance{
-	dir = 8;
-	req_ship_access = 0
+	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/abandoned,
 /obj/structure/cable{