diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm index 7c7c60eff5ec..27357498f2ed 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm @@ -909,6 +909,14 @@ pixel_x = -10; pixel_y = -6 }, +/obj/item/reagent_containers/glass/filter{ + pixel_y = 4; + pixel_x = 3 + }, +/obj/item/reagent_containers/glass/filter{ + pixel_y = 4; + pixel_x = 12 + }, /turf/open/floor/suns/dark/plain, /area/ship/medical) "fM" = ( @@ -1514,9 +1522,20 @@ /turf/open/floor/suns/dark/plain, /area/ship/crew/office/lobby) "iM" = ( -/obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/medical) +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "Panacea_bridge_shuts" + }, +/turf/open/floor/plating, +/area/ship/bridge) "iN" = ( /obj/structure/table/wood/reinforced, /obj/item/toy/plush/blahaj{ @@ -2217,12 +2236,12 @@ pixel_y = 6 }, /obj/item/folder/red{ - pixel_x = 3; - pixel_y = -7 + pixel_x = 4; + pixel_y = -9 }, /obj/item/folder/blue{ - pixel_x = 6; - pixel_y = -7 + pixel_x = 7; + pixel_y = -9 }, /obj/item/pen/fountain{ pixel_y = 11; @@ -2232,8 +2251,15 @@ dir = 8 }, /obj/item/folder/suns{ - pixel_y = -7; - pixel_x = 9 + pixel_y = -9; + pixel_x = 10 + }, +/obj/machinery/button/door{ + id = "Panacea_bridge_shuts"; + name = "Window Shutters"; + dir = 4; + pixel_y = -8; + pixel_x = -7 }, /turf/open/floor/suns/dark, /area/ship/bridge) @@ -2488,6 +2514,11 @@ pixel_y = 22; pixel_x = -10 }, +/obj/machinery/firealarm/directional/east{ + pixel_y = 30; + dir = 1; + pixel_x = 2 + }, /turf/open/floor/suns, /area/ship/bridge) "oq" = ( @@ -2792,9 +2823,18 @@ /obj/structure/table/wood/reinforced, /obj/machinery/computer/med_data/laptop{ dir = 1; - pixel_y = 4 + pixel_y = 4; + pixel_x = -1 }, /obj/machinery/light/directional/west, +/obj/item/spacecash/bundle/c1000{ + pixel_x = 14; + pixel_y = 9 + }, +/obj/item/spacecash/bundle/c1000{ + pixel_y = 2; + pixel_x = 13 + }, /turf/open/floor/suns/diagonal{ color = "#543C30" }, @@ -5127,6 +5167,10 @@ /obj/item/stock_parts/cell/high, /obj/machinery/light/directional/west, /obj/structure/cable/blue, +/obj/item/stock_parts/cell/high{ + pixel_x = -6; + pixel_y = 0 + }, /turf/open/floor/suns/grid, /area/ship/engineering) "Es" = ( @@ -5229,6 +5273,12 @@ /obj/structure/cable/blue{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/suns/hatch{ color = "#543C30" }, @@ -5528,16 +5578,16 @@ "Gx" = ( /obj/structure/table/chem, /obj/machinery/reagentgrinder{ - pixel_y = 9; - pixel_x = -6 + pixel_y = 17; + pixel_x = 4 }, -/obj/item/reagent_containers/glass/filter{ - pixel_y = 4; - pixel_x = 3 +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -7; + pixel_y = 12 }, -/obj/item/reagent_containers/glass/filter{ - pixel_y = 4; - pixel_x = 12 +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -4; + pixel_y = 5 }, /turf/open/floor/suns/dark/plain, /area/ship/medical) @@ -5604,17 +5654,6 @@ color = "#56342A" }, /area/ship/crew/dorm/dormfour) -"GN" = ( -/obj/item/spacecash/bundle/c1000{ - pixel_x = -39; - pixel_y = -35 - }, -/obj/item/spacecash/bundle/c1000{ - pixel_y = -30; - pixel_x = -38 - }, -/turf/open/floor/suns/dark, -/area/ship/bridge) "GV" = ( /obj/structure/railing, /obj/machinery/photocopier, @@ -6127,10 +6166,6 @@ pixel_x = 0; pixel_y = 21 }, -/obj/item/pinpointer/crew{ - pixel_y = 4; - pixel_x = 7 - }, /obj/item/storage/belt/medical{ pixel_x = -9; pixel_y = 1 @@ -6139,6 +6174,10 @@ pixel_y = -5; pixel_x = 5 }, +/obj/item/reagent_containers/glass/beaker/unholywater{ + pixel_x = 6; + pixel_y = 7 + }, /turf/open/floor/suns/diagonal{ color = "#543C30" }, @@ -6747,6 +6786,11 @@ /area/ship/engineering) "Nq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/smartfridge/chemistry/preloaded{ + pixel_x = 0; + pixel_y = 33; + density = 0 + }, /turf/open/floor/suns, /area/ship/medical) "Nr" = ( @@ -7486,14 +7530,6 @@ name = "Medical Instructor's Locker"; req_access = list(20) }, -/obj/item/clothing/head/suns/cmo{ - pixel_x = -11; - pixel_y = 12 - }, -/obj/item/clothing/suit/toggle/labcoat/suns/cmo{ - pixel_x = 4; - pixel_y = 7 - }, /obj/item/clothing/neck/cloak/suns{ pixel_x = -8; pixel_y = 0 @@ -7502,29 +7538,17 @@ pixel_x = 3; pixel_y = -1 }, -/obj/item/clothing/gloves/color/latex/nitrile/suns{ - pixel_x = -6; - pixel_y = -9 - }, /obj/item/clothing/glasses/science/suns{ - pixel_x = 9; - pixel_y = -9 - }, -/obj/item/clothing/mask/surgical/suns{ - pixel_x = 10; - pixel_y = 4 + pixel_x = 8; + pixel_y = 11 }, /obj/item/hypospray/mkii/CMO, /obj/item/clothing/glasses/hud/health/sunglasses, /obj/structure/table/wood, -/obj/item/reagent_containers/glass/beaker/unholywater, -/obj/item/surgicaldrill/advanced, /obj/item/healthanalyzer/advanced, -/obj/item/retractor/advanced, /obj/item/scalpel/advanced, /obj/item/clothing/glasses/hud/health/night, /obj/item/clothing/head/suns, -/obj/item/clothing/head/suns/surgery, /obj/item/clothing/suit/armor/vest/suns/xo, /obj/item/clothing/under/syndicate/suns/sciencejumpsuit, /obj/item/clothing/gloves/suns/xo, @@ -7535,6 +7559,14 @@ /obj/item/clothing/under/syndicate/suns/xo, /obj/item/clothing/mask/surgical/suns, /obj/item/clothing/neck/cloak/suns/xo, +/obj/item/retractor/advanced{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/surgicaldrill/advanced{ + pixel_x = -5; + pixel_y = -1 + }, /turf/open/floor/suns/diagonal{ color = "#543C30" }, @@ -7550,12 +7582,11 @@ dir = 6 }, /obj/machinery/button/door{ - id = "Panacea_medbay_priv_shut"; - name = "Privacy Shutters"; - pixel_x = 0; - pixel_y = -21; + id = "Panacea_patient_commons_shut"; + name = "Window Shutters"; dir = 1; - req_one_access = list(5, 19, 20, 57, 45) + pixel_y = 21; + pixel_x = -20 }, /turf/open/floor/suns/dark, /area/ship/bridge) @@ -9161,7 +9192,7 @@ dy DJ DJ DJ -iM +DJ Nq Zo oB @@ -9456,7 +9487,7 @@ EO kW zZ td -GN +Af kW Sp Bc @@ -9531,7 +9562,7 @@ SO SO SO SO -SO +iM Dp zc Pz