diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json index d4eb67b1fb50..8e107ae8355f 100644 --- a/_maps/configs/pgf_crying_sun.json +++ b/_maps/configs/pgf_crying_sun.json @@ -21,29 +21,30 @@ "officer": true, "slots": 1 }, - "Bridge Crew": { - "outfit": "/datum/outfit/job/gezena/assistant/bridge", + "Marine Lieutenant": { + "outfit": "/datum/outfit/job/gezena/hos", + "officer": true, "slots": 1 }, - "Navy Engineer": { - "outfit": "/datum/outfit/job/gezena/engineer", - "slots": 2 - }, "Navy Doctor": { "outfit": "/datum/outfit/job/gezena/doctor", "slots": 1 }, - "Crewman": { - "outfit": "/datum/outfit/job/gezena/assistant", + "Navy Engineer": { + "outfit": "/datum/outfit/job/gezena/engineer", "slots": 2 }, - "Marine Sergeant": { - "outfit": "/datum/outfit/job/gezena/hos", + "Helmsman": { + "outfit": "/datum/outfit/job/gezena/hop", "slots": 1 }, "Marine": { "outfit": "/datum/outfit/job/gezena/security", "slots": 3 + }, + "Crewman": { + "outfit": "/datum/outfit/job/gezena/assistant", + "slots": 2 } }, "enabled":true diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 919770509bec..026d524ff689 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" = ( @@ -1253,7 +1260,7 @@ }, /obj/machinery/button/door{ id = "lib_armory_1"; - name = "Sergeant Access"; + name = "Lieutenant Access"; dir = 4; pixel_x = -20; pixel_y = -5; @@ -1421,9 +1428,8 @@ /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, /area/ship/bridge) "md" = ( @@ -1446,9 +1452,22 @@ pixel_y = 3; pixel_x = 7 }, +/obj/item/reagent_containers/food/drinks/bottle/lizardwine{ + pixel_y = 12; + layer = 2.9; + pixel_x = -1 + }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/commemorative{ + pixel_y = -1; + pixel_x = -6 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/commemorative{ + pixel_y = -1; + pixel_x = 4 + }, /turf/open/floor/plasteel/sepia, /area/ship/crew/dorm/dormthree) "mG" = ( @@ -1457,14 +1476,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 +1491,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 +1626,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 +1681,53 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) +"om" = ( +/obj/item/clothing/neck/cloak/gezena/command{ + pixel_x = 1; + pixel_y = -5 + }, +/obj/item/clothing/gloves/gezena{ + pixel_y = 4 + }, +/obj/item/clothing/under/gezena{ + pixel_x = -10; + pixel_y = -4 + }, +/obj/item/clothing/suit/armor/gezena{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/clothing/head/gezena{ + pixel_y = 6 + }, +/obj/item/clothing/head/gezena/flap{ + pixel_y = 6 + }, +/obj/item/storage/backpack/satchel/cap{ + pixel_y = -18; + pixel_x = -8 + }, +/obj/item/storage/backpack/duffelbag/captain{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/folder/white, +/obj/item/pen/fountain, +/obj/item/radio/headset/pgf/captain, +/obj/item/radio/headset/pgf/alt/captain, +/obj/structure/closet/secure_closet{ + icon_state = "hop"; + req_access = list(57); + name = "helmsman's locker" + }, +/obj/item/gun/energy/kalix/pistol{ + pixel_y = -16 + }, +/obj/effect/turf_decal/corner/opaque/lime/mono, +/obj/machinery/light/directional/south, +/obj/item/screwdriver, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) "ou" = ( /obj/structure/railing{ dir = 8 @@ -1848,6 +1911,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 +1962,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 +1976,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 +1986,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 +2178,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 +2186,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 +2315,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 +2333,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 +2348,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 +2662,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 +2889,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 @@ -2970,7 +3060,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) @@ -3092,6 +3182,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 +3465,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 +3689,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 +3742,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 +4007,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{ @@ -3946,10 +4049,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" }, @@ -4032,6 +4135,7 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 4 }, +/obj/item/paper/fluff/shuttles/cryingsun, /turf/open/floor/plasteel/dark, /area/ship/construction) "Gz" = ( @@ -4104,8 +4208,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 +4232,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 +4263,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 +4411,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 +4573,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 +4637,6 @@ dir = 8; name = "engine fuel pump" }, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/machinery/camera/autoname{ dir = 1; network = list("GEC") @@ -4677,7 +4795,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, @@ -4713,9 +4831,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 +4858,11 @@ pixel_x = -13; pixel_y = -19 }, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/head/gezena/flap/medic{ + pixel_x = 7; + pixel_y = 4 + }, /turf/open/floor/mineral/titanium, /area/ship/medical) "MF" = ( @@ -4801,6 +4921,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 +5000,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 +5040,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 +5247,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 +5276,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 +5285,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 +5493,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 +6007,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,10 +6056,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 }, @@ -5928,25 +6065,6 @@ /obj/item/clothing/gloves/gezena/marine{ pixel_y = 11 }, -/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 +6093,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 +6105,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 +6118,18 @@ pixel_y = 0 }, /obj/effect/turf_decal/corner/opaque/neutral/full, +/obj/item/clothing/head/gezena/flap/marine{ + pixel_y = 0; + pixel_x = -10 + }, +/obj/item/clothing/head/gezena/flap/marine{ + pixel_y = 0; + pixel_x = -10 + }, +/obj/item/clothing/head/gezena/flap/marine{ + pixel_y = 0; + pixel_x = -10 + }, /turf/open/floor/vault, /area/ship/security/armory) "Vp" = ( @@ -6059,11 +6178,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 +6194,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) }, @@ -6106,10 +6225,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 }, @@ -6121,10 +6236,6 @@ 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 }, @@ -6140,7 +6251,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 = -11; + pixel_y = 1 }, /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/dormtwo) @@ -6171,6 +6289,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 +6357,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 +6509,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 +6858,14 @@ xz lc lc CB -CB +AM UM lc FO LD TV bB -Wk +pK Wk TV TV @@ -7914,8 +8037,8 @@ bb wz tQ El -Ms -MF +Wg +om MF eO Ly @@ -7941,10 +8064,10 @@ MF Ig uh qj -Ms -CZ -xz -Mk +tY +hX +MF +MF Bc KS Sp @@ -7968,10 +8091,10 @@ Hb vr dK Gb -Ms +yy +KH CZ xz -xz Mk iK sQ @@ -7993,13 +8116,13 @@ xz xz xz cR -Rx -bD -bD +Sd +Qi +bi +Ms CZ xz xz -xz Mk Er Mk @@ -8021,10 +8144,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..84301c2d4d24 100644 --- a/code/game/MapData/shuttles/pgf_crying_sun.dm +++ b/code/game/MapData/shuttles/pgf_crying_sun.dm @@ -1,8 +1,8 @@ /obj/item/book/manual/mount name = "The UCWLWM" desc = "It's looks old and worn out." - icon_state = "book3" - author = "Welds-the-Steel" + icon_state = "book1" + author = "Senior Engineer Wihlz-Saai" title = "The Universal Colossal Warship Linear Weapon Mount" dat = {" @@ -41,3 +41,7 @@ The largest gun ever produced by the Lihmona Shipyards, the QUASAR SMITER is a truly terrifying tool of destruction. A gun requiring 3 Universal Linear Mounts to hold, this gun finds its place only on the largest ships in the PGFN and PGFMC. This gun fires 18/5ths meter gigantic "DEMON SLUG"s at a rate of approximately 1 shot every 5 minutes. The power draw of such a massive weapon sings to the tun of 50MW of power per round. "} + +/obj/item/paper/fluff/shuttles/cryingsun + name = "Electro-proofing Your Crying Sun" + default_raw_text = "Quartermaster said we have to drag these grounding rods and tesla coils on for you, and you might be wondering how you can use them. Supposedly, if you're not needing external defenses or asteroid turrets, you can replace each of the external turrets with a tesla coil and generate some power running through any storms. The two empty platings in the back fit grounding rods - fit all the spots and you should be fully covered." diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm index 96c6eee3c734..63d6d8e3333f 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" @@ -260,20 +265,20 @@ 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 = "squad leader'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 marine squad leader." icon_state = "squadcape" item_state = "blackcloth" /obj/item/clothing/neck/cloak/gezena/engi name = "engineering Aziulhauz" - 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 with an engineering specialization." + 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 engineering specialist." icon_state = "engicape" item_state = "blackcloth" /obj/item/clothing/neck/cloak/gezena/med name = "medical Aziulhauz" - 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 with a medical specialization." + 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 medical specialist." icon_state = "medcape" item_state = "whitecloth" diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm index df7a5145e47f..f6c1221317c9 100644 --- a/code/modules/clothing/outfits/factions/gezena.dm +++ b/code/modules/clothing/outfits/factions/gezena.dm @@ -72,8 +72,8 @@ box = /obj/item/storage/box/survival/security /datum/outfit/job/gezena/hos - name = "PGF - Marine Sergeant" - id_assignment = "Sergeant" + name = "PGF - Marine Lieutenant" + id_assignment = "Lieutenant" jobtype = /datum/job/hos job_icon = "headofsecurity" @@ -187,7 +187,7 @@ box = /obj/item/storage/box/survival/security /datum/outfit/job/gezena/hos/geared - name = "PGF - Marine Sergeant - Equipped" + name = "PGF - Marine Lieutenant - Equipped" jobtype = /datum/job/hos job_icon = "headofsecurity" diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 32c4b1a9a09f..6ffea82fb945 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -373,7 +373,7 @@ desc = "A popular Gezenan drink made of fermented honey and spices, known as Gezenan Dark Mead, or GDM for short." icon_state = "beer" list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) - foodtype = GRAIN | ALCOHOL + foodtype = SUGAR | ALCOHOL custom_price = 60 /obj/item/reagent_containers/food/drinks/beer/light diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 57d84ee22397..95f7b0ba1b9b 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -202,10 +202,10 @@ /obj/item/reagent_containers/food/drinks/bottle/kahlua name = "Keh'Lu'Tex Liqueur" - desc = "An adapted recipe of a caffeine-mixed liqueur originating from Reh'himl, which replaces it's original ingredient with coffee from Terra." + desc = "An adapted recipe of a caffeine-mixed liqueur originating from Reh'himl, which replaces its original ingredient with coffee from Terra." icon_state = "kahluabottle" list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100) - foodtype = VEGETABLES + foodtype = SUGAR | ALCOHOL //it's coffee and rum . /obj/item/reagent_containers/food/drinks/bottle/goldschlager name = "Student-Union's Gold Standard"