From 59b4ff791d44487dfca100c5aef8e43c382225c1 Mon Sep 17 00:00:00 2001 From: fighterslam <56803762+fighterslam@users.noreply.github.com> Date: Sat, 10 Feb 2024 23:43:06 -0600 Subject: [PATCH] Aegis QoL changes (community requests) (#2709) ## About The Pull Request This is my first PR, in, like, 2 years. So maybe we're back? EDIT: So. Initially, this was just a handful of community requests to the Aegis. Now it has turned into a basic SUNS-ification PR for the vessel, stripping out all the old generic syndicate gear and replacing it all with SUNS stuff. Also slightly nerfs the vessel by removing a few traitor items, such as the dart pistol, night vision goggles, etc etc. But the drip compensates. ## Why It's Good For The Game The ship already has SUNS loadouts, now this just translates it to actual ship gear. ## Changelog :cl: :add: Strips out all the generic syndicate gear from the Aegis-Class and replaces it with SUNS gear. Hooray for student debt /:cl: --- _maps/shuttles/syndicate/syndicate_aegis.dmm | 396 ++++++++----------- 1 file changed, 156 insertions(+), 240 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index 28b55d4a5156..e3534485955f 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -30,29 +30,27 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/item/clothing/head/HoS/beret/syndicate, -/obj/item/clothing/head/HoS/syndicate, -/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, -/obj/item/clothing/under/syndicate/ngr/officer, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/neck/stripedredscarf, /obj/item/clothing/neck/tie/red, -/obj/item/clothing/shoes/combat, /obj/structure/closet/wall/red{ dir = 8; name = "Captain's Locker"; - pixel_x = 30 + pixel_x = 30; + req_access_txt = "20" }, /obj/item/storage/belt/sabre, /obj/item/reagent_containers/glass/beaker/unholywater, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/breath/suns, +/obj/item/clothing/gloves/suns/captain, +/obj/item/clothing/neck/cloak/suns/cap, +/obj/item/clothing/head/suns/captain, +/obj/item/clothing/shoes/combat/suns, +/obj/item/clothing/suit/armor/vest/bulletproof/suns/captain, +/obj/item/clothing/under/syndicate/suns/captain, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) -"az" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/dorm) "aB" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -119,10 +117,6 @@ /obj/effect/decal/cleanable/food/plant_smudge, /turf/open/floor/plasteel/tech, /area/ship/crew/hydroponics) -"aR" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/janitor) "aW" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -150,6 +144,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/shoes/jackboots/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/plasteel/tech, /area/ship/cargo) "bf" = ( @@ -228,11 +224,9 @@ dir = 5 }, /obj/structure/table/wood, -/obj/item/paper_bin/carbon, /obj/item/clothing/under/rank/medical/psychiatrist, /obj/item/stack/sheet/mineral/wood/fifty, /obj/item/lighter, -/obj/item/clothing/suit/toggle/labcoat, /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/white, /obj/item/clothing/gloves/color/latex/nitrile/evil, @@ -246,7 +240,16 @@ name = "Psychologists Locker"; pixel_y = 28 }, -/obj/item/gun/syringe/syndicate, +/obj/item/clothing/head/suns, +/obj/item/clothing/gloves/suns/xo, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/gloves/color/latex/nitrile/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/sneakers/suns, +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat, +/obj/item/clothing/mask/surgical/suns, +/obj/item/clothing/gloves/suns/xo, +/obj/item/flashlight/pen, /turf/open/floor/carpet/red, /area/ship/crew/office) "bx" = ( @@ -507,9 +510,6 @@ pixel_y = 29 }, /obj/structure/catwalk/over, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 1 }, @@ -569,26 +569,38 @@ /obj/item/surgicaldrill/advanced, /obj/item/healthanalyzer/advanced, /obj/item/clothing/glasses/hud/health/sunglasses, -/obj/item/clothing/shoes/combat, /obj/item/clothing/neck/stripedredscarf, /obj/item/clothing/neck/stripedbluescarf, /obj/structure/closet/wall/red{ name = "Lead Doctor's Locker"; pixel_y = 28 }, -/obj/item/clothing/neck/tie/blue, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/under/syndicate/sniper, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/clothing/suit/armor/vest/security/brig_phys{ name = "lead doctor's jacket" }, -/obj/item/clothing/gloves/color/latex/nitrile, /obj/item/clothing/glasses/hud/health/night, -/obj/item/clothing/suit/armor/vest/marine/medium{ - name = "medium medical armor vest" - }, /obj/item/hypospray/mkii/CMO, +/obj/item/clothing/under/syndicate/suns/xo, +/obj/item/clothing/head/suns, +/obj/item/clothing/mask/breath/suns, +/obj/item/clothing/gloves/suns/xo, +/obj/item/clothing/head/suns/surgery, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/neck/cloak/suns/xo, +/obj/item/clothing/gloves/color/latex/nitrile/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/sneakers/suns, +/obj/item/clothing/suit/armor/vest/bulletproof/suns/xo, +/obj/item/clothing/suit/hooded/suns, +/obj/item/clothing/suit/toggle/labcoat/suns/cmo, +/obj/item/clothing/under/syndicate/suns/sciencejumpsuit, +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat, +/obj/item/clothing/shoes/combat/suns, +/obj/item/clothing/mask/surgical/suns, +/obj/item/clothing/glasses/science/suns, +/obj/item/flashlight/pen, +/obj/item/autosurgeon/cmo, /turf/open/floor/carpet/blue, /area/ship/medical) "dZ" = ( @@ -672,6 +684,7 @@ /obj/item/clothing/shoes/laceup, /obj/item/clothing/gloves/color/black, /obj/item/reagent_containers/food/drinks/shaker, +/obj/item/clothing/mask/breath/suns, /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "ff" = ( @@ -829,9 +842,6 @@ /obj/effect/turf_decal/corner_techfloor_grid{ dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; layer = 2.35; @@ -843,9 +853,10 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "gz" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/office) +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/solgov/suns, +/turf/open/floor/plasteel/tech, +/area/ship/crew/dorm) "gA" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -991,6 +1002,12 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/wall/white{ + pixel_y = 26; + name = "bureaucratic supplies" + }, +/obj/item/paper_bin, +/obj/item/pen/fountain, /turf/open/floor/wood/walnut, /area/ship/crew/office) "hl" = ( @@ -1337,23 +1354,32 @@ /turf/open/floor/carpet/red, /area/ship/bridge) "kz" = ( -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/shoes/combat, /obj/effect/turf_decal/siding/wood{ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/syndicate{ - pixel_x = 32 - }, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/suit/toggle/suns/alt, +/obj/item/clothing/suit/toggle/suns/alt, +/obj/item/clothing/suit/toggle/suns, +/obj/item/clothing/suit/toggle/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/gloves/suns, +/obj/item/clothing/gloves/suns, +/obj/item/clothing/gloves/suns, +/obj/item/clothing/gloves/suns, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "kI" = ( @@ -1414,13 +1440,13 @@ dir = 4 }, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/head/helmet/space/syndicate/black/med, -/obj/item/clothing/suit/space/syndicate/black/med, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/vacuum{ pixel_x = -30 }, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/suit/space/syndicate/suns, +/obj/item/clothing/head/helmet/space/syndicate/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/plasteel/tech, /area/ship/cargo) "lx" = ( @@ -1444,10 +1470,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) -"lQ" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/hydroponics) "lY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/dirt, @@ -1618,9 +1640,6 @@ /area/ship/engineering) "mS" = ( /obj/machinery/light/small/directional/south, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1; layer = 2.35 @@ -1746,6 +1765,7 @@ }, /obj/item/paper_bin/bundlenatural, /obj/effect/turf_decal/siding/wood, +/obj/item/pen/fountain/captain, /turf/open/floor/carpet/red, /area/ship/bridge) "oJ" = ( @@ -1848,47 +1868,6 @@ "pu" = ( /turf/open/floor/wood/walnut, /area/ship/bridge) -"pI" = ( -/obj/structure/closet/wall/orange{ - name = "Engineering locker"; - pixel_y = 30 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/obj/item/clothing/suit/space/syndicate/black/engie, -/obj/item/clothing/head/helmet/space/syndicate/black/engie, -/obj/item/tank/internals/oxygen, -/obj/item/extinguisher/advanced, -/obj/item/storage/toolbox/syndicate{ - name = "syndicate toolbox"; - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/storage/belt/utility{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/holosign_creator/atmos, -/obj/item/clothing/gloves/color/orange, -/obj/item/clothing/neck/scarf/orange, -/obj/item/clothing/neck/tie/orange, -/obj/item/clothing/glasses/hud/diagnostic/night, -/obj/item/clothing/glasses/meson/engine/tray, -/obj/item/clothing/head/beret/eng/hazard, -/obj/structure/catwalk/over, -/obj/item/clothing/gloves/color/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/item/tank/internals/emergency_oxygen/engi, -/turf/open/floor/plating, -/area/ship/engineering) "pS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2212,10 +2191,6 @@ /obj/item/seeds/corn, /turf/open/floor/plasteel/tech, /area/ship/crew/hydroponics) -"sI" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) "sN" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor/shutters{ @@ -2240,9 +2215,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/hallway/central) "tn" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/components/unary/tank/toxins{ dir = 1; layer = 2.35 @@ -2379,6 +2351,7 @@ /obj/item/circuitboard/machine/processor, /obj/item/circuitboard/machine/gibber, /obj/item/circuitboard/machine/deep_fryer, +/obj/item/clothing/mask/breath/suns, /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "vj" = ( @@ -2404,28 +2377,13 @@ dir = 8 }, /obj/item/tank/internals/oxygen, -/obj/item/extinguisher/advanced, /obj/item/storage/toolbox/syndicate{ name = "syndicate toolbox"; pixel_x = -3; pixel_y = 5 }, -/obj/item/storage/belt/utility{ - pixel_x = 3; - pixel_y = 5 - }, /obj/item/storage/belt/utility/syndicate, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/holosign_creator/atmos, -/obj/item/clothing/gloves/color/orange, -/obj/item/clothing/neck/scarf/orange, -/obj/item/clothing/neck/tie/orange, -/obj/item/clothing/glasses/hud/diagnostic/night, -/obj/item/clothing/glasses/meson/engine/tray, -/obj/item/clothing/head/beret/eng/hazard, /obj/structure/catwalk/over, -/obj/item/clothing/gloves/color/yellow, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -2434,6 +2392,13 @@ icon_state = "4-8" }, /obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/gloves/suns/yellow, +/obj/item/clothing/shoes/jackboots/suns, +/obj/item/clothing/suit/toggle/suns/workervest, +/obj/item/clothing/under/syndicate/suns/workerjumpsuit, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/head/safety_helmet/suns, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plating, /area/ship/engineering) "vw" = ( @@ -2479,9 +2444,6 @@ dir = 5 }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /obj/structure/railing{ dir = 1 }, @@ -2492,20 +2454,34 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "wh" = ( -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/shoes/combat, /obj/effect/turf_decal/siding/wood{ dir = 6 }, /obj/machinery/airalarm/directional/east, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/under/syndicate/suns/uniform3, +/obj/item/clothing/under/syndicate/suns/uniform3, +/obj/item/clothing/under/syndicate/suns/uniform2, +/obj/item/clothing/under/syndicate/suns/uniform2, +/obj/item/clothing/under/syndicate/suns, +/obj/item/clothing/under/syndicate/suns, +/obj/item/clothing/under/syndicate/suns/alt, +/obj/item/clothing/under/syndicate/suns/alt, +/obj/item/clothing/under/syndicate/suns/uniform2/alt, +/obj/item/clothing/under/syndicate/suns/uniform2/alt, +/obj/item/clothing/under/syndicate/suns/uniform3/alt, +/obj/item/clothing/under/syndicate/suns/uniform3/alt, +/obj/item/clothing/accessory/waistcoat/suns/poof, +/obj/item/clothing/accessory/waistcoat/suns/poof, +/obj/item/clothing/accessory/waistcoat/suns/ribbon, +/obj/item/clothing/accessory/waistcoat/suns/ribbon, +/obj/item/clothing/accessory/waistcoat/suns/gembow, +/obj/item/clothing/accessory/waistcoat/suns/gembow, +/obj/item/clothing/accessory/waistcoat/suns, +/obj/item/clothing/accessory/waistcoat/suns, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "wk" = ( @@ -2542,8 +2518,12 @@ /turf/open/floor/plating, /area/ship/engineering) "wM" = ( -/obj/structure/frame/machine, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/mask/gas/suns, +/obj/item/holosign_creator/atmos, +/obj/structure/rack, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "wQ" = ( @@ -3133,42 +3113,6 @@ /obj/structure/table/wood/reinforced, /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) -"DX" = ( -/obj/structure/closet/wall/white/med{ - name = "medical locker"; - pixel_y = 29 - }, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/storage/belt/medical/surgery, -/obj/item/clothing/suit/longcoat/brig_phys{ - name = "syndicate medic's longcoat" - }, -/obj/item/clothing/suit/longcoat/roboblack{ - name = "syndicate medic's black longcoat" - }, -/obj/item/clothing/under/rank/medical/doctor/red, -/obj/item/clothing/suit/longcoat, -/obj/item/clothing/neck/stripedbluescarf, -/obj/item/clothing/neck/stripedredscarf, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/suit/hooded/wintercoat/medical, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/item/wallframe/defib_mount, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/item/hypospray/mkii, -/obj/item/clothing/mask/surgical, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/clothing/glasses/hud/health, -/obj/item/storage/firstaid/regular, -/turf/open/floor/plasteel/dark, -/area/ship/medical) "Ee" = ( /obj/structure/chair/sofa{ dir = 1 @@ -3337,9 +3281,6 @@ /turf/open/floor/plating, /area/ship/bridge) "FS" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/decal/cleanable/oil/slippery, /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/tech/techmaint, @@ -3477,6 +3418,8 @@ /obj/item/mining_scanner, /obj/item/radio, /obj/effect/turf_decal/corner_techfloor_grid/diagonal, +/obj/item/clothing/shoes/jackboots/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Hp" = ( @@ -3496,7 +3439,8 @@ /obj/effect/turf_decal/techfloor{ dir = 5 }, -/obj/structure/frame/machine, +/obj/item/clothing/suit/space/hardsuit/mining/suns, +/obj/machinery/suit_storage_unit/inherit, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "Im" = ( @@ -3645,33 +3589,37 @@ }, /obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/storage/belt/medical/surgery, -/obj/item/clothing/suit/longcoat/brig_phys{ - name = "syndicate medic's longcoat" - }, -/obj/item/clothing/suit/longcoat/roboblack{ - name = "syndicate medic's black longcoat" - }, -/obj/item/clothing/under/rank/medical/doctor/red, -/obj/item/clothing/suit/longcoat, /obj/item/clothing/neck/stripedbluescarf, /obj/item/clothing/neck/stripedredscarf, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/suit/hooded/wintercoat/medical, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 4 }, /obj/item/wallframe/defib_mount, -/obj/item/defibrillator/loaded, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 8 }, +/obj/item/hypospray/mkii, /obj/item/clothing/mask/surgical, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/clothing/glasses/hud/health, /obj/item/storage/firstaid/regular, +/obj/item/clothing/glasses/hud/health/suns, +/obj/item/clothing/head/suns/surgery, +/obj/item/clothing/gloves/color/latex/nitrile/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/sneakers/suns, +/obj/item/clothing/suit/hooded/suns, +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat, +/obj/item/clothing/under/syndicate/suns/doctorscrubs, +/obj/item/clothing/under/syndicate/suns/sciencejumpsuit, +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat, +/obj/item/clothing/mask/surgical/suns, +/obj/item/holosign_creator/medical, +/obj/item/defibrillator/loaded, +/obj/item/flashlight/pen, +/obj/item/flashlight/pen, /turf/open/floor/plasteel/dark, /area/ship/medical) "JY" = ( @@ -4540,10 +4488,6 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Sy" = ( -/obj/item/clothing/head/maidheadband/syndicate, -/obj/item/clothing/under/syndicate/skirt/maid, -/obj/item/clothing/accessory/maidapron/syndicate, -/obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/laceup, /obj/item/clothing/suit/toggle/lawyer/black, @@ -4556,12 +4500,16 @@ name = "Uniform Closet"; pixel_x = 30 }, -/obj/item/clothing/gloves/combat/maid, /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/machinery/light/small/directional/south, +/obj/item/clothing/gloves/color/latex/nitrile/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/sneakers/suns, +/obj/item/clothing/suit/hooded/suns, +/obj/item/clothing/mask/surgical/suns, /turf/open/floor/carpet/red, /area/ship/crew/janitor) "SF" = ( @@ -4677,12 +4625,6 @@ pixel_y = 30 }, /obj/item/storage/bag/chemistry, -/obj/item/clothing/suit/longcoat/chemist, -/obj/item/clothing/suit/toggle/labcoat/chemist, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, /obj/item/clothing/glasses/sunglasses/chemical, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, @@ -4699,6 +4641,8 @@ /obj/structure/sign/warning/chemdiamond{ pixel_x = 30 }, +/obj/item/flashlight/pen, +/obj/item/flashlight/pen, /turf/open/floor/plasteel/tech, /area/ship/medical) "Tw" = ( @@ -4945,10 +4889,6 @@ /obj/effect/turf_decal/trimline/opaque/black/line, /turf/open/floor/mineral/plastitanium/red, /area/ship/hallway/central) -"VG" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) "VT" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/canteen/kitchen) @@ -4977,10 +4917,10 @@ "Wb" = ( /obj/effect/turf_decal/corner_techfloor_grid/diagonal, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/head/helmet/space/syndicate/black/med, -/obj/item/clothing/suit/space/syndicate/black/med, /obj/structure/extinguisher_cabinet/directional/west, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/suit/space/syndicate/suns, +/obj/item/clothing/head/helmet/space/syndicate/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Wc" = ( @@ -5157,28 +5097,14 @@ name = "Uniform closet"; pixel_x = 32 }, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/item/flashlight, /obj/item/flashlight, /obj/item/flashlight, /obj/item/flashlight, /obj/item/flashlight, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "Xk" = ( @@ -5260,10 +5186,6 @@ /obj/effect/turf_decal/trimline/opaque/brown/filled/line, /turf/open/floor/plasteel/tech, /area/ship/crew/canteen/kitchen) -"Yf" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/medical) "Yo" = ( /obj/structure/window/plasma/reinforced/spawner/north, /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ @@ -5341,9 +5263,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/catwalk/over, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/ship/engineering) @@ -5401,9 +5320,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "ZJ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/effect/decal/cleanable/plasma, /turf/open/floor/plasteel/tech/techmaint, @@ -5509,7 +5425,7 @@ hl kU kU kU -VG +aP ls Cc Cc @@ -5554,7 +5470,7 @@ Wb aP Xk Xk -lQ +Xk Im wk wk @@ -5668,7 +5584,7 @@ wk (7,1,1) = {" Ss xO -xO +gz xO Te bx @@ -5730,7 +5646,7 @@ It sN Kv It -sI +It wk "} (9,1,1) = {" @@ -5803,7 +5719,7 @@ wk "} (11,1,1) = {" Ss -az +Ss Ss wk wk @@ -5862,7 +5778,7 @@ Xk TE Ch It -pI +vs zV UN It @@ -6211,7 +6127,7 @@ wk "} (23,1,1) = {" dZ -aR +kj dZ wk wk @@ -6342,7 +6258,7 @@ oP re Qt It -sI +It wk "} (27,1,1) = {" @@ -6462,7 +6378,7 @@ CF nd Xb Bh -DX +JI Do lN CM @@ -6506,7 +6422,7 @@ TS WQ WQ WQ -gz +WQ aL wk wk @@ -6529,7 +6445,7 @@ TS dL dL dL -Yf +TS QV TS TS