From 7728ca19e9e4486f5fdce1a8adcb478e9854729a Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 14 May 2025 03:44:11 +0200 Subject: [PATCH] Adds a new expansion card to nukie base, and buffs nukie ordnance (#90967) ## About The Pull Request Rearranges some stuff in nukie base and adds a freezer line into the chamber, with a electrizer for hydrogen. Adds a pipe scrubber so nukies can clean the pipeline out faster and adds a new keycard the janitorial closet for 10 TC coming with neccesary janitor equipment and a water vapour canister! ![image](https://github.com/user-attachments/assets/c3e63b1c-c343-43d1-b6ca-3028927353f9) ## Why It's Good For The Game Crew can already make hydrogen pretty fast and usually suicide bomb nukies with it, this allows nukies (who think a little out of the box to do the same with the crew, adding more setups possible with the ordnance section and some quality of life aswell like a door letting the person trough it ## Changelog :cl: Ezel add: Nuke ops can now buy a keycard to access their new custodial closet! map: Rearranges nuke ordnance room, and adds the custodial closet /:cl: --- _maps/templates/lazy_templates/nukie_base.dmm | 163 +++++++++++++----- code/game/area/areas/centcom.dm | 4 + code/modules/mapfluff/centcom/nuke_ops.dm | 11 ++ code/modules/uplink/uplink_items/nukeops.dm | 8 + 4 files changed, 140 insertions(+), 46 deletions(-) diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm index 3369d26f8d1..ea39593ffb8 100644 --- a/_maps/templates/lazy_templates/nukie_base.dmm +++ b/_maps/templates/lazy_templates/nukie_base.dmm @@ -39,7 +39,7 @@ /area/centcom/syndicate_mothership/control) "aG" = ( /turf/open/floor/catwalk_floor/iron_smooth, -/area/centcom/syndicate_mothership/control) +/area/centcom/syndicate_mothership/expansion_custodialcloset) "aJ" = ( /obj/structure/fence/cut/medium, /turf/open/misc/asteroid/snow/airless, @@ -61,6 +61,23 @@ /obj/machinery/shower/directional/south, /turf/open/floor/iron/freezer, /area/centcom/syndicate_mothership/control) +"bc" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/pipe_dispenser{ + desc = "A device used to rapidly pipe things. This one has a curious abundance of warning labels."; + name = "Syndicate Rapid Pipe Dispenser (RPD)"; + pixel_y = -3 + }, +/obj/item/analyzer{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/flamethrower/full, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "bf" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -93,8 +110,17 @@ "bs" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/binary/pump/on, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer2{ + dir = 8 + }, /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bombthreat) +"by" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 9 + }, +/turf/open/floor/engine/vacuum, +/area/centcom/syndicate_mothership/expansion_bombthreat) "bB" = ( /obj/structure/railing{ dir = 4 @@ -171,17 +197,29 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/centcom/syndicate_mothership/control) +"cz" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_bombthreat) "cA" = ( -/obj/machinery/portable_atmospherics/pump/lil_pump{ - desc = "A betrayer to pump-kind." - }, /obj/effect/turf_decal/stripes/box, +/obj/machinery/portable_atmospherics/pipe_scrubber, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_bombthreat) "cF" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) +"cI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, +/obj/machinery/door/airlock/public/glass{ + name = "Ordnance Chamber" + }, +/obj/structure/fans/tiny, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/expansion_bombthreat) "cO" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 9 @@ -499,6 +537,7 @@ /obj/machinery/igniter/incinerator_ordmix{ id = "syn_ordmix_igniter" }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2, /turf/open/floor/engine/vacuum, /area/centcom/syndicate_mothership/expansion_bombthreat) "fw" = ( @@ -571,6 +610,10 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bombthreat) +"gi" = ( +/obj/machinery/vending/wardrobe/jani_wardrobe, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/expansion_custodialcloset) "go" = ( /obj/machinery/light/cold/directional/east, /obj/machinery/vending/snack/teal, @@ -629,6 +672,9 @@ dir = 1; name = "Ordnance Chamber Monitor" }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer2{ + dir = 9 + }, /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bombthreat) "gL" = ( @@ -649,12 +695,12 @@ /turf/open/floor/mineral/titanium/tiled/blue, /area/centcom/syndicate_mothership/control) "gO" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, /turf/open/floor/mineral/titanium/tiled/blue, /area/centcom/syndicate_mothership/expansion_bombthreat) "gS" = ( @@ -836,17 +882,7 @@ /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 }, -/obj/structure/rack, -/obj/item/analyzer{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/item/pipe_dispenser{ - desc = "A device used to rapidly pipe things. This one has a curious abundance of warning labels."; - name = "Syndicate Rapid Pipe Dispenser (RPD)"; - pixel_y = -3 - }, -/obj/item/flamethrower/full, +/obj/structure/tank_dispenser, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bombthreat) "iO" = ( @@ -882,6 +918,9 @@ dir = 1; name = "syndicate air injector" }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 10 + }, /turf/open/floor/engine/vacuum, /area/centcom/syndicate_mothership/expansion_bombthreat) "jo" = ( @@ -1245,10 +1284,10 @@ /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_bioterrorism) "nN" = ( -/obj/structure/tank_dispenser, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/electrolyzer, /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bombthreat) "nQ" = ( @@ -1752,8 +1791,8 @@ /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) "te" = ( -/obj/machinery/atmospherics/components/binary/valve{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer2{ + dir = 6 }, /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bombthreat) @@ -2026,6 +2065,10 @@ dir = 8 }, /area/centcom/syndicate_mothership/control) +"wP" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/expansion_custodialcloset) "wW" = ( /obj/structure/flora/rock/pile/style_random, /obj/effect/light_emitter{ @@ -2035,9 +2078,7 @@ /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) "xe" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 6 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bombthreat) "xf" = ( @@ -2082,6 +2123,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 6 + }, /turf/open/floor/engine/vacuum, /area/centcom/syndicate_mothership/expansion_bombthreat) "ye" = ( @@ -2580,6 +2624,9 @@ /obj/machinery/camera/autoname/directional/south{ network = list("nukie") }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer2{ + dir = 6 + }, /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bombthreat) "DV" = ( @@ -2782,6 +2829,9 @@ /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 }, +/obj/machinery/portable_atmospherics/pump/lil_pump{ + desc = "A betrayer to pump-kind." + }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bombthreat) "Gr" = ( @@ -3055,6 +3105,15 @@ /obj/item/food/grown/tomato, /turf/open/floor/plastic, /area/centcom/syndicate_mothership/expansion_fridgerummage) +"Ie" = ( +/obj/structure/mop_bucket/janitorialcart{ + dir = 4 + }, +/obj/item/mop, +/obj/item/reagent_containers/cup/bucket, +/obj/item/soap/syndie, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/expansion_custodialcloset) "If" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 @@ -3086,6 +3145,10 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) +"Iq" = ( +/obj/machinery/portable_atmospherics/canister/water_vapor, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/expansion_custodialcloset) "IC" = ( /obj/structure/chair/stool/bar/directional/west, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -3095,12 +3158,12 @@ /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) "IK" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 + }, /turf/open/floor/mineral/titanium/tiled/blue, /area/centcom/syndicate_mothership/expansion_bombthreat) "IL" = ( @@ -3747,6 +3810,7 @@ chamber_id = "nukiebase"; name = "syndicate ordnance gas sensor" }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2, /turf/open/floor/engine/vacuum, /area/centcom/syndicate_mothership/expansion_bombthreat) "PN" = ( @@ -4085,10 +4149,11 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/centcom/syndicate_mothership/control) "Ta" = ( -/turf/closed/indestructible/fakedoor{ - name = "Sub-Laboratory Elevator" +/obj/machinery/door/puzzle/keycard/syndicate_custodial, +/turf/open/floor/iron/smooth_half{ + dir = 4 }, -/area/centcom/syndicate_mothership/control) +/area/centcom/syndicate_mothership/expansion_custodialcloset) "Tb" = ( /obj/effect/light_emitter{ set_cap = 1; @@ -4246,6 +4311,9 @@ /turf/open/floor/plating/icemoon, /area/centcom/syndicate_mothership/control) "Uq" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 5 + }, /turf/open/floor/engine/vacuum, /area/centcom/syndicate_mothership/expansion_bombthreat) "Ut" = ( @@ -4532,10 +4600,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ +/obj/machinery/light/cold/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer2{ dir = 10 }, -/obj/machinery/light/cold/directional/east, /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bombthreat) "XX" = ( @@ -4615,6 +4683,9 @@ initial_gas_mix = "TEMP=2.7" }, /area/centcom/syndicate_mothership) +"YY" = ( +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_custodialcloset) "YZ" = ( /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, @@ -4684,7 +4755,7 @@ /area/centcom/syndicate_mothership/expansion_bombthreat) "ZG" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible/layer2{ dir = 1 }, /turf/open/floor/mineral/titanium/tiled/yellow, @@ -5106,9 +5177,9 @@ Ge Ge Ge nQ -DZ -DZ -DZ +YY +YY +YY xu cO HD @@ -5208,9 +5279,9 @@ Ab Ab ps nQ +gi aG -aG -aG +wP xu vP At @@ -5310,9 +5381,9 @@ bU mA lB nQ +Ie aG -aG -aG +Iq xu jW Ph @@ -5412,9 +5483,9 @@ qX qX JU nQ -DZ +YY Ta -DZ +YY xu CF Ph @@ -6138,7 +6209,7 @@ ae Dl cA DO -RD +cz PM fv RD @@ -6240,9 +6311,9 @@ FU lO xe bs -lC +cI jh -Uq +by RD Ox sU @@ -6334,7 +6405,7 @@ Vr cQ uf RD -Gm +bc gh yi oe diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index 5394ad6422c..1b466363895 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -214,6 +214,10 @@ name = "Syndicate Elite Squad" icon_state = "syndie-elite" +/area/centcom/syndicate_mothership/expansion_custodialcloset + name = "Syndicate Custodial Closet" + icon_state = "syndie-elite" + //MAFIA /area/centcom/mafia name = "Mafia Minigame" diff --git a/code/modules/mapfluff/centcom/nuke_ops.dm b/code/modules/mapfluff/centcom/nuke_ops.dm index 02bf8a50f8e..e1022a0c933 100644 --- a/code/modules/mapfluff/centcom/nuke_ops.dm +++ b/code/modules/mapfluff/centcom/nuke_ops.dm @@ -23,6 +23,12 @@ color = "#636363" puzzle_id = "syndicate_fridge" +/obj/item/keycard/syndicate_custodial + name = "Custodial Closet Access Card" + desc = "A purple keycard with an image of a mop. Using this will allow you to gain access to the Custodial Closet, containing janitorial equipment and a canister of water vapour." + color = "#9705b4" + puzzle_id = "syndicate_custodial" + //keycard doors /obj/machinery/door/puzzle/keycard/syndicate_bomb name = "Syndicate Ordinance Laboratory" @@ -43,3 +49,8 @@ name = "The Walk-In Fridge" desc = "Locked. Lopez sure runs a tight galley." puzzle_id = "syndicate_fridge" + +/obj/machinery/door/puzzle/keycard/syndicate_custodial + name = "Syndicate Custodial Closet" + desc = "Locked. Looks like you'll need a special access key to get in" + puzzle_id = "syndicate_custodial" diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index cd8a7afb096..3eea745834b 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -855,6 +855,14 @@ cost = 5 purchasable_from = UPLINK_CLOWN_OPS | UPLINK_NUKE_OPS +/datum/uplink_item/base_keys/custodial_key + name = "Syndicate Custodial Access Card" + desc = "Your workplace dirty? No problem! with this card you gain access to the custodial. Containing a janitorial cart \ + with some janitorial supplies and an canister of water vapour." + item = /obj/item/keycard/syndicate_custodial + cost = 10 + purchasable_from = UPLINK_CLOWN_OPS | UPLINK_NUKE_OPS + // Hats // It is fundamental for the game's health for there to be a hat crate for nuclear operatives.