diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm index 656a6e1645bf..70bfabe5d26b 100644 --- a/_maps/shuttles/solgov/solgov_paracelsus.dmm +++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm @@ -38,11 +38,18 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "aF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "aG" = ( @@ -62,6 +69,7 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 4 }, +/obj/machinery/computer/helm/viewscreen/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "be" = ( @@ -157,6 +165,7 @@ /obj/structure/chair/wood{ dir = 1 }, +/obj/machinery/computer/helm/viewscreen/directional/south, /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "bD" = ( @@ -194,6 +203,8 @@ /obj/structure/chair/sofa/right{ dir = 1 }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "co" = ( @@ -295,8 +306,18 @@ "cN" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "cO" = ( @@ -743,7 +764,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "hM" = ( -/obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt/dust, /obj/item/clothing/neck/stripedsolgovscarf, /obj/item/clothing/neck/stripedsolgovscarf, @@ -764,6 +784,8 @@ /obj/item/clothing/suit/solgov/suit, /obj/item/clothing/suit/hooded/wintercoat/solgov, /obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/toy/plush/blahaj, +/obj/structure/closet/cabinet, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "if" = ( @@ -1278,16 +1300,10 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "ns" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/wood, +/turf/open/floor/wood/ebony, /area/ship/crew/canteen) "nt" = ( /obj/effect/turf_decal/borderfloorblack{ @@ -1766,9 +1782,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/medical{ name = "Chemistry"; - req_one_access = list(5,45); + req_one_access = list(5,10,45); id_tag = "sg_par_chem_bolt" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "rz" = ( @@ -1823,19 +1842,21 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/ship/crew/dorm) "rT" = ( /obj/structure/chair/sofa{ dir = 1 }, +/obj/machinery/computer/helm/viewscreen/directional/south, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "rY" = ( @@ -1871,7 +1892,9 @@ dir = 8 }, /obj/structure/closet/secure_closet/wall{ - pixel_y = 28 + pixel_y = 28; + name = "navigational supplies"; + req_access_txt = "19" }, /obj/item/gps, /obj/item/binoculars, @@ -2393,7 +2416,6 @@ /area/ship/crew/canteen) "xp" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing/wood, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "xw" = ( @@ -2560,19 +2582,12 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "yY" = ( -/obj/machinery/door/airlock/solgov/glass{ - dir = 4; - name = "Cafeteria" - }, /obj/effect/turf_decal/industrial/warning{ dir = 4 }, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -2585,6 +2600,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/airlock/solgov/glass{ + dir = 4; + name = "Cafeteria" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "zc" = ( @@ -2740,6 +2762,10 @@ "AX" = ( /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) +"AZ" = ( +/obj/structure/bookcase/random, +/turf/open/floor/wood/ebony, +/area/ship/crew/dorm) "Ba" = ( /obj/effect/turf_decal/techfloor/corner{ dir = 8 @@ -2834,16 +2860,19 @@ /obj/structure/railing/wood{ dir = 8 }, -/obj/structure/closet/wall/red{ - dir = 1; - pixel_y = -28 - }, /obj/item/gun/ballistic/automatic/pistol/solgov, /obj/item/gun/ballistic/automatic/pistol/solgov, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, +/obj/structure/closet/secure_closet/wall{ + dir = 1; + icon_state = "sec_wall"; + name = "firearms locker"; + pixel_y = -28; + req_access_txt = "19" + }, /turf/open/floor/carpet/royalblue, /area/ship/bridge) "BU" = ( @@ -3022,10 +3051,10 @@ /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "DD" = ( -/obj/structure/table/wood, -/obj/item/cutting_board, -/obj/item/kitchen/knife, /obj/machinery/light/directional/north, +/obj/structure/sink/kitchen{ + pixel_y = 16 + }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "DL" = ( @@ -3049,22 +3078,24 @@ /turf/open/floor/wood/yew, /area/ship/crew) "Ea" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/railing/wood, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -19; + pixel_y = -5 }, -/turf/open/floor/wood, +/obj/machinery/button/door{ + dir = 4; + id = "sg_par_cafeteria"; + name = "shutter control"; + pixel_x = -20; + pixel_y = 7 + }, +/obj/structure/table/wood, +/turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Eh" = ( /obj/item/bedsheet/double/solgov{ @@ -3206,6 +3237,9 @@ pixel_x = -6; pixel_y = 2 }, +/obj/item/toy/cards/deck{ + pixel_x = 3 + }, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "EV" = ( @@ -3269,13 +3303,8 @@ "FG" = ( /obj/structure/table/wood, /obj/machinery/airalarm/directional/north, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -17 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = -10; - pixel_y = 6 +/obj/machinery/microwave{ + pixel_y = 5 }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) @@ -3353,15 +3382,15 @@ /turf/open/floor/plasteel/mono/white, /area/ship/medical/surgery) "Hl" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = -12 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) @@ -3515,11 +3544,17 @@ /area/ship/maintenance/starboard) "IO" = ( /obj/structure/table/wood, -/obj/machinery/microwave{ - pixel_y = 5 +/obj/machinery/reagentgrinder{ + pixel_y = 8; + pixel_x = -7 }, -/obj/structure/sign/poster/solgov/random{ - pixel_y = 30 +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = 4; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = 10; + pixel_y = 10 }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) @@ -3796,6 +3831,15 @@ /area/ship/hallway/port) "Lw" = ( /obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "Lx" = ( @@ -3850,7 +3894,6 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "LK" = ( -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, /obj/machinery/button/door{ dir = 4; @@ -3868,6 +3911,7 @@ specialfunctions = 4; normaldoorcontrol = 1 }, +/obj/machinery/autolathe, /turf/open/floor/plasteel/white, /area/ship/medical) "LS" = ( @@ -3898,13 +3942,20 @@ /turf/open/floor/wood/ebony, /area/ship/hallway/starboard) "Mk" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/turf/open/floor/wood, +/obj/structure/railing/wood, +/obj/structure/closet/secure_closet/freezer{ + anchored = 1; + name = "refrigerator" + }, +/obj/item/storage/box/ingredients/vegetarian, +/obj/item/storage/box/ingredients/wildcard, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Mo" = ( /obj/structure/chair/office{ @@ -3966,8 +4017,7 @@ /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "ML" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/structure/railing/wood, +/obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -3977,8 +4027,14 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/soymilk, /obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/food/condiment/enzyme, +/obj/structure/closet/secure_closet/freezer{ + anchored = 1; + name = "refrigerator" + }, +/obj/structure/sign/poster/solgov/random{ + pixel_y = 30 + }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "MO" = ( @@ -4082,7 +4138,15 @@ /area/ship/medical/surgery) "NY" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 12; + pixel_x = -20 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "Ol" = ( @@ -4122,16 +4186,10 @@ /turf/open/floor/wood, /area/ship/bridge) "OO" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/wood, +/turf/open/floor/wood/ebony, /area/ship/crew/canteen) "OS" = ( /obj/structure/sink/kitchen{ @@ -4233,6 +4291,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "Pk" = ( @@ -4379,15 +4440,6 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, /area/ship/crew/dorm) @@ -4434,6 +4486,7 @@ /obj/item/clothing/suit/solgov/suit, /obj/item/clothing/suit/hooded/wintercoat/solgov, /obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/toy/plush/blahaj, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "QQ" = ( @@ -4643,11 +4696,20 @@ /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood, /area/ship/crew/canteen) "SG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "SK" = ( @@ -4670,19 +4732,10 @@ /area/ship/hallway/starboard) "SP" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing/wood, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19; - pixel_y = -5 - }, -/obj/machinery/button/door{ - dir = 4; - id = "sg_par_cafeteria"; - name = "shutter control"; - pixel_x = -20; - pixel_y = 7 - }, +/obj/structure/table/wood, +/obj/item/cutting_board, +/obj/item/kitchen/knife, +/obj/item/kitchen/rollingpin, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Tc" = ( @@ -5013,6 +5066,9 @@ /obj/item/desk_flag/solgov{ pixel_y = 3 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "Wt" = ( @@ -5117,7 +5173,21 @@ /obj/effect/turf_decal/techfloor{ dir = 10 }, -/obj/machinery/autolathe, +/obj/structure/table, +/obj/item/cigbutt{ + pixel_y = 5 + }, +/obj/item/cigbutt{ + pixel_y = 15 + }, +/obj/item/cigbutt{ + pixel_y = 9; + pixel_x = -11 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_y = 10; + pixel_x = 8 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "Xe" = ( @@ -6281,7 +6351,7 @@ pK NY dh Wt -eH +AZ bf wI "} @@ -6313,7 +6383,7 @@ rO aF Bg Pk -eH +AZ bf wI "} @@ -6373,8 +6443,8 @@ qL qL qL Ev -yY vL +yY Ky Ky Ky