From 63d3d34fb3b2d1908439067438d5033d36fadff4 Mon Sep 17 00:00:00 2001 From: DarnTheMarn <117550914+DarnTheMarn@users.noreply.github.com> Date: Sun, 7 Jul 2024 09:59:07 -0500 Subject: [PATCH] Brig Medical Reduction V2 - Not Forgotten Edition (#11153) * Removes excess items * adds kelo bottle to locker, gauze to map, fixes typo --- _maps/map_files/BoxStation/BoxStation.dmm | 16 +--------------- _maps/map_files/CorgStation/CorgStation.dmm | 6 ++---- .../map_files/Deltastation/DeltaStation2.dmm | 13 +------------ _maps/map_files/EchoStation/EchoStation.dmm | 4 ---- _maps/map_files/FlandStation/FlandStation.dmm | 19 +------------------ _maps/map_files/KiloStation/KiloStation.dmm | 13 +------------ _maps/map_files/MetaStation/MetaStation.dmm | 10 +--------- _maps/map_files/RadStation/RadStation.dmm | 19 +------------------ .../crates_lockers/closets/secure/security.dm | 6 ++---- 9 files changed, 10 insertions(+), 96 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 8da01912958d0..706505768c55b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -21696,10 +21696,6 @@ /obj/structure/table, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 5; pixel_y = -1 @@ -23594,10 +23590,6 @@ pixel_y = 2 }, /obj/item/storage/firstaid/regular, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -39780,9 +39772,6 @@ pixel_x = -28 }, /obj/structure/table, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, /obj/item/clothing/mask/balaclava, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 5 @@ -59889,15 +59878,13 @@ /obj/item/reagent_containers/syringe{ name = "steel point" }, -/obj/item/reagent_containers/glass/bottle/charcoal, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/storage/backpack/duffelbag/sec/surgery, /obj/structure/table, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/item/stack/medical/gauze, /turf/open/floor/iron/white, /area/security/brig) "vnK" = ( @@ -64556,7 +64543,6 @@ /area/teleporter) "xvB" = ( /obj/structure/table/optable, -/obj/item/defibrillator/loaded, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/window/reinforced{ diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm index bb04e1ffaa0c6..0d2ad8c31c39b 100644 --- a/_maps/map_files/CorgStation/CorgStation.dmm +++ b/_maps/map_files/CorgStation/CorgStation.dmm @@ -11083,8 +11083,6 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, -/obj/item/storage/backpack/duffelbag/sec/surgery, -/obj/item/blood_filter, /turf/open/floor/iron/white, /area/security/brig/medbay) "dqj" = ( @@ -44144,7 +44142,6 @@ }, /obj/structure/table/reinforced, /obj/item/wrench/medical, -/obj/item/reagent_containers/glass/bottle/morphine, /obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath/medical, /turf/open/floor/iron/dark, @@ -69017,7 +69014,8 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/defibrillator/loaded, +/obj/effect/loot_jobscale/medical/first_aid_kit, +/obj/item/stack/medical/gauze, /turf/open/floor/iron/dark, /area/security/brig/medbay) "whZ" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index abdacc4894fa8..24fd21dd3a187 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -38944,7 +38944,6 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/sec/surgery, /obj/item/healthanalyzer, /turf/open/floor/iron/white, /area/security/brig) @@ -50769,9 +50768,6 @@ /obj/item/reagent_containers/glass/bottle/facid{ pixel_x = 7 }, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, @@ -72437,11 +72433,6 @@ icon_state = "4-8" }, /obj/item/clothing/gloves/color/latex, -/obj/item/healthanalyzer, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 5; pixel_y = -1 @@ -72449,7 +72440,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/item/storage/firstaid/regular, +/obj/item/stack/medical/gauze, /turf/open/floor/iron/white, /area/security/brig) "qVr" = ( @@ -92552,8 +92543,6 @@ /area/maintenance/port/aft) "xDw" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/reagent_containers/glass/bottle/charcoal, /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 3fed9323d2ce3..a73323fdcdbeb 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -16136,10 +16136,6 @@ }) "hKX" = ( /obj/effect/turf_decal/tile/neutral, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_x = -1; - pixel_y = 7 - }, /obj/item/clothing/mask/surgical{ pixel_x = 3; pixel_y = -8 diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index ba3f4fcedc199..07f4ae9e71663 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -944,9 +944,6 @@ "amP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, /obj/item/clothing/mask/balaclava, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 5 @@ -39916,17 +39913,12 @@ /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/closet/crate, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 5; - pixel_y = -1 - }, /obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; pixel_y = 2 }, /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/color/latex, -/obj/item/defibrillator/loaded, /obj/item/reagent_containers/blood/OPlus, /turf/open/floor/iron/techmaint, /area/security/main) @@ -40818,9 +40810,6 @@ /obj/item/storage/box/bodybags, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, @@ -65433,10 +65422,6 @@ pixel_y = 2 }, /obj/item/storage/firstaid/regular, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/bot, /obj/machinery/camera{ @@ -92089,14 +92074,12 @@ /obj/item/reagent_containers/syringe{ name = "steel point" }, -/obj/item/reagent_containers/glass/bottle/charcoal, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/storage/backpack/duffelbag/sec/surgery, /obj/structure/table, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/item/stack/medical/gauze, /turf/open/floor/iron/white, /area/security/main) "xcT" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 05734ebdc27fa..2eadc4a915787 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -34798,9 +34798,6 @@ dir = 1 }, /obj/structure/table/optable, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, @@ -40809,7 +40806,6 @@ /area/crew_quarters/fitness/recreation) "hbv" = ( /obj/structure/table, -/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -56670,10 +56666,6 @@ /obj/item/clothing/gloves/color/latex, /obj/item/healthanalyzer, /obj/item/storage/box/bodybags, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 5; pixel_y = -1 @@ -78171,9 +78163,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, +/obj/item/stack/medical/gauze, /turf/open/floor/iron/showroomfloor, /area/security/main) "tzZ" = ( @@ -86956,7 +86946,6 @@ /obj/structure/table/glass, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/bottle/epinephrine, /obj/machinery/firealarm/directional/west, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1002e718b0892..ecdfc8afb35b4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -21979,10 +21979,6 @@ /area/crew_quarters/bar) "cTU" = ( /obj/structure/rack, -/obj/item/storage/firstaid/regular, -/obj/item/healthanalyzer{ - pixel_y = -2 - }, /obj/machinery/camera{ c_tag = "Brig - Infirmary"; dir = 1 @@ -21991,6 +21987,7 @@ pixel_y = -4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/item/stack/medical/gauze, /turf/open/floor/iron/white, /area/security/brig) "cUm" = ( @@ -43575,8 +43572,6 @@ "kTH" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/reagent_containers/glass/bottle/charcoal, /obj/item/reagent_containers/syringe, /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -63149,9 +63144,6 @@ pixel_x = -28 }, /obj/structure/table, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, /obj/item/clothing/mask/balaclava, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 5 diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index 86c2f039aacb3..41948a2091a76 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -19724,7 +19724,6 @@ name = "Prison Visitation" }) "gee" = ( -/obj/item/defibrillator/loaded, /obj/structure/closet/crate/freezer/blood, /obj/item/rollerbed, /obj/item/rollerbed{ @@ -48862,10 +48861,6 @@ /area/science/xenobiology) "pmV" = ( /obj/structure/table, -/obj/item/storage/firstaid/brute{ - pixel_x = -5; - pixel_y = 10 - }, /obj/item/storage/toolbox/mechanical, /obj/machinery/light/very_dim/directional/west, /turf/open/floor/iron/dark, @@ -60222,15 +60217,7 @@ pixel_x = 5; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bottle/morphine{ - pixel_x = -1; - pixel_y = 11 - }, -/obj/item/reagent_containers/glass/bottle/morphine{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/item/storage/backpack/duffelbag/sec/surgery, +/obj/item/stack/medical/gauze, /turf/open/floor/iron, /area/security/brig/medbay) "sRq" = ( @@ -66446,10 +66433,6 @@ pixel_y = -4 }, /obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 5 - }, -/obj/item/blood_filter, /turf/open/floor/iron/dark, /area/security/brig/medbay) "uJI" = ( diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 40d11ac93311d..b6be1d6aabeae 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -115,10 +115,8 @@ new /obj/item/blood_filter(src) new /obj/item/radio/headset/headset_medsec(src) new /obj/item/storage/firstaid/regular(src) - new /obj/item/storage/firstaid/fire(src) - new /obj/item/storage/firstaid/toxin(src) - new /obj/item/storage/firstaid/o2(src) - new /obj/item/storage/firstaid/brute(src) + new /obj/item/storage/pill_bottle/charcoal(src) + new /obj/item/storage/pill_bottle/kelotane(src) new /obj/item/storage/belt/medical(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/clothing/under/rank/brig_physician(src)