From 24d3925f2da19013aab42de4afe1f4c722a8b209 Mon Sep 17 00:00:00 2001 From: Ghosti <83688318+Gw0sty@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:09:43 -0500 Subject: [PATCH] [10000MC] surgical trays in robotics instead of tools all over 3 different tables (#3579) --- _maps/map_files/Blueshift/Blueshift.dmm | 32 ++++--------------- _maps/map_files/BoxStation/BoxStation.dmm | 4 +++ .../map_files/Deltastation/DeltaStation2.dmm | 9 ++---- .../map_files/IceBoxStation/IceBoxStation.dmm | 14 ++------ _maps/map_files/KiloStation/KiloStation.dmm | 20 ++++-------- _maps/map_files/MetaStation/MetaStation.dmm | 11 +------ _maps/map_files/Voidraptor/VoidRaptor.dmm | 1 + 7 files changed, 24 insertions(+), 67 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 3ee4aab3d22e..262624e9f2e5 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -16930,24 +16930,11 @@ /area/station/commons/dorms/room8) "djt" = ( /obj/structure/table, -/obj/item/surgical_drapes{ - pixel_x = 7; - pixel_y = -2 - }, -/obj/item/circular_saw{ - pixel_y = 12 - }, -/obj/item/healthanalyzer{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/scalpel{ - pixel_y = 19 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 }, /obj/item/radio/intercom/directional/west, +/obj/item/surgery_tray, /turf/open/floor/iron/white, /area/station/science/robotics) "djv" = ( @@ -119740,21 +119727,16 @@ /area/station/cargo/warehouse) "xej" = ( /obj/structure/table, -/obj/item/retractor, -/obj/item/hemostat{ - pixel_x = -9; - pixel_y = -2 - }, -/obj/item/cautery{ - pixel_x = -5; - pixel_y = 3 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, /obj/item/reagent_containers/spray/cleaner{ - pixel_x = 14; - pixel_y = -1 + pixel_x = 9; + pixel_y = 4 + }, +/obj/item/healthanalyzer{ + pixel_x = -4; + pixel_y = 4 }, /turf/open/floor/iron/white, /area/station/science/robotics) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5cf957c84783..5582f45bb067 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -55979,6 +55979,10 @@ dir = 4 }, /obj/structure/table, +/obj/item/healthanalyzer{ + pixel_x = -1; + pixel_y = 6 + }, /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/iron/white, /area/station/science/robotics/lab) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 16ba1a15c9b7..b0d582c657a0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -67933,11 +67933,10 @@ /area/station/security/detectives_office) "qgR" = ( /obj/structure/table/reinforced, -/obj/item/retractor, -/obj/item/hemostat, /obj/structure/window/reinforced/spawner/directional/north{ pixel_y = 2 }, +/obj/item/healthanalyzer, /turf/open/floor/iron, /area/station/science/robotics/lab) "qgU" = ( @@ -86713,14 +86712,10 @@ /area/station/security/lockers) "uHW" = ( /obj/structure/table/reinforced, -/obj/item/scalpel{ - pixel_y = 8 - }, -/obj/item/circular_saw, -/obj/item/cautery, /obj/structure/sign/departments/medbay/alt/directional/south, /obj/machinery/light/cold/directional/east, /obj/machinery/status_display/evac/directional/east, +/obj/item/surgery_tray, /turf/open/floor/iron, /area/station/science/robotics/lab) "uHZ" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c78a3fb21d3c..556bab189828 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1372,11 +1372,8 @@ /area/station/hallway/primary/port) "awK" = ( /obj/structure/table, -/obj/item/hemostat, -/obj/item/cautery{ - pixel_x = 4 - }, /obj/item/radio/intercom/directional/north, +/obj/item/razor, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "axc" = ( @@ -27114,11 +27111,8 @@ /area/station/hallway/primary/central) "iII" = ( /obj/structure/table, -/obj/item/circular_saw, -/obj/item/scalpel{ - pixel_y = 12 - }, /obj/machinery/light/directional/north, +/obj/item/surgery_tray, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "iIW" = ( @@ -33060,7 +33054,7 @@ /area/mine/laborcamp) "kBT" = ( /obj/structure/table, -/obj/item/retractor, +/obj/item/healthanalyzer, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "kBV" = ( @@ -67991,8 +67985,6 @@ "vPE" = ( /obj/structure/table, /obj/item/clothing/gloves/latex, -/obj/item/surgical_drapes, -/obj/item/razor, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 846577f0c85f..1b40fdf63a16 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -31710,12 +31710,10 @@ /turf/open/floor/wood, /area/station/maintenance/port/fore) "jJW" = ( -/obj/item/kirbyplants{ - icon_state = "plant-18" - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/medipen_refiller, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "jKj" = ( @@ -42292,9 +42290,6 @@ /area/space/nearstation) "nij" = ( /obj/structure/table, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/mask/surgical, /obj/item/mmi, /obj/item/mmi, /obj/item/mmi, @@ -46098,9 +46093,6 @@ /area/station/security/courtroom) "oyX" = ( /obj/structure/table, -/obj/item/surgical_drapes, -/obj/item/retractor, -/obj/item/cautery, /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north{ pixel_y = 1 @@ -46108,6 +46100,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/item/surgery_tray, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "oyY" = ( @@ -75230,17 +75223,16 @@ /area/station/medical/medbay/central) "xvh" = ( /obj/structure/table, -/obj/item/circular_saw, -/obj/item/scalpel{ - pixel_y = 16 - }, -/obj/item/hemostat, /obj/structure/window/reinforced/spawner/directional/north{ pixel_y = 1 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/item/clothing/gloves/latex, +/obj/item/healthanalyzer, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "xvj" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c18f458d1ca5..c9adba0773ee 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -25369,11 +25369,8 @@ /area/station/commons/fitness/recreation) "iYO" = ( /obj/structure/table, -/obj/item/circular_saw, -/obj/item/scalpel{ - pixel_y = 16 - }, /obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/item/surgery_tray, /turf/open/floor/iron/white, /area/station/science/robotics/lab) "iYP" = ( @@ -47028,8 +47025,6 @@ "qBr" = ( /obj/structure/window/spawner/directional/west, /obj/structure/table, -/obj/item/surgical_drapes, -/obj/item/cautery, /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/structure/disposalpipe/segment{ dir = 9 @@ -68591,10 +68586,6 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "yeS" = ( -/obj/item/retractor, -/obj/item/hemostat{ - pixel_x = -10 - }, /obj/machinery/light/small/directional/south, /obj/structure/table, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, diff --git a/_maps/map_files/Voidraptor/VoidRaptor.dmm b/_maps/map_files/Voidraptor/VoidRaptor.dmm index 50aa94940f4d..381bd7d3d918 100644 --- a/_maps/map_files/Voidraptor/VoidRaptor.dmm +++ b/_maps/map_files/Voidraptor/VoidRaptor.dmm @@ -51842,6 +51842,7 @@ /obj/item/mmi{ pixel_y = -5 }, +/obj/item/healthanalyzer, /turf/open/floor/iron/dark/textured, /area/station/science/robotics/lab) "oEk" = (