Merge pull request Baystation12#34888 from Sbotkin/randommapgo

Various map changes
Juneauqt · Nov 21, 2024 · a0e67c8 · a0e67c8
2 parents 2e94c00 + 53d96f5
commit a0e67c8
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 57 deletions.
diff --git a/code/game/objects/structures/crates_lockers/med_crate.dm b/code/game/objects/structures/crates_lockers/med_crate.dm
@@ -44,7 +44,6 @@
 
 /obj/structure/closet/crate/med_crate/toxin/WillContain()
 	return list(
-		/obj/item/storage/firstaid/surgery,
 		/obj/item/storage/pill_bottle/dylovene = 2,
 		/obj/item/storage/pill_bottle/hyronalin = 1
 			)
diff --git a/maps/torch/structures/closets/medical.dm b/maps/torch/structures/closets/medical.dm
@@ -53,6 +53,7 @@
 		/obj/item/storage/box/armband/med,
 		/obj/item/material/knife/folding/swiss/officer,
 		/obj/item/storage/backpack/dufflebag/med,
+		/obj/item/storage/belt/medical,
 		RANDOM_SCRUBS
 	)
 

diff --git a/maps/torch/torch2_deck4.dmm b/maps/torch/torch2_deck4.dmm
@@ -10781,6 +10781,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/quartermaster/deckchief)
 "Lb" = (

diff --git a/maps/torch/torch5_deck1.dmm b/maps/torch/torch5_deck1.dmm
@@ -3612,7 +3612,6 @@
 	pixel_y = 24
 	},
 /obj/item/autopsy_scanner,
-/obj/item/scalpel/basic,
 /obj/machinery/light/small{
 	dir = 4
 	},
@@ -6688,11 +6687,6 @@
 	pixel_x = -22;
 	pixel_y = 24
 	},
-/obj/machinery/button/windowtint{
-	id = "exam_windows";
-	pixel_x = -30;
-	pixel_y = 24
-	},
 /obj/floor_decal/corner/paleblue{
 	dir = 5
 	},
@@ -7456,10 +7450,6 @@
 	pixel_y = -6
 	},
 /obj/structure/table/steel,
-/obj/item/stamp/denied{
-	pixel_x = 5
-	},
-/obj/item/stamp,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
@@ -9430,9 +9420,6 @@
 /obj/structure/table/steel,
 /obj/item/device/multitool,
 /obj/item/stamp/brig,
-/obj/item/stamp/denied{
-	pixel_x = 5
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -10402,8 +10389,8 @@
 	dir = 8;
 	pixel_x = 21
 	},
-/obj/structure/table/steel,
 /obj/floor_decal/industrial/outline/grey,
+/obj/structure/table/steel,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/storage)
 "aKA" = (
@@ -10577,6 +10564,11 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/storage)
 "aLz" = (
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/fire{
+	pixel_x = -4;
+	pixel_y = -4
+	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/storage)
 "aLA" = (
@@ -14273,10 +14265,6 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/structure/closet/secure_closet{
-	name = "Secure Evidence Locker";
-	req_access = list("ACCESS_SECURITY")
-	},
 /turf/simulated/floor/plating,
 /area/security/wing)
 "bpA" = (
@@ -15702,6 +15690,7 @@
 /obj/structure/sign/warning/nosmoking_1{
 	pixel_y = 24
 	},
+/obj/item/storage/firstaid/surgery,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/medical/morgue/autopsy)
 "daB" = (
@@ -16537,12 +16526,13 @@
 /area/medical/washroom)
 "elT" = (
 /obj/floor_decal/industrial/outline/grey,
-/obj/structure/closet/crate/medical,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/fire{
-	pixel_x = -4;
-	pixel_y = -4
+/obj/structure/table/rack{
+	dir = 4
 	},
+/obj/item/storage/box/smokes,
+/obj/item/storage/box/smokes,
+/obj/item/storage/box/handcuffs,
+/obj/item/storage/box/handcuffs,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/storage)
 "emb" = (
@@ -18384,17 +18374,13 @@
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/entry)
 "huf" = (
-/obj/structure/table/rack{
-	dir = 4
-	},
 /obj/floor_decal/industrial/outline/grey,
-/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/smokes,
-/obj/item/storage/box/smokes,
 /obj/machinery/rotating_alarm/security_alarm{
 	dir = 1
 	},
+/obj/structure/table/rack{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/storage)
 "hvb" = (
@@ -25006,6 +24992,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/structure/closet/crate/secure{
+	name = "Secure Evidence Storage";
+	req_access = list("ACCESS_SEC_DOORS");
+	dir = 8
+	},
+/obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/security/processing)
 "pVv" = (
@@ -25279,7 +25271,6 @@
 /obj/floor_decal/corner/paleblue{
 	dir = 5
 	},
-/obj/machinery/light,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -25291,6 +25282,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery2)
 "qkb" = (
@@ -25340,14 +25332,14 @@
 /obj/floor_decal/corner/paleblue{
 	dir = 5
 	},
-/obj/machinery/light,
 /obj/structure/closet/crate/freezer,
 /obj/item/device/mmi,
 /obj/item/reagent_containers/ivbag/nanoblood,
 /obj/item/reagent_containers/ivbag/blood/human/oneg,
 /obj/item/reagent_containers/ivbag/blood/human/oneg,
 /obj/item/reagent_containers/ivbag/blood/skrell/oneg,
 /obj/item/reagent_containers/ivbag/blood/unathi/oneg,
+/obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery)
 "qqb" = (
@@ -29407,6 +29399,9 @@
 /area/medical/medicalhallway)
 "vIP" = (
 /obj/structure/filingcabinet/chestdrawer,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/security/detectives_office)
 "vJO" = (
@@ -29777,7 +29772,7 @@
 /obj/structure/table/glass,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/item/forensics/sample_kit/powder,
-/obj/item/forensics/swab,
+/obj/item/forensics/sample_kit,
 /turf/simulated/floor/tiled/white,
 /area/security/detectives_office)
 "wEb" = (