From 4746044f18652783f328b1e692d2a918ffbc4bd9 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Sun, 14 Jul 2024 17:57:20 -0500 Subject: [PATCH 01/10] Crying sun improvement tweaks + PGF equipment cold protections --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 398 +++++++++++-------- _maps/shuttles/subshuttles/pgf_nail.dmm | 3 +- code/game/MapData/shuttles/pgf_crying_sun.dm | 2 +- code/modules/clothing/factions/gezena.dm | 15 +- 4 files changed, 246 insertions(+), 172 deletions(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 919770509bec..e300f51fcd9d 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -129,6 +129,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/hallway/port) +"bi" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) "bl" = ( /obj/effect/turf_decal/industrial/traffic, /obj/machinery/power/apc/auto_name/directional/north, @@ -215,10 +222,6 @@ /obj/item/storage/box/flashes{ pixel_y = -1 }, -/obj/item/screwdriver{ - pixel_x = -8; - pixel_y = -5 - }, /obj/item/screwdriver{ pixel_x = -5; pixel_y = -5 @@ -235,10 +238,6 @@ pixel_x = 4; pixel_y = -5 }, -/obj/item/screwdriver{ - pixel_x = 7; - pixel_y = -5 - }, /obj/structure/closet/secure_closet/wall/directional/west{ icon_state = "sec_wall"; name = "equipment locker" @@ -406,9 +405,6 @@ dir = 6 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -422,7 +418,7 @@ icon_state = "0-8" }, /turf/open/floor/engine/hull, -/area/ship/external/dark) +/area/ship/bridge) "dz" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 10 @@ -464,10 +460,10 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/hallway/port) "dK" = ( -/obj/machinery/computer/cargo/express{ - dir = 8 +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/turf_decal/floordetail/tiled, /obj/structure/cable{ icon_state = "1-2" }, @@ -523,9 +519,6 @@ dir = 8; name = "engine fuel pump" }, -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/camera/autoname{ dir = 2; network = list("GEC") @@ -1010,6 +1003,20 @@ /obj/machinery/light/directional/north, /turf/open/floor/plating, /area/ship/engineering) +"hX" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "lib_bridge_shut" + }, +/turf/open/floor/plating, +/area/ship/bridge) "if" = ( /obj/structure/cable{ icon_state = "0-8" @@ -1019,7 +1026,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating/airless, -/area/ship/external/dark) +/area/ship/bridge) "ih" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset, @@ -1166,12 +1173,12 @@ /area/ship/hangar/starboard) "jm" = ( /obj/machinery/holopad/emergency, -/obj/effect/turf_decal/spline/fancy/opaque/lime{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/spline/fancy/opaque/lime{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "jt" = ( @@ -1421,7 +1428,7 @@ /obj/structure/table/reinforced, /obj/effect/turf_decal/corner/opaque/lime/mono, /obj/machinery/camera/autoname{ - dir = 1 + dir = 10 }, /obj/machinery/light/directional/south, /turf/open/floor/plasteel/mono/dark, @@ -1457,14 +1464,13 @@ pixel_x = 4; pixel_y = 4 }, +/obj/machinery/light/directional/north, /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = -10; pixel_y = 3; - name = "'Anastheasia'"; + name = "'Anesthesia'"; desc = "A bottle of Git's with the word 'Anastheasia' written over it in marker." }, -/obj/machinery/light/directional/north, -/obj/item/clothing/neck/stethoscope, /turf/open/floor/mineral/titanium, /area/ship/medical) "mL" = ( @@ -1473,7 +1479,7 @@ }, /obj/structure/closet/crate{ icon_state = "wooden"; - name = "myning geer"; + name = "mining gear"; desc = "A rectangular steel crate with 'myning geer' spelled out in crayon on top." }, /obj/item/storage/bag/ore{ @@ -1608,10 +1614,8 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/port) "no" = ( -/obj/structure/bed, -/obj/item/bedsheet/cosmos, /obj/structure/curtain/cloth/grey, -/turf/open/floor/plasteel/dark, +/turf/open/floor/ship/dirt, /area/ship/crew/dorm) "nv" = ( /obj/effect/turf_decal/industrial/traffic, @@ -1665,6 +1669,14 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) +"om" = ( +/obj/effect/turf_decal/corner/opaque/lime/mono, +/obj/structure/table/reinforced, +/obj/item/binoculars{ + pixel_y = 3 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) "ou" = ( /obj/structure/railing{ dir = 8 @@ -1848,6 +1860,22 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) +"pK" = ( +/obj/structure/cable/blue{ + icon_state = "0-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engines/starboard) "pW" = ( /obj/machinery/computer/helm/viewscreen/directional/west, /obj/effect/turf_decal/siding/wood{ @@ -1883,15 +1911,8 @@ /turf/open/floor/plasteel/sepia, /area/ship/crew/dorm/dormthree) "qj" = ( -/obj/structure/table/reinforced, -/obj/item/desk_flag/gezena{ - pixel_x = 9; - pixel_y = 1 - }, -/obj/machinery/recharger{ - pixel_y = 1; - pixel_x = -6 - }, +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/floordetail/tiled, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "qm" = ( @@ -1904,7 +1925,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "qp" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/structure/cable{ icon_state = "1-10" }, @@ -1915,6 +1935,9 @@ dir = 1 }, /obj/item/paper/guides/jobs/engi/combustion_thruster, +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engines/starboard) "qy" = ( @@ -2104,11 +2127,6 @@ /turf/closed/wall/mineral/plastitanium, /area/ship/engineering/engines/starboard) "sF" = ( -/obj/machinery/door/airlock/security/glass{ - req_one_access_txt = "1"; - req_access = list(1); - name = "Checkpoint" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2117,6 +2135,11 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/security/glass{ + req_one_access_txt = "1"; + req_access = list(1,7); + name = "Checkpoint" + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "sJ" = ( @@ -2241,7 +2264,6 @@ pixel_y = 3 }, /obj/effect/turf_decal/corner/opaque/lime/mono, -/obj/machinery/light/directional/south, /obj/machinery/light_switch{ dir = 4; pixel_x = -19; @@ -2260,10 +2282,11 @@ /turf/closed/wall/mineral/titanium/exterior, /area/ship/crew/cryo) "tQ" = ( -/obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/corner_steel_grid{ dir = 9 }, +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/floordetail/tiled, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "tU" = ( @@ -2274,12 +2297,15 @@ icon_state = "0-2" }, /turf/open/floor/engine/hull, -/area/ship/external/dark) -"uh" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/area/ship/bridge) +"tY" = ( +/obj/machinery/modular_computer/console/preset/command{ + dir = 1 }, -/obj/effect/turf_decal/floordetail/tiled, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"uh" = ( /obj/structure/cable{ icon_state = "4-8" }, @@ -2585,12 +2611,12 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "wz" = ( -/obj/effect/turf_decal/corner_steel_grid{ - dir = 9 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "wK" = ( @@ -2812,6 +2838,19 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/tech, /area/ship/engineering/engines/port) +"yy" = ( +/obj/structure/table/reinforced, +/obj/item/desk_flag/gezena{ + pixel_x = 9; + pixel_y = 1 + }, +/obj/machinery/recharger{ + pixel_y = 1; + pixel_x = -6 + }, +/obj/effect/turf_decal/floordetail/tiled, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) "yF" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 1 @@ -2932,9 +2971,6 @@ icon_state = "1-4" }, /obj/structure/catwalk/over/plated_catwalk, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/structure/cable, @@ -3092,6 +3128,22 @@ /obj/machinery/vending/toyliberationstation, /turf/open/floor/plasteel/tech, /area/ship/security) +"AM" = ( +/obj/structure/cable/blue{ + icon_state = "0-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engines/port) "AN" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3359,7 +3411,7 @@ icon_state = "0-4" }, /turf/open/floor/engine/hull, -/area/ship/external/dark) +/area/ship/bridge) "CO" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/corner_steel_grid/full{ @@ -3583,10 +3635,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/external/dark) "El" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/modular_computer/console/preset/command{ +/obj/machinery/computer/security{ dir = 1 }, /obj/structure/catwalk/over/plated_catwalk/dark, @@ -3639,7 +3688,7 @@ }, /obj/structure/cable, /turf/open/floor/engine/hull, -/area/ship/external/dark) +/area/ship/bridge) "EA" = ( /obj/structure/sign/poster/contraband/pgf{ pixel_y = 32 @@ -3904,7 +3953,7 @@ icon_state = "0-4" }, /turf/open/floor/engine/hull, -/area/ship/external/dark) +/area/ship/bridge) "FN" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/door/poddoor{ @@ -3924,7 +3973,7 @@ icon_state = "0-4" }, /turf/open/floor/engine/hull/reinforced, -/area/ship/external/dark) +/area/ship/bridge) "FU" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 10 @@ -3946,10 +3995,10 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "Gb" = ( -/obj/machinery/computer/crew{ - dir = 8 +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/turf_decal/floordetail/tiled, /obj/structure/cable{ icon_state = "1-8" }, @@ -4104,8 +4153,8 @@ "GW" = ( /obj/structure/rack, /obj/item/stock_parts/cell/gun/pgf{ - pixel_y = 12; - pixel_x = -3 + pixel_x = -6; + pixel_y = -2 }, /obj/item/stock_parts/cell/gun/pgf{ pixel_y = 10; @@ -4128,6 +4177,13 @@ pixel_x = 3 }, /obj/effect/turf_decal/corner/opaque/neutral/full, +/obj/item/stock_parts/cell/gun/pgf{ + pixel_x = -12 + }, +/obj/item/stock_parts/cell/gun/pgf{ + pixel_x = -8; + pixel_y = -2 + }, /turf/open/floor/vault, /area/ship/security/armory) "Ha" = ( @@ -4152,7 +4208,7 @@ icon_state = "0-2" }, /turf/open/floor/engine/hull, -/area/ship/external/dark) +/area/ship/bridge) "Hf" = ( /obj/structure/railing, /obj/effect/turf_decal/corner_steel_grid{ @@ -4300,10 +4356,6 @@ /area/ship/crew/canteen) "Ig" = ( /obj/machinery/computer/helm/viewscreen/directional/north, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/turf_decal/floordetail/tiled, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Ir" = ( @@ -4466,6 +4518,20 @@ }, /turf/open/floor/engine/hull, /area/ship/external/dark) +"KH" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "lib_bridge_shut" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/bridge) "KM" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/port) @@ -4516,9 +4582,6 @@ dir = 8; name = "engine fuel pump" }, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/machinery/camera/autoname{ dir = 1; network = list("GEC") @@ -4713,9 +4776,6 @@ pixel_x = -9; pixel_y = 3 }, -/obj/item/clothing/head/gezena/medic/flap{ - pixel_x = 12 - }, /obj/item/clothing/head/gezena/medic{ pixel_y = 4; pixel_x = 7 @@ -4743,6 +4803,11 @@ pixel_x = -13; pixel_y = -19 }, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/head/gezena/flap/medic{ + pixel_x = 12; + pixel_y = 1 + }, /turf/open/floor/mineral/titanium, /area/ship/medical) "MF" = ( @@ -4801,6 +4866,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "MZ" = ( @@ -4877,7 +4945,7 @@ dir = 8 }, /obj/structure/closet/crate{ - name = "Mishun Acomplshed" + name = "Mission Accomplished" }, /obj/item/poster/mission_accomplished_7, /obj/item/poster/mission_accomplished_6, @@ -4917,8 +4985,13 @@ /area/ship/external/dark) "NF" = ( /obj/structure/closet/crate/radiation, -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation{ + pixel_x = -7 + }, +/obj/item/clothing/head/radiation{ + pixel_x = -7 }, /turf/open/floor/plasteel/dark, /area/ship/construction) @@ -5119,6 +5192,9 @@ /turf/open/floor/vault, /area/ship/security/armory) "Pb" = ( +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/plasteel/stairs{ icon = 'icons/obj/stairs.dmi'; dir = 2 @@ -5145,7 +5221,6 @@ /turf/open/floor/plating, /area/ship/engineering) "Ph" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/structure/cable{ icon_state = "2-9" }, @@ -5155,6 +5230,9 @@ /obj/machinery/atmospherics/components/trinary/mixer/layer2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engines/port) "Pi" = ( @@ -5360,6 +5438,13 @@ /obj/effect/turf_decal/corner/opaque/neutral/full, /turf/open/floor/vault, /area/ship/security/armory) +"Qi" = ( +/obj/machinery/computer/cargo/express{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) "Qq" = ( /obj/structure/rack, /obj/item/kitchen/knife/combat/survival{ @@ -5867,6 +5952,7 @@ /obj/item/gun/energy/kalix/pistol{ pixel_y = -16 }, +/obj/item/screwdriver, /turf/open/floor/plasteel/sepia, /area/ship/crew/dorm/dormthree) "UH" = ( @@ -5915,13 +6001,6 @@ pixel_x = -10; pixel_y = -7 }, -/obj/item/clothing/under/gezena/marine{ - pixel_x = -10; - pixel_y = -7 - }, -/obj/item/clothing/gloves/gezena/marine{ - pixel_y = 11 - }, /obj/item/clothing/gloves/gezena/marine{ pixel_y = 11 }, @@ -5931,22 +6010,6 @@ /obj/item/clothing/gloves/gezena/marine{ pixel_y = 11 }, -/obj/item/clothing/head/gezena/marine/flap{ - pixel_x = -10 - }, -/obj/item/clothing/head/gezena/marine/flap{ - pixel_x = -10 - }, -/obj/item/clothing/head/gezena/marine/flap{ - pixel_x = -10 - }, -/obj/item/clothing/head/gezena/marine/flap{ - pixel_x = -10 - }, -/obj/item/clothing/head/gezena/marine{ - pixel_y = 10; - pixel_x = -10 - }, /obj/item/clothing/head/gezena/marine{ pixel_y = 10; pixel_x = -10 @@ -5975,9 +6038,6 @@ /obj/item/storage/backpack/duffelbag/sec{ pixel_y = -13 }, -/obj/item/storage/backpack/duffelbag/sec{ - pixel_y = -13 - }, /obj/item/storage/backpack/satchel/sec{ pixel_x = -8; pixel_y = -17 @@ -5990,14 +6050,6 @@ pixel_x = -8; pixel_y = -17 }, -/obj/item/storage/backpack/satchel/sec{ - pixel_x = -8; - pixel_y = -17 - }, -/obj/item/clothing/shoes/combat/gezena{ - pixel_x = 3; - pixel_y = 0 - }, /obj/item/clothing/shoes/combat/gezena{ pixel_x = 3; pixel_y = 0 @@ -6011,6 +6063,18 @@ pixel_y = 0 }, /obj/effect/turf_decal/corner/opaque/neutral/full, +/obj/item/clothing/head/gezena/flap/marine{ + pixel_y = 1; + pixel_x = -10 + }, +/obj/item/clothing/head/gezena/flap/marine{ + pixel_y = 1; + pixel_x = -10 + }, +/obj/item/clothing/head/gezena/flap/marine{ + pixel_y = 1; + pixel_x = -10 + }, /turf/open/floor/vault, /area/ship/security/armory) "Vp" = ( @@ -6059,11 +6123,11 @@ /turf/open/floor/plasteel/mono, /area/ship/hangar/starboard) "VM" = ( -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "engine fuel pump" + }, /turf/open/floor/plating, /area/ship/engineering/engines/starboard) "VY" = ( @@ -6075,7 +6139,7 @@ anchored = 1; can_be_unanchored = 1; icon_state = "warden"; - name = "sergeant's locker"; + name = "Sergeant's locker"; req_access_txt = "3"; req_access = list(3) }, @@ -6106,10 +6170,6 @@ pixel_y = 1; pixel_x = -11 }, -/obj/item/clothing/head/gezena/marine/lead/flap{ - pixel_y = 9; - pixel_x = -11 - }, /obj/item/clothing/suit/armor/gezena/marinecoat{ pixel_y = 8 }, @@ -6117,14 +6177,6 @@ pixel_y = 11; pixel_x = 5 }, -/obj/item/radio/headset/pgf/captain{ - pixel_x = -4; - pixel_y = 9 - }, -/obj/item/kitchen/knife/combat/survival{ - pixel_y = 0; - pixel_x = 1 - }, /obj/item/storage/belt/military/gezena{ pixel_y = 1 }, @@ -6132,6 +6184,10 @@ pixel_x = -8; pixel_y = -17 }, +/obj/item/radio/headset/pgf/captain{ + pixel_x = -2; + pixel_y = 9 + }, /obj/item/storage/backpack/duffelbag/sec{ pixel_y = -13 }, @@ -6140,7 +6196,14 @@ pixel_x = -3 }, /obj/item/clothing/head/helmet/gezena{ - pixel_y = -11 + pixel_x = -11 + }, +/obj/item/clothing/suit/armor/gezena/marine{ + pixel_y = 8 + }, +/obj/item/clothing/head/gezena/flap/marine/lead{ + pixel_x = -10; + pixel_y = 10 }, /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/dormtwo) @@ -6171,6 +6234,16 @@ }, /turf/open/floor/plasteel/sepia, /area/ship/crew/dorm) +"Wg" = ( +/obj/effect/turf_decal/spline/fancy/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/lime, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "Wk" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -6229,9 +6302,6 @@ dir = 5 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -6384,13 +6454,11 @@ /turf/open/floor/plasteel/tech, /area/ship/construction) "Yd" = ( -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "engine fuel pump" + }, /turf/open/floor/plating, /area/ship/engineering/engines/port) "Yo" = ( @@ -6735,14 +6803,14 @@ xz lc lc CB -CB +AM UM lc FO LD TV bB -Wk +pK Wk TV TV @@ -7914,8 +7982,8 @@ bb wz tQ El -Ms -MF +Wg +om MF eO Ly @@ -7941,10 +8009,10 @@ MF Ig uh qj -Ms -CZ -xz -Mk +tY +hX +MF +MF Bc KS Sp @@ -7968,10 +8036,10 @@ Hb vr dK Gb -Ms +yy +KH CZ xz -xz Mk iK sQ @@ -7993,13 +8061,13 @@ xz xz xz cR -Rx -bD -bD +Sd +Qi +bi +Ms CZ xz xz -xz Mk Er Mk @@ -8021,10 +8089,10 @@ xz xz xz xz -xz -xz -xz -xz +Rx +bD +bD +CZ xz xz xz diff --git a/_maps/shuttles/subshuttles/pgf_nail.dmm b/_maps/shuttles/subshuttles/pgf_nail.dmm index 9a5224dc4573..02255b90a5c0 100644 --- a/_maps/shuttles/subshuttles/pgf_nail.dmm +++ b/_maps/shuttles/subshuttles/pgf_nail.dmm @@ -391,7 +391,8 @@ icon_state = "0-4" }, /obj/machinery/porta_turret/ship/weak{ - dir = 8 + dir = 8; + mode = 1 }, /turf/open/floor/engine/hull/reinforced/interior, /area/ship/external/dark) diff --git a/code/game/MapData/shuttles/pgf_crying_sun.dm b/code/game/MapData/shuttles/pgf_crying_sun.dm index 6df40aa0efdd..2851518e669a 100644 --- a/code/game/MapData/shuttles/pgf_crying_sun.dm +++ b/code/game/MapData/shuttles/pgf_crying_sun.dm @@ -2,7 +2,7 @@ name = "The UCWLWM" desc = "It's looks old and worn out." icon_state = "book3" - author = "Welds-the-Steel" + author = "Senior Engineer Wihlz-Saai" title = "The Universal Colossal Warship Linear Weapon Mount" dat = {" diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm index 96c6eee3c734..40b1267f76af 100644 --- a/code/modules/clothing/factions/gezena.dm +++ b/code/modules/clothing/factions/gezena.dm @@ -36,10 +36,12 @@ item_state = "bluecloth" blood_overlay_type = "coat" togglename = "zipper" - body_parts_covered = CHEST + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON - armor = list("melee" = 20, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) //Armored suit @@ -130,6 +132,9 @@ desc = "The standard cap of the PGF military, in Navy colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects." icon_state = "navalflap" item_state = "bluecloth" + cold_protection = HEAD + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) /obj/item/clothing/head/gezena/marine name = "\improper PGFMC Cap" @@ -137,7 +142,7 @@ icon_state = "marinehat" item_state = "marinecloth" -/obj/item/clothing/head/gezena/marine/flap +/obj/item/clothing/head/gezena/flap/marine name = "\improper PGFMC Betzu-il cap" desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects." icon_state = "marineflap" @@ -149,7 +154,7 @@ icon_state = "squadhat" item_state = "marinecloth" -/obj/item/clothing/head/gezena/marine/lead/flap +/obj/item/clothing/head/gezena/flap/marine/lead name = "\improper PGFMC Commander's' Betzu-il cap" desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The silver markings denote it as a commander's cap." icon_state = "squadflap" @@ -161,7 +166,7 @@ icon_state = "medichat" item_state = "whitecloth" -/obj/item/clothing/head/gezena/medic/flap +/obj/item/clothing/head/gezena/flap/medic name = "\improper PGF medic Betzu-il cap" desc = "The standard cap of the PGF military. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The coloring indicates the wearer as a medical officer." icon_state = "medicflap" From 7035cb8805e75e66ce59818a2fb5f8537fa75f71 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Sun, 14 Jul 2024 18:30:20 -0500 Subject: [PATCH 02/10] Fixes the incorrect engine types --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 40 +++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index e300f51fcd9d..5efd65535125 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -1,4 +1,18 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ae" = ( +/obj/structure/cable/blue{ + icon_state = "0-4" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/door/poddoor{ + dir = 4; + id = "lib_engine_blast" + }, +/obj/machinery/power/shuttle/engine/fire{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engines/port) "ai" = ( /obj/structure/railing, /obj/structure/cable/yellow{ @@ -419,6 +433,20 @@ }, /turf/open/floor/engine/hull, /area/ship/bridge) +"dv" = ( +/obj/structure/cable/blue{ + icon_state = "0-4" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/door/poddoor{ + dir = 4; + id = "lib_engine_blast" + }, +/obj/machinery/power/shuttle/engine/fire{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engines/starboard) "dz" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 10 @@ -4805,8 +4833,8 @@ }, /obj/item/clothing/neck/stethoscope, /obj/item/clothing/head/gezena/flap/medic{ - pixel_x = 12; - pixel_y = 1 + pixel_y = 1; + pixel_x = 12 }, /turf/open/floor/mineral/titanium, /area/ship/medical) @@ -6202,8 +6230,8 @@ pixel_y = 8 }, /obj/item/clothing/head/gezena/flap/marine/lead{ - pixel_x = -10; - pixel_y = 10 + pixel_y = 10; + pixel_x = -10 }, /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/dormtwo) @@ -6775,14 +6803,14 @@ xz xz lc hJ -hJ +ae is lc xz xz TV FN -fN +dv fN TV xz From 22bb3d3ef2180e8a3589ccb320b3c234c08cef17 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Tue, 16 Jul 2024 05:32:17 -0500 Subject: [PATCH 03/10] Fixes the missing cargo console --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 5efd65535125..802f4218ce0f 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -5467,10 +5467,10 @@ /turf/open/floor/vault, /area/ship/security/armory) "Qi" = ( -/obj/machinery/computer/cargo/express{ +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/computer/cargo{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Qq" = ( From 35c99c8dab2f348879bf2518f6114d6ed2d8e6b6 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Wed, 17 Jul 2024 16:46:37 -0500 Subject: [PATCH 04/10] Adds a dresser to the Crew Quarters and adds a missing bed --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 802f4218ce0f..990cf84f9adc 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -1643,7 +1643,12 @@ /area/ship/hallway/port) "no" = ( /obj/structure/curtain/cloth/grey, -/turf/open/floor/ship/dirt, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/bed, +/obj/item/bedsheet/brown, +/turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "nv" = ( /obj/effect/turf_decal/industrial/traffic, @@ -1824,22 +1829,22 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/table, /obj/item/toy/plush/knight{ - pixel_y = 10; + pixel_y = 11; pixel_x = -10 }, /obj/item/toy/plush/hornet{ - pixel_y = 8; - pixel_x = -3 + pixel_y = 10; + pixel_x = -2 }, /obj/item/toy/plush/mora{ - pixel_y = 4; - pixel_x = 5 + pixel_y = 6; + pixel_x = 6 }, /obj/effect/turf_decal/corner_steel_grid{ dir = 10 }, +/obj/structure/dresser, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "oX" = ( From 6f00953c1665349b254a9000bd165931de489055 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Mon, 29 Jul 2024 16:56:20 -0500 Subject: [PATCH 05/10] Role and clothing name changes --- _maps/configs/pgf_crying_sun.json | 4 ++-- code/modules/clothing/factions/gezena.dm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json index d4eb67b1fb50..23114c8aa274 100644 --- a/_maps/configs/pgf_crying_sun.json +++ b/_maps/configs/pgf_crying_sun.json @@ -21,7 +21,7 @@ "officer": true, "slots": 1 }, - "Bridge Crew": { + "Helmsman": { "outfit": "/datum/outfit/job/gezena/assistant/bridge", "slots": 1 }, @@ -37,7 +37,7 @@ "outfit": "/datum/outfit/job/gezena/assistant", "slots": 2 }, - "Marine Sergeant": { + "Marine Lieutenant": { "outfit": "/datum/outfit/job/gezena/hos", "slots": 1 }, diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm index 40b1267f76af..eabc0fe752c4 100644 --- a/code/modules/clothing/factions/gezena.dm +++ b/code/modules/clothing/factions/gezena.dm @@ -265,8 +265,8 @@ item_state = "blackcloth" /obj/item/clothing/neck/cloak/gezena/lead - name = "sergeant's Azuilhauz" - desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a squad commander." + name = "marine officer's Azuilhauz" + desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a squad leader." icon_state = "squadcape" item_state = "blackcloth" @@ -283,7 +283,7 @@ item_state = "whitecloth" /obj/item/clothing/neck/cloak/gezena/command - name = "officer's Azuilhauz" + name = "navy officer's Azuilhauz" desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer." icon_state = "commandcape" item_state = "whitecloth" From 61768589755ada455518631d46afee2a9618ffe1 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Mon, 29 Jul 2024 17:00:25 -0500 Subject: [PATCH 06/10] Tuuret mode changes, ship area adjustments, object renaming, and bridge item adjustment --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 67 ++++++++++++++++++--------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 990cf84f9adc..1e4d21ac27a5 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -426,13 +426,14 @@ /area/ship/engineering/engines/starboard) "du" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 6 + dir = 6; + mode = 1 }, /obj/structure/cable{ icon_state = "0-8" }, /turf/open/floor/engine/hull, -/area/ship/bridge) +/area/ship/external/dark) "dv" = ( /obj/structure/cable/blue{ icon_state = "0-4" @@ -1050,11 +1051,12 @@ icon_state = "0-8" }, /obj/machinery/porta_turret/ship/weak{ - dir = 4 + dir = 4; + mode = 1 }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating/airless, -/area/ship/bridge) +/area/ship/external/dark) "ih" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset, @@ -1288,7 +1290,7 @@ }, /obj/machinery/button/door{ id = "lib_armory_1"; - name = "Sergeant Access"; + name = "Lieutenant Access"; dir = 4; pixel_x = -20; pixel_y = -5; @@ -1705,8 +1707,25 @@ "om" = ( /obj/effect/turf_decal/corner/opaque/lime/mono, /obj/structure/table/reinforced, +/obj/item/clipboard{ + pixel_x = -7; + pixel_y = 0 + }, +/obj/item/pen{ + pixel_x = -8; + pixel_y = -1 + }, /obj/item/binoculars{ - pixel_y = 3 + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/gps{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/megaphone/command{ + pixel_y = 1; + pixel_x = 3 }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) @@ -2324,7 +2343,8 @@ /area/ship/bridge) "tU" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 5 + dir = 5; + mode = 1 }, /obj/structure/cable{ icon_state = "0-2" @@ -2882,7 +2902,7 @@ pixel_x = -6 }, /obj/effect/turf_decal/floordetail/tiled, -/turf/open/floor/plasteel/telecomms_floor, +/turf/open/space/basic, /area/ship/bridge) "yF" = ( /obj/effect/turf_decal/industrial/traffic{ @@ -3039,7 +3059,7 @@ }, /obj/machinery/door/airlock/security{ req_access = list(3); - name = "Sergeant's Quarters" + name = "Lieutenant's Quarters" }, /turf/open/floor/plasteel/tech, /area/ship/security) @@ -3438,13 +3458,14 @@ /area/ship/crew/canteen) "CF" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 10 + dir = 10; + mode = 1 }, /obj/structure/cable{ icon_state = "0-4" }, /turf/open/floor/engine/hull, -/area/ship/bridge) +/area/ship/external/dark) "CO" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/corner_steel_grid/full{ @@ -3717,11 +3738,12 @@ /area/ship/hallway/central) "Eu" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 5 + dir = 5; + mode = 1 }, /obj/structure/cable, /turf/open/floor/engine/hull, -/area/ship/bridge) +/area/ship/external/dark) "EA" = ( /obj/structure/sign/poster/contraband/pgf{ pixel_y = 32 @@ -3980,13 +4002,14 @@ /area/ship/hallway/central) "FJ" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 5 + dir = 5; + mode = 1 }, /obj/structure/cable{ icon_state = "0-4" }, /turf/open/floor/engine/hull, -/area/ship/bridge) +/area/ship/external/dark) "FN" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/door/poddoor{ @@ -4000,13 +4023,14 @@ /area/ship/engineering/engines/starboard) "FO" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 8 + dir = 8; + mode = 1 }, /obj/structure/cable{ icon_state = "0-4" }, /turf/open/floor/engine/hull/reinforced, -/area/ship/bridge) +/area/ship/external/dark) "FU" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 10 @@ -4235,13 +4259,14 @@ /area/ship/security/armory) "Hb" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 4 + dir = 4; + mode = 1 }, /obj/structure/cable{ icon_state = "0-2" }, /turf/open/floor/engine/hull, -/area/ship/bridge) +/area/ship/external/dark) "Hf" = ( /obj/structure/railing, /obj/effect/turf_decal/corner_steel_grid{ @@ -4773,7 +4798,7 @@ "Mw" = ( /obj/structure/bed, /obj/item/bedsheet/hos{ - name = "Sergeant's Bedsheet"; + name = "Lieutenant's Bedsheet"; desc = "It is decorated with a shield emblem." }, /obj/effect/turf_decal/borderfloorblack, @@ -6172,7 +6197,7 @@ anchored = 1; can_be_unanchored = 1; icon_state = "warden"; - name = "Sergeant's locker"; + name = "Lieutenant's locker"; req_access_txt = "3"; req_access = list(3) }, From 49f4f5fdeec9c325b633216c87cb46bdd02c44bc Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Mon, 29 Jul 2024 17:05:58 -0500 Subject: [PATCH 07/10] I forgot to change one tile to dark instead of bridge. Woops. --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 1e4d21ac27a5..620c979fa3a3 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -2350,7 +2350,7 @@ icon_state = "0-2" }, /turf/open/floor/engine/hull, -/area/ship/bridge) +/area/ship/external/dark) "tY" = ( /obj/machinery/modular_computer/console/preset/command{ dir = 1 From e3011d640ae739489332ad5f91a752d598da5200 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Mon, 29 Jul 2024 17:27:07 -0500 Subject: [PATCH 08/10] Missing floor tile, done for real this time --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 620c979fa3a3..fce5295fa7cc 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -2902,7 +2902,7 @@ pixel_x = -6 }, /obj/effect/turf_decal/floordetail/tiled, -/turf/open/space/basic, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "yF" = ( /obj/effect/turf_decal/industrial/traffic{ From d2280fccc445a37c33a0e34c69d083386ce64439 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Wed, 31 Jul 2024 00:06:02 -0500 Subject: [PATCH 09/10] Reorganizing the bridge table and re-adding a missing table in engineering --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index fce5295fa7cc..728e090aa8c7 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -1708,24 +1708,19 @@ /obj/effect/turf_decal/corner/opaque/lime/mono, /obj/structure/table/reinforced, /obj/item/clipboard{ - pixel_x = -7; - pixel_y = 0 - }, -/obj/item/pen{ - pixel_x = -8; + pixel_x = -9; pixel_y = -1 }, -/obj/item/binoculars{ - pixel_x = -5; - pixel_y = 8 +/obj/item/pen{ + pixel_x = -10; + pixel_y = 1 }, /obj/item/gps{ - pixel_x = 7; - pixel_y = 7 + pixel_x = 8; + pixel_y = -2 }, -/obj/item/megaphone/command{ - pixel_y = 1; - pixel_x = 3 +/obj/item/binoculars{ + pixel_y = 9 }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) @@ -3034,6 +3029,7 @@ dir = 5 }, /obj/machinery/airalarm/directional/west, +/obj/structure/table/reinforced, /turf/open/floor/plating, /area/ship/engineering) "zL" = ( From 4acfaf6ccc7840eefe11261b5ee14d0e455f5cee Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Sun, 4 Aug 2024 03:08:17 -0500 Subject: [PATCH 10/10] the checkpoint opens once more! Rejoice! --- _maps/shuttles/pgf/pgf_crying_sun.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 728e090aa8c7..c0584df1e945 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -2184,7 +2184,6 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/security/glass{ req_one_access_txt = "1"; - req_access = list(1,7); name = "Checkpoint" }, /turf/open/floor/plasteel/dark,