From a34d32367757b7952810c6064380a841e64911c6 Mon Sep 17 00:00:00 2001 From: Bobby Date: Sun, 13 Aug 2023 17:06:25 +0100 Subject: [PATCH 1/2] d --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 73 +++++++++++++++++++--- 1 file changed, 65 insertions(+), 8 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 828e406cc28b..6dfd2d5d9214 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -8144,6 +8144,9 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -30825,7 +30828,10 @@ }, /area/almayer/shipboard/brig/lobby) "dyb" = ( -/obj/structure/machinery/smartfridge/chemistry, +/obj/structure/machinery/smartfridge/chemistry{ + layer = 3.1; + pixel_x = -4 + }, /obj/item/device/radio/intercom{ freerange = 1; name = "General Listening Channel"; @@ -35071,6 +35077,20 @@ icon_state = "plate" }, /area/almayer/engineering/starboard_atmos) +"fpT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "fpW" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = 32 @@ -35810,7 +35830,9 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "fGu" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /obj/structure/machinery/door_control{ dir = 1; id = "researchlockdownext"; @@ -36859,6 +36881,9 @@ /area/almayer/medical/containment/cell/cl) "ger" = ( /obj/structure/surface/table/almayer, +/obj/item/device/mass_spectrometer{ + pixel_x = 8 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -37227,12 +37252,18 @@ /area/almayer/medical/lower_medical_medbay) "glB" = ( /obj/structure/machinery/chem_master{ + layer = 3.1; + pixel_x = 8; vial_maker = 1 }, /obj/structure/sign/safety/chem_lab{ pixel_x = 5; pixel_y = 29 }, +/obj/structure/machinery/disposal{ + pixel_x = -15; + pixel_y = -3 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -39712,6 +39743,9 @@ id = "Containment Breach"; name = "\improper Secure Airlock" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -59912,6 +59946,9 @@ pixel_x = 1; pixel_y = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "sterile_green_side" @@ -61949,6 +61986,16 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"rmc" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "rmv" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -66714,6 +66761,19 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"tsM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "tsX" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/lobby) @@ -70840,9 +70900,6 @@ pixel_x = 6; pixel_y = 7 }, -/obj/item/device/mass_spectrometer{ - pixel_x = 8 - }, /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, @@ -110049,7 +110106,7 @@ hec gNp hVf dVu -dVu +rmc lON dVu oDR @@ -110861,7 +110918,7 @@ mWs lmw vOy dyb -vkp +tsM prx aoM eVT @@ -111064,7 +111121,7 @@ usy nDo vOy glB -vkp +fpT ger aoM aFf From 77fdcf4f1630757c92b5b0949b14721f09f4a96f Mon Sep 17 00:00:00 2001 From: Bobby Date: Sun, 13 Aug 2023 17:13:16 +0100 Subject: [PATCH 2/2] b --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 82 ++++++++++------------ 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 6dfd2d5d9214..8ad106328123 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -9838,6 +9838,10 @@ pixel_x = 5; pixel_y = 3 }, +/obj/item/reagent_container/glass/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 8 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -30828,10 +30832,7 @@ }, /area/almayer/shipboard/brig/lobby) "dyb" = ( -/obj/structure/machinery/smartfridge/chemistry{ - layer = 3.1; - pixel_x = -4 - }, +/obj/structure/machinery/smartfridge/chemistry, /obj/item/device/radio/intercom{ freerange = 1; name = "General Listening Channel"; @@ -34243,20 +34244,10 @@ /turf/open/floor/almayer, /area/almayer/living/chapel) "eVT" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/wy{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/tool/pen{ - pixel_x = 8 - }, -/obj/item/clipboard{ - pixel_x = -8 - }, -/obj/item/folder/white{ - pixel_x = -8 +/obj/structure/disposalpipe/trunk{ + dir = 1 }, +/obj/structure/machinery/disposal, /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, @@ -35078,17 +35069,9 @@ }, /area/almayer/engineering/starboard_atmos) "fpT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) "fpW" = ( @@ -36881,9 +36864,19 @@ /area/almayer/medical/containment/cell/cl) "ger" = ( /obj/structure/surface/table/almayer, -/obj/item/device/mass_spectrometer{ +/obj/item/paper_bin/wy{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/tool/pen{ pixel_x = 8 }, +/obj/item/clipboard{ + pixel_x = -8 + }, +/obj/item/folder/white{ + pixel_x = -8 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -37251,19 +37244,11 @@ }, /area/almayer/medical/lower_medical_medbay) "glB" = ( -/obj/structure/machinery/chem_master{ - layer = 3.1; - pixel_x = 8; - vial_maker = 1 - }, /obj/structure/sign/safety/chem_lab{ pixel_x = 5; pixel_y = 29 }, -/obj/structure/machinery/disposal{ - pixel_x = -15; - pixel_y = -3 - }, +/obj/structure/machinery/chem_master, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -57553,6 +57538,7 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -66767,7 +66753,8 @@ pixel_y = 1 }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 2; + icon_state = "pipe-c" }, /turf/open/floor/almayer{ dir = 1; @@ -70888,17 +70875,20 @@ /area/almayer/medical/hydroponics) "vgB" = ( /obj/structure/surface/table/almayer, -/obj/item/reagent_container/glass/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 8 - }, /obj/item/storage/box/autoinjectors{ pixel_x = -6; pixel_y = -1 }, +/obj/item/device/mass_spectrometer{ + pixel_x = 8 + }, /obj/item/storage/box/pillbottles{ - pixel_x = 6; - pixel_y = 7 + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/reagent_container/glass/beaker/cryoxadone{ + pixel_x = 8; + pixel_y = 10 }, /turf/open/floor/almayer{ icon_state = "sterile_green_side" @@ -110920,7 +110910,7 @@ vOy dyb tsM prx -aoM +fpT eVT kgs ayT @@ -111121,7 +111111,7 @@ usy nDo vOy glB -fpT +vkp ger aoM aFf