From 5201975304be19dc7401e13e609a8e880eb8c383 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:32:27 -0300 Subject: [PATCH 01/21] new! it's new! --- _maps/configs/syndicate_twinkleshine.json | 2 +- .../syndicate/syndicate_twinkleshine.dmm | 5213 +++++++++-------- code/game/machinery/cryopod.dm | 5 +- code/modules/clothing/outfits/syndicate.dm | 209 +- code/modules/jobs/job_types/_job.dm | 2 +- .../mob/living/carbon/human/human_say.dm | 8 + 6 files changed, 2812 insertions(+), 2627 deletions(-) diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index e5765b1691dd..697fd4dc09c7 100644 --- a/_maps/configs/syndicate_twinkleshine.json +++ b/_maps/configs/syndicate_twinkleshine.json @@ -17,7 +17,7 @@ "map_short_name": "Twinkleshine-class", "map_path": "_maps/shuttles/syndicate/syndicate_twinkleshine.dmm", "job_slots": { - "Captain": { + "Commodore": { "outfit": "/datum/outfit/job/syndicate/captain/twink", "officer": true, "slots": 1 diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 9200c091f618..dfa69f6ee37f 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -37,19 +37,17 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/light/directional/east, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "aj" = ( /obj/machinery/atmospherics/pipe/manifold/purple/visible, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "ak" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 4 }, -/obj/machinery/light/directional/north, -/obj/machinery/vending/cola/random, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "al" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -64,42 +62,24 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "aA" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/syndicake{ - pixel_y = 10; - pixel_x = 3 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -10; - pixel_y = 5 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -3; - pixel_y = 3 +/obj/machinery/shieldgen{ + anchored = 1; + req_access = list(150) }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) -"aD" = ( -/obj/structure/sign/poster/contraband/m90{ - icon_state = "poster-m90"; - pixel_x = -32 +/obj/effect/turf_decal/corner/opaque/syndiered/bordercee{ + dir = 8 }, /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 + dir = 1 }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"aD" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/photocopier, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "aE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -115,26 +95,24 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "aX" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/middle/middle{ +/obj/effect/turf_decal/syndicateemblem/middle/right{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/holopad/emergency/command, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "bd" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ - dir = 8 +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 1 }, -/obj/effect/turf_decal/syndicateemblem/bottom/right{ - dir = 8 +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "bf" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ @@ -185,16 +163,9 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "bv" = ( -/obj/structure/bed, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" - }, -/obj/item/bedsheet/black, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 23 - }, -/turf/open/floor/carpet/nanoweave/red, +/obj/structure/dresser, +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/turf/open/floor/plasteel, /area/ship/crew/dorm) "bH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -218,13 +189,21 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "bL" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 11 +/obj/machinery/light/directional/south, +/obj/structure/table/reinforced, +/obj/item/folder/syndicate/red{ + pixel_x = -8; + pixel_y = 6 }, -/turf/template_noop, -/area/template_noop) +/obj/item/folder/syndicate/blue{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/folder/red{ + pixel_x = -4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "bM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -246,40 +225,25 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "bQ" = ( -/obj/effect/turf_decal/corner/opaque/orange{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, +/obj/machinery/light/directional/north, +/obj/machinery/turretid{ + pixel_y = 32; + req_access = null; + req_access_txt = "150" }, -/obj/structure/closet/secure_closet/miner{ - req_access = list(150,10); - populate = 0 +/obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ + dir = 4 }, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/suit/space/syndicate/black/orange, -/obj/item/clothing/head/helmet/space/syndicate/black/orange, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/flashlight/seclite, -/obj/item/storage/belt/mining/alt, -/obj/item/stack/sheet/mineral/sandbags, -/obj/item/storage/bag/ore, -/obj/item/shovel, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "bR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, +/obj/machinery/light/directional/south, +/obj/machinery/vending/snack/random, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "bU" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -287,22 +251,15 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "bV" = ( -/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ - dir = 1 - }, -/obj/item/clothing/under/syndicate/gec, -/obj/item/clothing/shoes/magboots/syndie, -/obj/item/clothing/head/helmet/space/syndicate/black/engie, -/obj/item/clothing/suit/space/syndicate/black/engie, -/obj/structure/closet/secure_closet/engineering_personal{ - req_access = list(150,10) - }, -/obj/item/pipe_dispenser, -/obj/structure/sign/poster/contraband/gec{ - pixel_y = -32 +/obj/machinery/light/directional/south, +/obj/machinery/airalarm/directional/south, +/obj/structure/bed, +/obj/structure/curtain/cloth/fancy{ + name = "blood-red curtains" }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) +/obj/item/bedsheet/black, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm) "bY" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/warning{ dir = 1 @@ -311,21 +268,9 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "cd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/camera/autoname{ - dir = 10 - }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/machinery/light/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "ch" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -333,18 +278,43 @@ }, /area/ship/engineering/communications) "cj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 +/obj/structure/closet, +/obj/machinery/light/small/directional/east, +/obj/item/clothing/mask/gas/syndicate/voicechanger, +/obj/item/clothing/mask/gas/syndicate/voicechanger, +/obj/item/clothing/mask/gas/syndicate/voicechanger, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/radio/headset/syndicate{ + keyslot = null }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 8 +/obj/item/radio/headset/syndicate{ + keyslot = null }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/effect/turf_decal/techfloor{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "ck" = ( /obj/machinery/chem_heater, /obj/effect/turf_decal/corner/opaque/orange/full, @@ -368,7 +338,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "cw" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -383,17 +353,24 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "cC" = ( -/obj/machinery/vending/coffee, +/obj/machinery/vending/coffee{ + pixel_x = 6; + pixel_y = 4 + }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "cD" = ( -/obj/machinery/holopad/emergency/bar, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/obj/structure/cable/yellow{ + icon_state = "6-8" + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "cJ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -425,41 +402,62 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/engineering/atmospherics) -"cW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +"cT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = 8 }, -/obj/machinery/light/directional/south, +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "2-8" }, -/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) +"cW" = ( +/obj/machinery/light/directional/north, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/storage/box/ingredients/carnivore, +/obj/item/storage/box/ingredients/vegetarian, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "cX" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 6 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/ship/hallway/port) "da" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/machinery/suit_storage_unit/syndicate, +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "db" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; req_access = list(150,10); dir = 4 @@ -484,49 +482,30 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "dk" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "dl" = ( -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 9 }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 9 }, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-8" }, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/port) "dm" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "hos"; - name = "Captain's Locker"; - req_access = list(151) - }, -/obj/item/areaeditor/shuttle, -/obj/item/clothing/under/syndicate/aclf, -/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, -/obj/item/clothing/head/HoS/syndicate, -/obj/item/codespeak_manual/unlimited, -/obj/item/storage/belt/sabre, -/obj/item/shield/riot/tele, -/obj/item/storage/lockbox/medal, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, +/obj/structure/rack, /obj/machinery/light/directional/north, -/obj/item/card/id/syndicate_command/captain_id, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm/dormtwo) +/obj/item/gun/energy/ionrifle/carbine, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "do" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -540,31 +519,21 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "dp" = ( -/obj/machinery/door/airlock/public/glass, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/canteen) -"dq" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/westright, -/obj/machinery/door/window/eastright{ - req_access = list(3,150) +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/recharger, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) +"dq" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 }, -/turf/open/floor/mineral/plastitanium, +/obj/structure/filingcabinet/double, +/turf/open/floor/mineral/plastitanium/red, /area/ship/security) "dz" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -572,40 +541,30 @@ }, /area/ship/medical) "dD" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 - }, -/obj/machinery/nuclearbomb/beer{ - desc = "It's an old, decommissioned bomb, previously used by Nuclear Operatives during the Corporate War. It seems to have a tap drilled in."; - name = "\improper nuclear fission explosive" - }, -/turf/open/floor/plasteel, +/obj/machinery/vending/boozeomat/syndicate_access, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "dE" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/holopad/emergency/medical, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/dark, -/area/ship/medical) +/area/ship/security) "dH" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/beer, /obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/obj/structure/rack, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/turf/open/floor/plasteel/dark, +/area/ship/security) "dL" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/machinery/light/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "dO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -616,7 +575,7 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/firealarm/directional/east, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "dP" = ( /obj/structure/sign/poster/contraband/tools{ pixel_y = 32 @@ -630,12 +589,19 @@ /turf/open/floor/engine/o2, /area/ship/engineering/atmospherics) "dU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/sign/poster/official/moth{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/ship/crew/canteen) "dV" = ( /obj/machinery/stasis, @@ -665,7 +631,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/aft) "eg" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -696,24 +662,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/hatch{ - name = "Bridge"; - req_access = list(150) - }, +/obj/machinery/door/airlock/grunge, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "ep" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/suit/space/syndicate, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "er" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, @@ -742,12 +705,28 @@ }, /area/ship/medical) "eF" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/structure/table/wood, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_x = 4; + pixel_y = 2 }, -/obj/machinery/vending/cigarette/syndicate, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/item/lighter{ + pixel_x = -10; + pixel_y = -2 + }, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = -4 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/item/toy/plush/moth/punished{ + pixel_x = 7; + pixel_y = 11 + }, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "eL" = ( /obj/structure/chair/stool{ dir = 8 @@ -771,27 +750,31 @@ /obj/effect/turf_decal/trimline/opaque/orange/line{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/vending/medical/syndicate_access, /turf/open/floor/plasteel/dark, /area/ship/medical) "fm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 5 }, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-4" }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/light/directional/south, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "fn" = ( -/obj/machinery/cryopod{ +/obj/machinery/cryopod/syndicate{ dir = 8 }, -/obj/machinery/light/directional/north, +/obj/machinery/computer/cryopod/directional/south, +/obj/effect/turf_decal/techfloor{ + dir = 6 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) "fz" = ( @@ -819,36 +802,34 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "fJ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/obj/structure/reagent_dispensers/water_cooler, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 - }, -/obj/machinery/light_switch{ - pixel_y = 22 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"fK" = ( +/obj/machinery/light/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) -"fK" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 3 +"fN" = ( +/obj/structure/chair/stool/bar{ + dir = 1 }, -/obj/item/pen{ - pixel_y = 3 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) -"fN" = ( -/obj/structure/window/reinforced/spawner, -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/window/reinforced/spawner{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/vending/dinnerware, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood{ + color = "#422C14" + }, /area/ship/crew/canteen) "fO" = ( /obj/structure/railing, @@ -883,7 +864,6 @@ /area/ship/medical) "fV" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; dir = 4 }, @@ -899,13 +879,20 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "fX" = ( -/obj/machinery/suit_storage_unit/syndicate, -/obj/effect/turf_decal/box/white/corners{ - dir = 4 +/obj/structure/bed/double, +/obj/item/bedsheet/double/black, +/obj/item/paper{ + name = "concealed note"; + icon_state = "scrap"; + color = "#505050"; + desc = "This note is crumpled and torn."; + default_raw_text = "ever since the war ended some eighteen years ago, the syndicate has been at odds with ourselves. our branches' ideals and personal goals are dividing the syndicate more and more.

tensions keep rising on the frontier sectors, where it's less likely that people will get caught sabotaging or hindering each other, and you, presumably, have just been given captainship of a vessel full of members who all hate each other.

to put it bluntly, you're in deep. this melting pot of ideologies, at its worst, is going to tear your leadership apart. you're going to need to keep tensions low on this two decade old warship so it doesn't all go to shit.

keep track of where every member comes from:
-you are, most likely, from the aclf
-the lieutenant is an officer from the gorlex 2nd battlegroup
-the medics come from cybersun
-the engineers are from the gec
-the operatives are a mix of the 2nd battlegroup and the aclf
-the bartender is from donk
-the miner is from suns
-deck assistants are a wildcard, not contracted from anyone in specific" }, -/obj/effect/turf_decal/box/white/corners, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/structure/curtain/cloth/fancy{ + name = "blood-red curtains" + }, +/turf/open/floor/carpet/red, +/area/ship/crew/dorm/dormtwo) "gh" = ( /obj/machinery/door/airlock/external{ req_access = list(150) @@ -913,21 +900,11 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "gi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "gk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -977,28 +954,16 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "gz" = ( -/obj/machinery/computer/cryopod/directional/north{ - pixel_y = 26 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/closet/wall{ - dir = 4; - pixel_x = -28; - name = "gear closet" +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/obj/item/radio/headset/syndicate/alt, -/obj/item/radio/headset/syndicate/alt, -/obj/item/radio/headset/syndicate/alt, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/radio/headset/syndicate, -/obj/item/radio/headset/syndicate, -/obj/item/radio/headset/syndicate, -/obj/item/radio/off, -/obj/item/radio/off, -/obj/item/radio/off, -/obj/item/radio/off, -/turf/open/floor/plasteel/tech/grid, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) "gC" = ( /obj/effect/turf_decal/corner/opaque/orange{ @@ -1009,37 +974,52 @@ /area/ship/engineering/engine) "gE" = ( /obj/effect/turf_decal/industrial/warning{ - dir = 5 + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/effect/turf_decal/box/corners{ + dir = 1 }, -/obj/structure/closet/crate{ - name = "Mining Crate" +/obj/effect/turf_decal/box/corners{ + dir = 8 }, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, +/obj/machinery/light/directional/east, +/obj/structure/closet/secure_closet/miner{ + req_access = list(150, 48); + populate = 0 + }, +/obj/item/shovel, /obj/item/storage/bag/ore, /obj/item/mining_scanner, /obj/item/mining_scanner, -/obj/item/mining_scanner, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 23 +/obj/item/pickaxe/mini, +/obj/item/storage/belt/mining/alt, +/obj/item/flashlight/seclite, +/obj/item/stack/sheet/mineral/sandbags, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/clothing/gloves/explorer, +/obj/item/clothing/mask/gas/explorer, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/paper{ + name = "note from SUNS"; + default_raw_text = "

Message from SUNS


We could not afford to equip you with our top of the line research and mining equipment, but we hope this will suffice. Sorry!" }, /turf/open/floor/pod/dark, /area/ship/cargo) "gI" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/vending/coffee, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "gL" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 @@ -1068,7 +1048,7 @@ dir = 1 }, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/aft) "gX" = ( /obj/machinery/door/airlock/hatch{ name = "Custodial Closet"; @@ -1086,15 +1066,18 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/janitor) "gZ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 8 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 }, /turf/open/floor/plasteel, -/area/ship/crew/canteen) +/area/ship/crew/dorm) "hb" = ( /obj/machinery/computer/operating, /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ @@ -1103,20 +1086,13 @@ /turf/open/floor/plasteel/mono/white, /area/ship/medical/surgery) "hd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/port) "hj" = ( /obj/item/hypospray/mkii/CMO/combat{ pixel_x = -8; @@ -1148,21 +1124,14 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "hr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-2" }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/port) "ht" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/engine, @@ -1196,14 +1165,17 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "hP" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, -/obj/machinery/light/directional/south, -/obj/machinery/vending/snack/random, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/item/soap/syndie, +/obj/structure/curtain, +/obj/machinery/shower{ + pixel_y = 19 + }, +/obj/effect/turf_decal/techfloor/hole, +/obj/effect/turf_decal/techfloor/hole/right, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/dorm) "hR" = ( /obj/machinery/door/airlock/hatch{ - name = "Mech Launcher #2"; req_access = list(150); dir = 4 }, @@ -1216,44 +1188,17 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "hS" = ( -/obj/structure/table, -/obj/item/storage/box/emps{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/item/storage/box/flashbangs{ - pixel_y = 10; - pixel_x = 5 - }, -/obj/item/suppressor/specialoffer{ - pixel_y = 6; - pixel_x = -8 - }, -/obj/item/suppressor/specialoffer{ - pixel_y = -1; - pixel_x = -8 - }, -/obj/item/stock_parts/cell/gun{ - pixel_y = 1; - pixel_x = 9 - }, -/obj/item/stock_parts/cell/gun{ - pixel_y = 1; - pixel_x = 9 - }, -/obj/item/stock_parts/cell/gun{ - pixel_y = 1; - pixel_x = 9 +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "hU" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "hW" = ( @@ -1267,12 +1212,21 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "hY" = ( -/obj/structure/table, -/obj/item/storage/fancy/donut_box{ - name = "suspicious donut box" +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/ship/crew/dorm) "hZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/light/directional/east, @@ -1284,21 +1238,29 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "ia" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) "ie" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ig" = ( /obj/effect/turf_decal/industrial/warning{ @@ -1317,19 +1279,41 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ih" = ( -/obj/structure/table/wood, -/obj/machinery/jukebox/boombox{ - pixel_x = -10 +/obj/structure/chair/stool/bar{ + dir = 1 }, -/obj/machinery/door/firedoor/border_only, -/obj/item/clothing/head/chefhat{ - pixel_x = 7 +/obj/machinery/camera/autoname{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/wood{ + color = "#422C14" }, -/turf/open/floor/wood, /area/ship/crew/canteen) "ii" = ( -/obj/machinery/vending/medical/syndicate_access, /obj/effect/turf_decal/corner/opaque/syndiered/full, +/obj/structure/closet/secure_closet/medical3{ + req_access = list(150, 5); + icon_state = "tac"; + populate = 0 + }, +/obj/item/clothing/gloves/color/latex/nitrile/evil, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical/webbing, +/obj/item/clothing/under/syndicate/medic, +/obj/item/clothing/under/syndicate/medic/skirt, +/obj/item/clothing/under/rank/medical/doctor/red, +/obj/item/clothing/suit/longcoat/roboblack{ + name = "syndicate medic's black longcoat" + }, +/obj/item/clothing/head/helmet/medical, +/obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/clothing/shoes/sneakers/white, /turf/open/floor/plasteel/dark, /area/ship/medical) "im" = ( @@ -1350,7 +1334,7 @@ pixel_x = -32 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "ir" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 @@ -1405,12 +1389,14 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "iG" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/cryo) +/turf/open/floor/wood{ + color = "#422C14" + }, +/area/ship/crew/canteen) "iI" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, @@ -1432,31 +1418,29 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "iK" = ( -/obj/machinery/mech_bay_recharge_port, /obj/effect/turf_decal/techfloor{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/syndiered/half, +/obj/effect/decal/cleanable/garbage{ + pixel_x = 16; + pixel_y = 2 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "iL" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/engineering{ + dir = 1; + req_access = list(150,10) }, -/obj/structure/sign/poster/contraband/space_up{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "iV" = ( /obj/machinery/light/directional/north, /obj/structure/table, @@ -1482,6 +1466,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) +"iY" = ( +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 1 + }, +/obj/structure/fluff/broken_flooring{ + icon_state = "plating"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) "iZ" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 @@ -1544,7 +1539,7 @@ icon_state = "1-4" }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "jr" = ( /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ dir = 8 @@ -1575,10 +1570,11 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "jx" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "jz" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -1587,27 +1583,15 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "jA" = ( -/obj/machinery/door/airlock/hatch{ - name = "Engineering Office"; - dir = 4 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 9 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "jG" = ( /obj/effect/decal/cleanable/oil/slippery, /obj/effect/decal/cleanable/dirt/dust, @@ -1619,10 +1603,6 @@ "jH" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "twinkle_armory"; - dir = 4 - }, /turf/open/floor/plating, /area/ship/security/armory) "jJ" = ( @@ -1670,27 +1650,39 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ka" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 + dir = 10 }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 0 +/obj/machinery/camera/autoname{ + dir = 10 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "kc" = ( -/obj/machinery/suit_storage_unit/syndicate, -/obj/effect/turf_decal/box/white/corners{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/box/white/corners{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "kd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1699,33 +1691,53 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "ke" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/light/directional/south, /turf/open/floor/engine, /area/ship/engineering/engine) "kf" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"kl" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/starboard) +"kl" = ( +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "hos"; + name = "Captain's Locker"; + req_access = list(150, 20) + }, +/obj/item/areaeditor/shuttle, +/obj/item/clothing/under/syndicate/aclf, +/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, +/obj/item/clothing/head/HoS/syndicate, +/obj/item/shield/riot/tele, +/obj/item/storage/lockbox/medal, +/obj/machinery/light/directional/north, +/obj/item/card/id/syndicate_command/captain_id, +/obj/item/codespeak_manual{ + charges = 2 + }, +/obj/item/radio/headset/syndicate/captain, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/combat, +/obj/item/book/granter/martial/cqc, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "ky" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -1736,35 +1748,44 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "kE" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/syndicateemblem/top/right, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "kF" = ( /obj/structure/table/wood/reinforced, -/obj/item/folder/syndicate{ - desc = "A black folder."; - name = "folder"; - pixel_x = 7 +/obj/item/storage/photo_album/syndicate{ + pixel_x = 4; + pixel_y = 4 }, -/obj/item/book/random{ - pixel_x = -6 +/obj/item/camera{ + pixel_x = -2 }, /turf/open/floor/carpet/red, /area/ship/crew/office) "kH" = ( -/obj/structure/rack, -/obj/effect/turf_decal/box/white/corners{ - dir = 1 - }, -/obj/effect/turf_decal/box/white/corners{ - dir = 8 +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/structure/closet/emcloset/wall{ - dir = 1; - pixel_y = -28 +/obj/item/radio/headset/syndicate/alt, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, +/obj/machinery/light/directional/east, +/obj/item/clothing/head/soft/black, +/obj/item/clothing/glasses/sunglasses, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, /turf/open/floor/mineral/plastitanium, /area/ship/security) "kJ" = ( @@ -1784,31 +1805,47 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "kR" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/newscaster/directional/north{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "kT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 9 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"kV" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ - dir = 1 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/effect/turf_decal/syndicateemblem/top/left{ +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/airlock/hatch{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, +/area/ship/security) +"kV" = ( +/obj/effect/turf_decal/syndicateemblem/top/middle{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "kX" = ( /obj/structure/sign/syndicate, @@ -1817,24 +1854,19 @@ }, /area/ship/bridge) "lg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, +/obj/machinery/light/directional/west, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-4" }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "lj" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1845,16 +1877,20 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "ln" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered/corner{ - dir = 1 +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/syndicake{ + pixel_y = 10; + pixel_x = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/structure/sign/poster/official/no_erp{ + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/item/toy/cards/deck/syndicate{ + pixel_x = -7 + }, +/turf/open/floor/plasteel, +/area/ship/crew/dorm) "lo" = ( /obj/machinery/power/shieldwallgen/atmos{ anchored = 1; @@ -1872,44 +1908,50 @@ /turf/open/floor/plating, /area/ship/cargo) "lq" = ( -/obj/structure/closet/secure_closet/freezer/kitchen/wall{ - dir = 8; - pixel_x = 28 - }, -/obj/item/clothing/under/suit/waiter/syndicate, -/obj/item/circuitboard/machine/deep_fryer, -/obj/item/circuitboard/machine/gibber, -/obj/item/cutting_board, -/turf/open/floor/wood, -/area/ship/crew/canteen) -"lv" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) -"lw" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) +"lv" = ( +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"lw" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 4 + }, +/turf/open/floor/wood{ + color = "#422C14" + }, +/area/ship/crew/canteen) "lx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/camera/autoname{ +/obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "lF" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 8 @@ -1923,24 +1965,14 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "lG" = ( -/obj/machinery/light/directional/south, -/obj/structure/table/reinforced, -/obj/item/folder/syndicate/red{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/item/folder/syndicate/blue{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/folder/red{ - pixel_x = -4 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/machinery/cryopod/syndicate{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/effect/turf_decal/techfloor{ + dir = 10 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "lI" = ( /obj/effect/turf_decal/industrial/caution{ dir = 8 @@ -1948,53 +1980,41 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "lO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ - dir = 1 +/obj/effect/turf_decal/trimline/opaque/syndiered/warning, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/advanced_airlock_controller{ + pixel_x = 25 }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "lT" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "lY" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder/constructed, -/turf/open/floor/wood, +/obj/machinery/holopad/emergency/bar, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "ma" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/machinery/computer/slot_machine, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/structure/sign/donk, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/turf/open/floor/plasteel, /area/ship/crew/canteen) "ml" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/syndiered/border{ dir = 1 }, -/turf/open/floor/plasteel, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/public/glass, +/turf/open/floor/plasteel/tech, /area/ship/crew/canteen) "mm" = ( /obj/structure/chair{ @@ -2047,26 +2067,41 @@ /turf/open/floor/engine/n2, /area/ship/engineering/atmospherics) "mx" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/top/middle{ +/obj/effect/turf_decal/syndicateemblem/top/right{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 4 + }, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "mB" = ( -/obj/machinery/newscaster/directional/west, -/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ - dir = 4 +/obj/machinery/light/directional/west, +/obj/machinery/computer/camera_advanced{ + dir = 4; + icon_state = "computer-right"; + icon_keyboard = "syndie_key" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 8 }, /turf/open/floor/mineral/plastitanium, -/area/ship/security) +/area/ship/bridge) "mG" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"mO" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2074,20 +2109,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/camera/autoname, -/turf/open/floor/plating, -/area/ship/hallway/central) -"mO" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/turf/open/floor/plasteel/dark, +/area/ship/security) "mS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2222,39 +2245,34 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "nr" = ( -/obj/machinery/suit_storage_unit/syndicate, -/obj/effect/turf_decal/box/white/corners{ - dir = 1 +/obj/structure/table, +/obj/item/storage/box/zipties{ + pixel_x = -5; + pixel_y = 11 }, -/obj/effect/turf_decal/box/white/corners{ - dir = 8 +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 8; + pixel_y = 3 }, +/obj/machinery/light/directional/west, /turf/open/floor/mineral/plastitanium, /area/ship/security) "nt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/machinery/door/airlock/grunge, +/turf/open/floor/mineral/plastitanium, +/area/ship/security) "nE" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 10 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 4 - }, -/obj/machinery/vending/toyliberationstation, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/obj/effect/turf_decal/corner/opaque/syndiered, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "nS" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -2264,42 +2282,43 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "oc" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 +/obj/structure/table, +/obj/item/clothing/head/warden/drill{ + name = "lieutenant's campaign hat"; + desc = "A special armored campaign hat with the Syndicate insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; + pixel_x = 2; + pixel_y = -7 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/item/reagent_containers/food/snacks/donut/choco{ + pixel_x = 3; + pixel_y = 7 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -7; + pixel_y = 6 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "oi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/closet/firecloset/wall{ + dir = 1; + pixel_y = -28 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "oj" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/machinery/vending/cigarette/syndicate, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "on" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 @@ -2316,24 +2335,15 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "ox" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/hallway/central) -"oB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/light/directional/north, +/obj/structure/table/reinforced, +/obj/item/paper_bin/carbon, +/obj/item/pen/fountain, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"oB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2342,11 +2352,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/opaque/orange/filled/warning, -/obj/machinery/door/airlock/external{ - req_access = list(150,10); +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10); dir = 4 }, /turf/open/floor/engine, @@ -2370,21 +2380,16 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "oD" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "oG" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 +/obj/machinery/door/airlock/grunge{ + req_access = list(3,150) }, -/obj/machinery/firealarm/directional/east, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "oJ" = ( @@ -2414,7 +2419,6 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "oM" = ( -/obj/structure/table, /obj/machinery/button/massdriver{ pixel_x = 23; dir = 8; @@ -2433,6 +2437,7 @@ /obj/machinery/camera/autoname{ dir = 10 }, +/obj/structure/table_frame, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "oP" = ( @@ -2462,7 +2467,7 @@ }, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/aft) "pc" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2485,20 +2490,41 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "pj" = ( -/obj/machinery/door/window/southright, -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/turf/open/floor/plasteel, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/wood{ + color = "#422C14" + }, /area/ship/crew/canteen) "pl" = ( -/obj/machinery/computer/mech_bay_power_console, /obj/effect/turf_decal/techfloor{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/syndiered/half, +/obj/structure/salvageable/computer, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "pm" = ( -/obj/structure/filingcabinet/double, +/obj/structure/filingcabinet/double{ + pixel_x = -5; + pixel_y = 4 + }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, @@ -2511,26 +2537,15 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) -"pr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing{ - dir = 9 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) "ps" = ( -/obj/structure/bed, -/obj/structure/sign/poster/contraband/smoke{ - pixel_y = 32 +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/item/bedsheet/black, -/turf/open/floor/carpet/nanoweave/red, +/turf/open/floor/plasteel, /area/ship/crew/dorm) "pt" = ( /obj/machinery/atmospherics/pipe/manifold/green/visible{ @@ -2590,25 +2605,40 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "pD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/west, +/obj/structure/sign/poster/official/moth/smokey{ + pixel_y = 32 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "pE" = ( -/obj/machinery/button/door{ - pixel_x = -25; - pixel_y = 10; - dir = 4; - id = "twinkle_armory"; - name = "Armory Access"; - req_access = list(3,150) +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/port) "pF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /obj/effect/turf_decal/industrial/warning{ @@ -2620,58 +2650,85 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/machinery/airalarm/directional/west, -/obj/item/circuitboard/machine/autolathe, -/obj/item/stock_parts/manipulator, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stack/sheet/glass, +/obj/machinery/light/directional/west, /turf/open/floor/pod/dark, /area/ship/cargo) "pI" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, -/obj/effect/turf_decal/syndicateemblem/bottom/left{ +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "pL" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/eastleft, +/obj/machinery/door/window/brigdoor/westright{ + req_access = list(3,150) }, -/obj/machinery/camera/autoname, -/turf/open/floor/mineral/plastitanium/red, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "pN" = ( -/obj/machinery/suit_storage_unit/syndicate, -/obj/effect/turf_decal/box/white/corners{ - dir = 4 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/effect/turf_decal/box/white/corners, -/obj/machinery/camera/autoname{ - dir = 10 +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." }, +/obj/item/radio/headset/syndicate/alt, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/machinery/light/directional/east, +/obj/item/clothing/head/beret/black, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, /turf/open/floor/mineral/plastitanium, /area/ship/security) "pO" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/plating, +/area/ship/hallway/port) "pR" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/structure/sign/poster/contraband/stechkin{ - pixel_x = 32 +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/turf/open/floor/mineral/plastitanium/red, +/obj/item/radio/headset/syndicate/alt, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/machinery/light/directional/west, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "pU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -2682,6 +2739,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/light/directional/west, /turf/open/floor/plating, /area/ship/hallway/central) "qb" = ( @@ -2698,15 +2756,10 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ql" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_x = 25 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "qo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2716,29 +2769,13 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "qp" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "qr" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2770,20 +2807,16 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "qA" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 9 - }, -/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "1-6" }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 +/obj/structure/railing/corner/wood, +/turf/open/floor/wood{ + color = "#422C14" }, -/turf/open/floor/plasteel, /area/ship/crew/canteen) "qF" = ( /obj/structure/table, @@ -2817,17 +2850,16 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "qL" = ( -/obj/structure/bed, -/obj/item/toy/plush/among{ - color = "#730622"; - name = "suspicious amoung pequeño"; - desc = "Get out of my head!" +/obj/structure/toilet{ + dir = 8 }, -/obj/machinery/flasher{ - pixel_y = -23; - id = "twinkle_flash2" +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/sink{ + pixel_y = -11; + pixel_x = -9; + dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plating, /area/ship/security) "qM" = ( /obj/machinery/door/airlock/external{ @@ -2843,7 +2875,9 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "qN" = ( -/obj/machinery/photocopier, +/obj/machinery/photocopier{ + pixel_x = 1 + }, /obj/machinery/light/directional/north, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 @@ -2851,14 +2885,21 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/office) "qP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) -"qQ" = ( -/obj/machinery/telecomms/broadcaster/preset_right{ - network = "synd_commnet" - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"qQ" = ( +/obj/machinery/telecomms/broadcaster/preset_right{ + network = "synd_commnet" + }, /turf/open/floor/circuit/red, /area/ship/engineering/communications) "qR" = ( @@ -2887,19 +2928,17 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "qY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -13; + pixel_y = -20 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "ra" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2925,7 +2964,6 @@ /area/ship/engineering/engine) "rd" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineer Room"; req_access = list(150,10) }, /obj/effect/turf_decal/corner/opaque/orange/full, @@ -2960,12 +2998,14 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "ru" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "rQ" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 8 @@ -2983,11 +3023,14 @@ /turf/open/floor/plasteel/elevatorshaft, /area/ship/bridge) "sc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/structure/railing{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 8 }, /turf/open/floor/mineral/plastitanium, -/area/ship/security) +/area/ship/bridge) "sd" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/industrial/warning{ @@ -2998,24 +3041,26 @@ dir = 1 }, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/aft) "sf" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks, -/turf/open/floor/wood, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "si" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/structure/sign/poster/official/moth/piping{ + desc = "This informational poster uses Safety Moth(TM) to tell atmospheric technicians correct types of piping to be used. Proper pipe placement prevents poor performance! It's signed by 'AspEv'."; + pixel_x = 32 }, -/obj/structure/cable/yellow{ - icon_state = "6-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10) }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "sj" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/power/terminal{ @@ -3080,10 +3125,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/machinery/light/directional/east, -/obj/structure/sign/poster/solgov/suns{ - pixel_x = 32 - }, /turf/open/floor/plasteel/dark, /area/ship/medical) "sz" = ( @@ -3123,10 +3164,14 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "sG" = ( -/obj/machinery/light/directional/north, -/obj/machinery/vending/security/marine/syndicate, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "sI" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 8 @@ -3216,34 +3261,23 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "tn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/light/directional/west, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "tp" = ( -/obj/structure/toilet/secret{ - secret_type = "/obj/item/toy/plush/moth"; - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/pod/dark, +/area/ship/cargo) "tr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing{ - dir = 10; - layer = 3.1 +/obj/effect/turf_decal/corner/opaque/syndiered/border{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered/border, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) @@ -3260,22 +3294,17 @@ /turf/open/floor/engine/air, /area/ship/engineering/atmospherics) "tH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) -"tS" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"tS" = ( +/obj/structure/railing{ + dir = 10; + layer = 3.1 }, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 @@ -3283,30 +3312,35 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "tU" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/wood, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood{ + color = "#422C14" + }, /area/ship/crew/canteen) "tY" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"tZ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 + icon_state = "1-4" }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plating, +/area/ship/hallway/starboard) +"tZ" = ( +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ug" = ( /obj/structure/rack, @@ -3344,7 +3378,7 @@ /mob/living/simple_animal/hostile/carp/cayenne{ name = "Cayenne II"; desc = "A descendant from the legendary Cayenne, a failed Syndicate experiment in weaponized space carp."; - faction = list("PlayerSyndicate") + faction = list("playerSyndicate") }, /obj/item/toy/nuke, /obj/effect/turf_decal/corner/opaque/syndiered/border, @@ -3358,7 +3392,7 @@ "uE" = ( /obj/machinery/door/airlock/hatch{ name = "Captain's Quarters"; - req_access = list(151); + req_access = list(150, 20); dir = 4 }, /obj/structure/cable/yellow{ @@ -3451,10 +3485,18 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "vn" = ( -/obj/structure/tank_dispenser/oxygen, -/obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/grunge, +/turf/open/floor/pod/dark, +/area/ship/cargo) "vz" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 @@ -3475,15 +3517,24 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/hatch{ - name = "Bridge"; - req_access = list(150) - }, +/obj/machinery/door/airlock/grunge, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "vE" = ( -/obj/machinery/suit_storage_unit/syndicate, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/machinery/button/door{ + pixel_x = 9; + pixel_y = 25; + id = "twinkle_armory"; + name = "Armory Access"; + req_access = list(3,150) + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/security) "vJ" = ( /obj/structure/cable{ @@ -3496,16 +3547,17 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "vL" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/item/toy/plush/moth{ + name = "lieutenant moth plushie"; + desc = "A plushie depicting an adorable mothperson, featuring realistic mothperson agony sounds every time you hug it. They seem to be hiding something." }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "vO" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/middle/right{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3543,19 +3595,15 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "wb" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/item/toy/plush/moth{ - name = "lieutenant moth plushie"; - desc = "A plushie depicting an adorable mothperson, featuring realistic mothperson agony sounds every time you hug it. They seem to be hiding something." - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/drinks/beer, +/obj/machinery/light/directional/north, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "wg" = ( /obj/structure/cable/yellow{ icon_state = "2-9" @@ -3564,14 +3612,13 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "wh" = ( -/obj/machinery/door/poddoor{ - id = "twinkle_external" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/security) -"wi" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"wi" = ( /obj/effect/turf_decal/industrial/warning, /obj/structure/cable{ icon_state = "0-2" @@ -3591,27 +3638,39 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "wr" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 4 }, -/obj/machinery/light/directional/west, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "wu" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, -/obj/machinery/camera/autoname{ - dir = 9 +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "wz" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/wood, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood{ + color = "#422C14" + }, /area/ship/crew/canteen) "wA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -3640,7 +3699,6 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; dir = 4 }, @@ -3702,40 +3760,12 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "wR" = ( -/obj/item/gun/energy/ionrifle, -/obj/structure/rack, -/obj/item/storage/backpack/duffelbag/syndie/x4, -/obj/item/card/emag, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/westleft{ - dir = 1; - req_access = list(3,150) - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/ammo_casing/caseless/rocket, -/obj/item/ammo_casing/caseless/rocket, -/obj/item/ammo_casing/caseless/rocket/hedp, -/obj/item/ammo_casing/caseless/rocket/hedp, -/obj/item/storage/box/lethalshot, -/obj/item/storage/box/lethalshot, -/obj/item/storage/box/lethalshot, -/obj/item/gun/ballistic/rocketlauncher, -/obj/item/gun/ballistic/automatic/ebr, -/obj/item/gun/ballistic/automatic/ebr{ - pixel_x = -6; - pixel_y = -3 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "wV" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -3744,13 +3774,12 @@ dir = 8 }, /obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/door/airlock/hatch{ - name = "Briefing"; - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/airlock/grunge{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "wZ" = ( @@ -3775,7 +3804,7 @@ }, /obj/machinery/light/directional/west, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "xc" = ( /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/corner/opaque/syndiered/half{ @@ -3793,28 +3822,17 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"xe" = ( -/obj/structure/toilet/secret{ - secret_type = "/obj/item/toy/plush/moth"; - dir = 4 - }, -/obj/structure/sign/poster/contraband/punch_shit{ - pixel_y = 32 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) "xg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/syndicateemblem/bottom/left{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/effect/turf_decal/syndicateemblem/middle/right{ dir = 8 }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "xh" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ @@ -3902,17 +3920,19 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "xz" = ( -/obj/machinery/flasher{ - pixel_y = -23; - id = "twinkle_flash1" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/newscaster/directional/north{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "xB" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "xH" = ( /obj/machinery/door/poddoor{ id = "twinkle_rightmassdriver"; @@ -3925,7 +3945,7 @@ dir = 9 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "xW" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/trimline/opaque/syndiered/warning{ @@ -3946,7 +3966,6 @@ /area/template_noop) "ya" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; req_access = list(150,10); dir = 8 }, @@ -3985,18 +4004,15 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "yn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/autoname{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/advanced_airlock_controller{ + pixel_x = 25 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) +/area/ship/hallway/port) "yr" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -4015,15 +4031,19 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "yz" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-8" }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) "yB" = ( /obj/effect/turf_decal/industrial/warning, /obj/structure/cable{ @@ -4036,17 +4056,14 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "yF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, +/obj/structure/sign/warning/radiation{ + pixel_x = -32 + }, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "yI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4067,49 +4084,43 @@ /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "yN" = ( -/obj/structure/sign/poster/contraband/syndicate_recruitment{ - pixel_x = -32 +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = -11 + }, +/obj/item/radio/intercom/table{ + dir = 8; + pixel_x = -5; + pixel_y = 3 }, /turf/open/floor/mineral/plastitanium, /area/ship/security) "yO" = ( -/obj/structure/closet/wall{ - dir = 4; - pixel_x = -28; - name = "uniform closet" +/obj/machinery/door/airlock/grunge, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/clothing/under/syndicate/aclfgrunt, -/obj/item/clothing/under/syndicate/aclfgrunt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/storage/backpack/duffelbag/syndie, -/obj/item/storage/backpack/duffelbag/syndie, -/obj/item/storage/backpack, -/obj/item/storage/backpack, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/turf/open/floor/plasteel/tech/grid, +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) "yP" = ( -/obj/item/soap/syndie, -/obj/structure/curtain, -/obj/machinery/shower{ - pixel_y = 19 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/techfloor/hole, -/obj/effect/turf_decal/techfloor/hole/right, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "yX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -4162,17 +4173,12 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "zk" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/warning, -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 25 +/obj/machinery/door/airlock/external{ + req_access = list(150) }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "zp" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 }, @@ -4206,11 +4212,16 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "zy" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 4 + }, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "zG" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ @@ -4251,6 +4262,9 @@ dir = 8 }, /obj/effect/decal/cleanable/oil/streak, +/obj/structure/fluff/broken_flooring{ + icon_state = "plating" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "zK" = ( @@ -4262,29 +4276,11 @@ /area/ship/engineering) "zO" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 - }, -/obj/structure/closet/firecloset/wall{ - dir = 1; - pixel_y = -28 + dir = 5 }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"zP" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/sign/poster/official/moth{ - pixel_x = 32 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/area/ship/hallway/starboard) "zQ" = ( /obj/effect/turf_decal/industrial/warning{ dir = 10 @@ -4311,18 +4307,31 @@ }, /area/ship/medical) "zZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/item/clothing/under/syndicate/gec, +/obj/item/clothing/shoes/magboots/syndie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/structure/closet/secure_closet/engineering_personal{ + req_access = list(150,10); + populate = 0 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/item/pipe_dispenser, +/obj/structure/sign/poster/contraband/gec{ + pixel_y = -32 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/item/storage/belt/utility/syndicate, +/obj/item/clothing/under/syndicate/gec, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/head/hardhat/red{ + name = "hard hat" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "Af" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ dir = 8 @@ -4385,13 +4394,17 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "At" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "Ax" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -4409,7 +4422,7 @@ icon_state = "1-4" }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Ay" = ( /obj/effect/turf_decal/corner/opaque/orange{ dir = 10 @@ -4424,11 +4437,12 @@ /turf/open/floor/engine/n2, /area/ship/engineering/atmospherics) "AK" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "AL" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -4462,12 +4476,12 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "Bc" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Bj" = ( @@ -4476,28 +4490,33 @@ }, /area/ship/security) "Bq" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 5 +/obj/structure/rack, +/obj/item/gun/ballistic/automatic/sniper_rifle/syndicate{ + spawnwithmagazine = 0; + pixel_x = -3; + pixel_y = 6 }, /obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 8 + dir = 6 }, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "Bs" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/grunge, +/turf/open/floor/pod/dark, +/area/ship/cargo) "Bw" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 @@ -4520,24 +4539,16 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "BG" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/sign/poster/contraband/c20r{ - pixel_y = 32 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/obj/structure/rack, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "BK" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -4555,14 +4566,19 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "BL" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 +/obj/structure/sign/poster/contraband/c20r{ + pixel_y = 32 }, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "BM" = ( /obj/machinery/atmospherics/pipe/manifold/green/visible{ @@ -4585,7 +4601,7 @@ pixel_x = -28 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "BS" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ dir = 4 @@ -4624,8 +4640,12 @@ /area/ship/engineering/engine) "Cj" = ( /obj/structure/table/wood, -/obj/item/paper_bin/carbon, -/obj/item/pen/edagger, +/obj/item/paper_bin/carbon{ + pixel_x = -8 + }, +/obj/item/pen/edagger{ + pixel_x = -9 + }, /obj/item/storage/secure/safe/intel{ pixel_x = -32; dir = 8 @@ -4634,6 +4654,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/item/paper{ + pixel_x = 6; + pixel_y = 5; + name = "README - notice to the captain"; + default_raw_text = "

Dear Commodore,

Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers.

This vessel is staffed with workers from every branch of the Syndicate. Please take the time to familiarize yourself with the ship's features and crew, and make sure to maintain positive relationships with your crew.



check under your bed"; + desc = "This sheet of paper looks old and dusty."; + color = "#3f010d" + }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "Cl" = ( @@ -4689,11 +4717,9 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "CJ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/light/small/directional/west, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/dorm) "CQ" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, @@ -4713,8 +4739,7 @@ dir = 8 }, /obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/door/airlock/hatch{ - name = "Briefing"; +/obj/machinery/door/airlock/grunge{ dir = 4 }, /turf/open/floor/plasteel/tech, @@ -4739,9 +4764,6 @@ /area/ship/medical) "CU" = ( /obj/machinery/light/directional/south, -/obj/structure/chair{ - dir = 1 - }, /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 1 @@ -4772,48 +4794,35 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "De" = ( -/obj/structure/table, -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/item/storage/box/medipens{ - pixel_y = 7; - pixel_x = -4 +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 10 }, -/obj/item/storage/firstaid/tactical{ - pixel_y = 4; - pixel_x = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/item/clothing/glasses/hud/health/night, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/dark, -/area/ship/medical) +/area/ship/engineering) "Dh" = ( -/obj/machinery/smartfridge/bloodbank/preloaded{ - pixel_y = 32; - density = 0 - }, /obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/structure/closet/wall/white/med{ - name = "medical locker"; - dir = 8; - pixel_x = 28 +/obj/structure/closet/secure_closet/medical3{ + req_access = list(150, 5); + icon_state = "tac"; + populate = 0 }, /obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/clothing/glasses/hud/health/night, -/obj/item/clothing/glasses/hud/health/night, -/obj/item/clothing/suit/longcoat/roboblack{ - name = "syndicate medic's black longcoat" - }, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical/webbing, +/obj/item/clothing/under/syndicate/medic, +/obj/item/clothing/under/syndicate/medic/skirt, +/obj/item/clothing/under/rank/medical/doctor/red, /obj/item/clothing/suit/longcoat/roboblack{ name = "syndicate medic's black longcoat" }, -/obj/item/clothing/under/rank/medical/doctor/red, -/obj/item/clothing/under/rank/medical/doctor/red, -/obj/item/clothing/under/syndicate/cybersun, -/obj/item/clothing/under/syndicate/cybersun, -/obj/item/storage/belt/medical/webbing, -/obj/item/storage/belt/medical/webbing, -/obj/item/storage/belt/medical, -/obj/item/storage/belt/medical, +/obj/machinery/light/directional/north, +/obj/item/clothing/head/helmet/medical, +/obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/clothing/shoes/sneakers/white, /turf/open/floor/plasteel/dark, /area/ship/medical) "Dk" = ( @@ -4847,18 +4856,30 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; dir = 4 }, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Dp" = ( -/obj/machinery/door/airlock/hatch{ - name = "Lieutenant's Office"; - req_access = list(3,150) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light_switch{ + pixel_y = 22; + pixel_x = -12 + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "Dt" = ( /obj/machinery/air_sensor/atmos/air_tank, @@ -4877,23 +4898,12 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "DF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/sign/poster/official/moth/piping{ - desc = "This informational poster uses Safety Moth(TM) to tell atmospheric technicians correct types of piping to be used. Proper pipe placement prevents poor performance! It's signed by 'AspEv'."; - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; - req_one_access_txt = "150"; - req_access = list(150,10) - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/turf/open/floor/plasteel, +/area/ship/crew/dorm) "DK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -4929,26 +4939,27 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "DW" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "Ed" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/obj/structure/toilet{ + dir = 4 }, -/obj/machinery/airalarm/directional/north, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/sink{ + dir = 8; + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/dorm) "Ee" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -4956,10 +4967,12 @@ }, /area/ship/crew/office) "Eh" = ( -/obj/structure/chair{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-5" + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/turf/open/floor/mineral/plastitanium, /area/ship/security) "Ei" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -4970,7 +4983,7 @@ pixel_x = -28 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "En" = ( /obj/effect/turf_decal/industrial/warning, /turf/open/floor/engine, @@ -4998,19 +5011,12 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ey" = ( -/obj/structure/rack, -/obj/item/storage/box/handcuffs{ - pixel_y = 9; - pixel_x = -8 - }, -/obj/item/storage/box/flashes{ - pixel_x = 8; - pixel_y = 7 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 }, -/obj/item/storage/box/evidence{ - pixel_x = -2 +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/turf/open/floor/mineral/plastitanium, /area/ship/security) "ED" = ( /obj/effect/turf_decal/corner/opaque/orange{ @@ -5031,25 +5037,8 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "EG" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ - dir = 1 - }, -/obj/machinery/button/flasher{ - pixel_x = 23; - dir = 8; - pixel_y = 6; - id = "twinkle_flash1" - }, -/obj/machinery/button/flasher{ - pixel_x = 23; - dir = 8; - pixel_y = -7; - id = "twinkle_flash2" - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/dark, /area/ship/security) "EH" = ( /obj/item/trash/chips, @@ -5057,14 +5046,10 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "EJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/corner/opaque/syndiered/border{ dir = 4 }, /turf/open/floor/mineral/plastitanium, @@ -5092,12 +5077,6 @@ /turf/open/floor/engine/n2, /area/ship/engineering/atmospherics) "ET" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 2 - }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "EU" = ( @@ -5106,32 +5085,28 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "EX" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 0 +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "Fa" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/wood{ + color = "#422C14" }, -/turf/open/floor/plasteel, /area/ship/crew/canteen) "Fc" = ( /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 1 }, -/obj/structure/rack, +/obj/item/rack_parts, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Fh" = ( @@ -5190,15 +5165,21 @@ /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "Fl" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/firecloset/wall{ - pixel_y = 28 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/camera/autoname{ + dir = 10 + }, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "Fm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -5226,18 +5207,21 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Fr" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/rack, +/obj/item/storage/toolbox/ammo/c10mm{ + pixel_x = 7; + pixel_y = 14 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/item/storage/toolbox/ammo/a308{ + pixel_x = 6; + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/storage/toolbox/ammo/c45{ + pixel_x = -4; + pixel_y = 2 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "Fs" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -5245,17 +5229,23 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/sign/poster/contraband/space_cola{ - pixel_y = 32 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "Ft" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -5263,13 +5253,20 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Fu" = ( -/obj/item/kirbyplants/random, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 +/obj/structure/sign/poster/contraband/bulldog{ + pixel_y = 32 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "FE" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/surgery{ @@ -5284,24 +5281,25 @@ /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "FI" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/smartfridge/bloodbank/preloaded, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/area/ship/medical/surgery) "FR" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, /area/ship/engineering/atmospherics) "FS" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/syndicateemblem/top/left{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/left, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "FV" = ( /obj/machinery/door/poddoor{ @@ -5329,44 +5327,44 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Gj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) "Gk" = ( -/obj/item/clothing/gloves/krav_maga/combatglovesplus, -/obj/item/ammo_box/magazine/m10mm/ap, -/obj/item/ammo_box/magazine/m10mm/ap, -/obj/item/clothing/head/HoS/beret/syndicate, -/obj/item/radio/headset/syndicate/alt/leader, -/obj/item/gun/ballistic/automatic/pistol/no_mag, -/obj/item/megaphone/sec, -/obj/item/clothing/under/syndicate/combat, -/obj/machinery/light/directional/north, -/obj/item/clothing/shoes/combat, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/clothing/head/aclfcap, -/obj/item/clothing/suit/aclf, -/obj/item/clothing/under/syndicate/aclf, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "syndicate"; - name = "lieutenant locker"; - req_access = list(3,150) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 0 }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "Gm" = ( -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/structure/rack, +/obj/item/gun/ballistic/automatic/ebr{ + pixel_x = -16; + pixel_y = 7; + spawnwithmagazine = 0 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/item/gun/ballistic/automatic/ebr{ + pixel_x = -9; + pixel_y = 2; + spawnwithmagazine = 0 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "Gn" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1; @@ -5376,15 +5374,18 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "Go" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/machinery/camera/autoname{ dir = 5 }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/mineral/ore_redemption{ + dir = 4 + }, /turf/open/floor/pod/dark, /area/ship/cargo) "Gq" = ( @@ -5425,12 +5426,21 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Gy" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "GC" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -5438,16 +5448,7 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "GD" = ( -/obj/structure/rack, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/plasteel/dark, /area/ship/security) "GE" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -5474,19 +5475,10 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/office) "GH" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/machinery/vending/cigarette/syndicate, +/turf/open/floor/plasteel, +/area/ship/crew/dorm) "GM" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -5494,31 +5486,30 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/sign/poster/contraband/space_up{ + pixel_y = -32 }, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "GN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ - dir = 1 +/obj/structure/closet/emcloset/wall{ + dir = 4; + pixel_x = -28 }, -/obj/machinery/light/small/directional/west, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/effect/turf_decal/trimline/opaque/syndiered/warning, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "GO" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -5534,6 +5525,21 @@ }, /turf/open/floor/engine, /area/ship/engineering/engine) +"GP" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/item/circuitboard/machine/autolathe, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stack/sheet/glass, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/pod/dark, +/area/ship/cargo) "GU" = ( /obj/effect/turf_decal/rechargefloor, /obj/effect/turf_decal/techfloor{ @@ -5545,17 +5551,12 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "GW" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/port) "GZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -5586,16 +5587,11 @@ /turf/open/floor/plating, /area/ship/external/dark) "He" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 +/obj/machinery/door/airlock/external{ + req_access = list(150) }, -/obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) +/area/ship/hallway/port) "Hj" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -5623,16 +5619,20 @@ /turf/open/floor/circuit/red, /area/ship/engineering/communications) "Hu" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "HF" = ( @@ -5645,32 +5645,20 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "HG" = ( -/obj/machinery/light/directional/north, -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) -"HH" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/table, -/obj/item/clothing/head/warden/drill{ - name = "lieutenant's campaign hat"; - desc = "A special armored campaign hat with the Syndicate insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; - pixel_x = 2; - pixel_y = -7 - }, -/obj/item/reagent_containers/food/snacks/donut/choco{ - pixel_x = 3; - pixel_y = 7 +/obj/machinery/door/window, +/turf/open/floor/wood{ + color = "#422C14" }, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_x = -7; - pixel_y = 6 +/area/ship/crew/canteen) +"HH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "HI" = ( @@ -5681,19 +5669,9 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "HL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "HQ" = ( /obj/structure/chair{ dir = 4 @@ -5710,23 +5688,28 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "HY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/item/radio/headset/syndicate/alt, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/machinery/light/directional/east, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, +/turf/open/floor/mineral/plastitanium, +/area/ship/security) "Ib" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -5746,6 +5729,7 @@ icon_state = "1-2" }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/light/directional/west, /turf/open/floor/plating, /area/ship/hallway/central) "Ie" = ( @@ -5762,6 +5746,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/camera/autoname{ + dir = 9 + }, +/obj/machinery/light_switch{ + pixel_y = 11; + dir = 8; + pixel_x = 20 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Ig" = ( @@ -5783,22 +5775,12 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ii" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/closet/secure_closet/freezer/kitchen/wall{ - dir = 4; - pixel_x = -28; - req_access = null +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood{ + color = "#422C14" }, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/storage/box/ingredients/vegetarian, -/obj/item/storage/box/ingredients/carnivore, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/turf/open/floor/plasteel, /area/ship/crew/canteen) "Il" = ( /obj/effect/turf_decal/techfloor, @@ -5831,27 +5813,47 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "IB" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) -"IC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/airlock/hatch{ - name = "Security" +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) +"IC" = ( +/obj/structure/sign/poster/contraband/m90{ + icon_state = "poster-m90"; + pixel_x = -32 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "syndicate"; + name = "lieutenant locker"; + req_access = list(3,150) }, +/obj/item/clothing/under/syndicate/aclf, +/obj/item/clothing/suit/aclf, +/obj/item/clothing/head/aclfcap, +/obj/item/clothing/shoes/combat, +/obj/item/megaphone/sec, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/clothing/head/HoS/beret/syndicate, +/obj/item/radio/headset/syndicate/alt/leader, +/obj/item/clothing/gloves/krav_maga/combatglovesplus, +/obj/item/ammo_box/magazine/m10mm/ap, +/obj/item/ammo_box/magazine/m10mm/ap, +/obj/item/clothing/suit/armor/hos/trenchcoat, /turf/open/floor/mineral/plastitanium, /area/ship/security) "ID" = ( @@ -5886,6 +5888,7 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 8 }, +/obj/machinery/holopad/emergency/medical, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "IN" = ( @@ -5899,6 +5902,10 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) +"IO" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/starboard) "IT" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -5921,11 +5928,20 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "IV" = ( -/obj/machinery/door/airlock/external{ - req_access = list(150) +/obj/structure/closet/emcloset/wall{ + dir = 4; + pixel_x = -28 + }, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/item/clothing/suit/space/syndicate, +/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "Jf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -5961,29 +5977,17 @@ "Jr" = ( /obj/effect/decal/cleanable/plasma, /obj/effect/decal/cleanable/vomit/old{ - pixel_y = -6; - pixel_x = -6 + pixel_y = 22; + pixel_x = 12 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"Jw" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Jy" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ @@ -6005,13 +6009,13 @@ /obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ dir = 1 }, -/obj/machinery/door/airlock/external{ - req_access = list(150,10); - dir = 4 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10); + dir = 8 + }, /turf/open/floor/engine, /area/ship/engineering/engine) "JA" = ( @@ -6079,17 +6083,12 @@ /turf/template_noop, /area/template_noop) "JY" = ( -/obj/structure/bed, -/obj/structure/sign/poster/official/no_erp{ - pixel_x = 32 - }, -/obj/item/storage/box/syndie_kit/sleepytime, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/item/bedsheet/black, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm) +/obj/machinery/vending/coffee, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "Ke" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 10 @@ -6105,20 +6104,13 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Kg" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/light/directional/north, +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "Kk" = ( /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 @@ -6180,22 +6172,23 @@ /turf/open/floor/plating, /area/ship/bridge) "Kx" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/machinery/door/window/eastleft, -/turf/open/floor/plasteel, +/obj/structure/table/wood, +/obj/machinery/jukebox/boombox{ + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "Ky" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/light/directional/east, +/obj/structure/railing/wood, +/obj/structure/closet/crate/bin, +/turf/open/floor/wood{ + color = "#422C14" }, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/turf/open/floor/plasteel, /area/ship/crew/canteen) "Kz" = ( /obj/structure/cable/yellow{ @@ -6216,35 +6209,16 @@ /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "KA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/industrial/warning, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/door/airlock/hatch{ - name = "Cargo Bay" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/port) "KB" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 - }, -/obj/machinery/computer/camera_advanced{ - dir = 4; - icon_state = "computer-right"; - icon_keyboard = "syndie_key" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plasteel/dark, +/area/ship/security) "KD" = ( /obj/structure/table, /obj/machinery/button/massdriver{ @@ -6297,20 +6271,28 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "KJ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "KK" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 +/obj/machinery/cryopod/syndicate{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/techfloor{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "KM" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 @@ -6321,20 +6303,12 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/airlock/hatch{ - name = "Cargo Bay" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/port) "KU" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -6357,7 +6331,6 @@ /area/ship/bridge) "Lp" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; req_access = list(150,10); dir = 4 }, @@ -6385,9 +6358,28 @@ /turf/open/floor/engine/air, /area/ship/engineering/atmospherics) "LG" = ( -/obj/machinery/door/airlock/hatch{ - name = "Restroom" +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/structure/closet{ + icon_state = "syndicate" }, +/obj/item/clothing/suit/jacket/letterman_syndie, +/obj/item/clothing/suit/jacket/letterman_syndie, +/obj/item/clothing/suit/hooded/hoodie/red, +/obj/item/clothing/suit/hooded/hoodie/red, +/obj/item/clothing/under/syndicate, +/obj/item/clothing/under/syndicate, +/obj/item/clothing/under/syndicate/skirt, +/obj/item/clothing/under/syndicate/skirt, +/obj/item/clothing/under/syndicate/aclfgrunt, +/obj/item/clothing/under/syndicate/aclfgrunt, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/head/soft/black, +/obj/item/clothing/head/soft/black, +/obj/item/clothing/head/soft/black, +/obj/item/clothing/head/soft/black, /turf/open/floor/plasteel, /area/ship/crew/dorm) "LH" = ( @@ -6396,6 +6388,11 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "LX" = ( @@ -6481,6 +6478,15 @@ pixel_x = 9 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/fluff/paper/stack{ + pixel_x = -7; + pixel_y = -15 + }, +/obj/item/chair{ + pixel_x = 10; + pixel_y = 8; + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "MA" = ( @@ -6488,14 +6494,14 @@ name = "captain's suit storage unit"; suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/elite }, -/obj/structure/sign/poster/contraband/have_a_puff{ - pixel_x = -32 - }, /obj/machinery/light_switch{ dir = 1; pixel_x = 10; pixel_y = -20 }, +/obj/structure/sign/poster/contraband/have_a_puff{ + pixel_x = -32 + }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "MC" = ( @@ -6505,7 +6511,10 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "MK" = ( -/turf/open/floor/mineral/plastitanium, +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(150, 58) + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/security) "ML" = ( /obj/machinery/door/poddoor{ @@ -6532,7 +6541,6 @@ /area/ship/engineering/communications) "MZ" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; req_access = list(150,10); dir = 8 @@ -6560,52 +6568,35 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Nh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + icon_state = "1-2" }, -/obj/structure/closet/secure_closet/armory1{ - populate = 0; - icon_state = "syndicate" +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -8 }, -/obj/item/clothing/head/helmet/swat, -/obj/item/clothing/head/helmet/swat, -/obj/item/clothing/head/helmet/swat, -/obj/item/clothing/suit/armor/vest/bulletproof, -/obj/item/clothing/suit/armor/vest/bulletproof, -/obj/item/clothing/suit/armor/vest/bulletproof, -/obj/machinery/light_switch{ - pixel_y = 22; - pixel_x = -12 +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/turf/open/floor/plating, +/area/ship/hallway/central) "Nj" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/window/brigdoor/southleft{ - dir = 8; - req_access = list(3,150) +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/security) "No" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/machinery/holopad/emergency, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/firealarm/directional/south, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/fancy{ + name = "blood-red curtains" }, -/turf/open/floor/plasteel, +/turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm) "Nr" = ( /obj/effect/turf_decal/corner/transparent/bar/diagonal, @@ -6619,30 +6610,10 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/office) "NE" = ( -/obj/structure/sign/poster/contraband/bulldog{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) -"NF" = ( -/obj/structure/closet/emcloset/wall{ - dir = 4; - pixel_x = -28 +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "NI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -6790,11 +6761,16 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "OK" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 1 + }, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ON" = ( /obj/structure/cable/yellow{ @@ -6829,19 +6805,15 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "OY" = ( -/obj/structure/closet/secure_closet/brig/wall{ - pixel_y = 28; - req_access = list(3,150) - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 - }, -/obj/machinery/camera/autoname{ - dir = 8 - }, +/obj/structure/bed, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "OZ" = ( @@ -6857,30 +6829,27 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Pa" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 - }, -/obj/machinery/computer/secure_data/laptop{ - dir = 8; - pixel_y = 6; - pixel_x = 2 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/grunge, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "Pb" = ( -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/camera/autoname{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) @@ -6898,15 +6867,22 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Pe" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"Pn" = ( -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) +"Pn" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/trimline/opaque/syndiered/warning, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "Po" = ( @@ -6940,18 +6916,13 @@ }, /area/ship/engineering/atmospherics) "PA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/effect/turf_decal/syndicateemblem/middle/middle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "PB" = ( /obj/machinery/door/airlock/hatch{ - name = "Mech Launcher #1"; req_access = list(150); dir = 4 }, @@ -6991,7 +6962,7 @@ /area/ship/crew/janitor) "PN" = ( /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "PQ" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 @@ -7002,9 +6973,6 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "PY" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Dorms" - }, /obj/effect/turf_decal/corner/transparent/bar{ dir = 5 }, @@ -7017,11 +6985,22 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel, /area/ship/crew/dorm) "Qa" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-9" + }, +/turf/open/floor/plasteel/stairs/wood{ + dir = 4 + }, /area/ship/crew/canteen) "Qd" = ( /obj/effect/turf_decal/corner/opaque/orange{ @@ -7061,13 +7040,19 @@ /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "Qk" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "Ql" = ( /obj/effect/turf_decal/corner/transparent/bar/diagonal, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -7100,46 +7085,26 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/janitor) "Qt" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 - }, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Qv" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered/border{ + dir = 1 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/public/glass, +/turf/open/floor/plasteel/tech, /area/ship/crew/canteen) -"Qx" = ( -/obj/structure/closet/secure_closet/brig/wall{ - pixel_y = 28; - req_access = list(3,150) - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) "QD" = ( /obj/machinery/door/window/eastright{ name = "Engine Access" @@ -7168,20 +7133,39 @@ /obj/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, /area/ship/bridge) -"QR" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/structure/table/wood, -/obj/item/storage/photo_album/syndicate{ - pixel_x = 4; - pixel_y = 4 +"QN" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 }, -/obj/item/camera{ - pixel_x = -2 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/machinery/light/directional/south, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"QO" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/secure_data/laptop{ + dir = 8; + pixel_y = 6; + pixel_x = 1 + }, +/obj/machinery/door/window/brigdoor/eastright, +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(3,150) + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security) +"QR" = ( +/obj/structure/bed, +/obj/machinery/light/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "QT" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 @@ -7237,11 +7221,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/light_switch{ - pixel_y = -10; - dir = 8; - pixel_x = 20 - }, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Rh" = ( @@ -7277,15 +7256,21 @@ dir = 5 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Rv" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 +/obj/structure/rack, +/obj/item/gun/ballistic/shotgun/bulldog{ + pixel_x = -7; + pixel_y = 7; + spawnwithmagazine = 0 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/item/gun/ballistic/shotgun/bulldog{ + pixel_y = -3; + pixel_x = 2; + spawnwithmagazine = 0 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/light/directional/north, +/turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Ry" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -7309,15 +7294,23 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "RB" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/item/kitchen/knife, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "RE" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/light/directional/south, @@ -7348,39 +7341,33 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "RT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/shieldgen{ - anchored = 1; - req_access = list(150) - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercee{ - dir = 8 +/obj/structure/table, +/obj/effect/turf_decal/corner/opaque/syndiered/full, +/obj/item/storage/box/medipens{ + pixel_y = 7; + pixel_x = -4 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 +/obj/item/storage/firstaid/tactical{ + pixel_y = 4; + pixel_x = 8 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/turf/open/floor/plasteel/dark, +/area/ship/medical) "RU" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "RW" = ( -/obj/machinery/door/airlock/external{ - req_access = list(150) - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "Sa" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -7391,48 +7378,89 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Sb" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Sd" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 + }, +/obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/crew/cryo) +"Sd" = ( +/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ dir = 4 }, +/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Sg" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/structure/rack, +/obj/item/gun/ballistic/rocketlauncher{ + pixel_y = 6; + pixel_x = -3 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/machinery/door/window/brigdoor/northleft, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 +/obj/item/ammo_casing/caseless/rocket/hedp{ + pixel_x = -11; + pixel_y = -5 + }, +/obj/item/ammo_casing/caseless/rocket{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/ammo_casing/caseless/rocket{ + pixel_x = -1; + pixel_y = -6 + }, +/obj/item/storage/backpack/duffelbag/syndie/c4{ + pixel_x = -1; + pixel_y = -10 }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Si" = ( -/obj/machinery/vending/security/marine/syndicate, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/structure/rack, +/obj/item/clothing/suit/armor/riot{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_y = 5; + pixel_x = -4 + }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Sj" = ( -/obj/machinery/vending/boozeomat/syndicate_access, -/obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/obj/machinery/door/airlock/grunge, +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) "Sp" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/corner/opaque/orange/full, @@ -7454,7 +7482,6 @@ /area/ship/engineering) "Sv" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; req_access = list(150,10); dir = 4 @@ -7465,23 +7492,19 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Sy" = ( -/obj/structure/table/wood, -/obj/item/pizzabox/pineapple{ - pixel_y = 5 - }, -/obj/item/pizzabox/pineapple{ - pixel_y = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/item/pizzabox/pineapple{ - pixel_y = 15 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/item/pizzabox/pineapple{ - pixel_y = 20 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/camera/autoname, +/turf/open/floor/plating, +/area/ship/hallway/port) "SA" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -7567,23 +7590,19 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "SM" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/sign/warning/radiation{ - pixel_x = -32 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "SR" = ( -/obj/machinery/door/airlock/glass{ - name = "Cryo" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/industrial/warning{ + dir = 10 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/cryo) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/pod/dark, +/area/ship/cargo) "SS" = ( /obj/structure/sign/poster/official/moth/meth{ pixel_y = -32 @@ -7612,41 +7631,41 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "SV" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/light/small/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) "SZ" = ( -/obj/machinery/door/window/brigdoor/southleft{ - dir = 8; - req_access = list(3,150) - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/structure/bed, +/obj/structure/curtain/cloth/fancy{ + name = "blood-red curtains" }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/item/bedsheet/black, +/obj/item/storage/box/syndie_kit/sleepytime, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm) "Tl" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 - }, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/turf_decal/syndicateemblem/top/right{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Tn" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) "Tq" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, @@ -7655,13 +7674,17 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "Tt" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/newscaster/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "TC" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 6 @@ -7685,13 +7708,21 @@ /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "TM" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - id = "twinkle_external" +/obj/structure/closet/secure_closet/wall{ + dir = 8; + pixel_x = 28 }, -/turf/open/floor/plating, -/area/ship/security) +/obj/item/kitchen/knife, +/obj/item/cutting_board, +/obj/item/clothing/under/suit/waiter/syndicate, +/obj/item/clothing/suit/hazardvest/donk, +/obj/item/clothing/under/syndicate/donk, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "TR" = ( /obj/machinery/power/terminal{ dir = 8 @@ -7747,8 +7778,10 @@ dir = 1 }, /obj/effect/turf_decal/corner/opaque/syndiered/half, -/obj/structure/rack, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/item/wallframe/extinguisher_cabinet{ + pixel_y = 17; + pixel_x = -2 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Ug" = ( @@ -7760,15 +7793,42 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Um" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/directional/west, /turf/open/floor/pod/dark, /area/ship/cargo) "Up" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/item/ammo_box/magazine/sniper_rounds{ + pixel_x = -8; + pixel_y = 14 + }, +/obj/item/ammo_box/magazine/sniper_rounds{ + pixel_x = 3; + pixel_y = 10 + }, +/obj/item/ammo_box/magazine/m12g/small{ + pixel_y = -2 + }, +/obj/item/ammo_box/magazine/m12g/small{ + pixel_x = -9; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/m12g/small{ + pixel_x = 1; + pixel_y = 2 + }, +/obj/item/ammo_box/magazine/m12g/small{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "ammo locker" }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) @@ -7778,13 +7838,11 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ux" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/window/reinforced/spawner{ - dir = 4 +/obj/structure/table/wood, +/obj/item/clothing/head/chefhat{ + pixel_x = 7 }, -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/turf/open/floor/plasteel, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "UA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -7830,32 +7888,21 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "UF" = ( -/obj/machinery/door/airlock/public/glass, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/canteen) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/hallway/port) "UH" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /turf/open/floor/plasteel/dark, /area/ship/medical) -"UI" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) "UK" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -7886,9 +7933,14 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "UW" = ( -/obj/effect/turf_decal/corner/opaque/syndiered, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/railing/wood, +/turf/open/floor/wood{ + color = "#422C14" + }, +/area/ship/crew/canteen) "Va" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -7922,33 +7974,18 @@ }, /turf/open/floor/engine/o2, /area/ship/engineering/atmospherics) -"Vv" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/mineral/ore_redemption{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/pod/dark, -/area/ship/cargo) "Vy" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +/obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "VA" = ( @@ -7981,35 +8018,32 @@ /turf/open/floor/plating, /area/ship/cargo) "VG" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/structure/railing/wood, +/turf/open/floor/wood{ + color = "#422C14" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/turf/open/floor/plasteel, /area/ship/crew/canteen) "VH" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/port) "VJ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/middle/left{ +/obj/effect/turf_decal/syndicateemblem/middle/middle{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/holopad/emergency/command, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "VM" = ( /obj/structure/mirror{ @@ -8027,30 +8061,36 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "VO" = ( -/turf/open/floor/wood, +/obj/structure/table/wood, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/airalarm/directional/east, +/obj/machinery/reagentgrinder/constructed{ + pixel_y = 9 + }, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "VU" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 - }, -/obj/machinery/turretid{ - pixel_y = 32; - req_access = null; - req_access_txt = "150" - }, -/obj/effect/turf_decal/spline/fancy/opaque/black/corner, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "VY" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/effect/turf_decal/industrial/warning{ dir = 5 }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 11 + }, +/turf/open/floor/pod/dark, +/area/ship/cargo) "VZ" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, @@ -8079,28 +8119,12 @@ }, /area/ship/bridge) "Wj" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/lizardwine{ - pixel_y = 14; - pixel_x = 10 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/lighter{ - pixel_x = -10; - pixel_y = -2 - }, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = -4 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm/dormtwo) +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "Wm" = ( /obj/structure/table, /obj/item/storage/bag/medical{ @@ -8130,23 +8154,6 @@ }, /turf/open/floor/pod/dark, /area/ship/cargo) -"Wr" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) "Ws" = ( /obj/effect/turf_decal/atmos/plasma{ dir = 8 @@ -8154,12 +8161,16 @@ /turf/open/floor/engine/plasma, /area/ship/engineering/atmospherics) "Wy" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/port) "WB" = ( /obj/structure/chair{ dir = 1 @@ -8178,13 +8189,24 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "WG" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/machinery/vending/cigarette/syndicate, -/obj/structure/sign/departments/restroom{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "WH" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ dir = 8 @@ -8207,16 +8229,12 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "WL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "WR" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 @@ -8227,43 +8245,44 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "WV" = ( -/obj/machinery/light/directional/north, -/obj/structure/bed, -/obj/item/toy/plush/beeplushie, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 2 - }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "WX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/firecloset/wall{ + pixel_y = 28 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"WY" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; - req_one_access_txt = "150"; - req_access = list(150,10) +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "WZ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/obj/effect/turf_decal/syndicateemblem/middle/left{ dir = 4 }, -/obj/effect/turf_decal/syndicateemblem/top/right{ - dir = 8 +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Xb" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/item/paper_bin/carbon, -/obj/item/pen/fountain, -/obj/effect/turf_decal/corner/opaque/syndiered, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xc" = ( @@ -8275,25 +8294,29 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xf" = ( -/obj/structure/rack, -/obj/effect/turf_decal/box/white/corners{ +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) +"Xg" = ( +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/effect/turf_decal/box/white/corners, -/obj/structure/closet/firecloset/wall{ - dir = 1; - pixel_y = -28 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) -"Xg" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm/dormtwo) +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/space_cola{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/starboard) "Xj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ dir = 8 @@ -8347,19 +8370,13 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "XL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/door/airlock/external{ + req_access = list(150) }, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) "XN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -8388,20 +8405,11 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Ya" = ( -/obj/structure/closet/emcloset/wall{ - dir = 4; - pixel_x = -28 - }, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/suit/space/syndicate, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "Yc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber, /obj/structure/sign/warning/nosmoking/burnt{ @@ -8432,15 +8440,26 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "Yj" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, +/obj/machinery/door/airlock/external{ + req_access = list(150) + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "Yl" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plating, -/area/ship/crew/canteen) +/area/ship/hallway/port) "Ym" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8463,20 +8482,17 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Yn" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/techfloor{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "Yo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/drinks, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "Yp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -8498,16 +8514,21 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "Yz" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light/directional/west, -/obj/structure/sign/poster/official/moth/smokey{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) "YB" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ dir = 1 @@ -8523,10 +8544,6 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "YF" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/syndiered/border{ dir = 4 }, @@ -8554,86 +8571,113 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "YO" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/structure/rack, +/obj/item/gun/ballistic/automatic/smg/c20r{ + pixel_x = 2; + pixel_y = 8; + spawnwithmagazine = 0 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/item/gun/ballistic/automatic/smg/c20r{ + pixel_y = 3; + spawnwithmagazine = 0 }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) -"YR" = ( -/obj/structure/closet/secure_closet/engineering_personal{ - req_access = list(150,10) +/obj/item/gun/ballistic/automatic/smg/c20r{ + pixel_y = -2; + pixel_x = 3; + spawnwithmagazine = 0 }, -/obj/effect/turf_decal/corner/opaque/orange{ - dir = 10 +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) +"YR" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 }, -/obj/machinery/light/directional/south, -/obj/item/clothing/shoes/magboots/syndie, -/obj/item/clothing/head/helmet/space/syndicate/black/engie, -/obj/item/clothing/suit/space/syndicate/black/engie, -/obj/item/pipe_dispenser, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) +/obj/machinery/light/directional/north, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "YT" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plating, +/area/ship/hallway/port) "YW" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/machinery/camera/autoname{ + dir = 6 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 8 + }, +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Zc" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/structure/closet/secure_closet/engineering_personal{ + req_access = list(150,10); + populate = 0 + }, +/obj/effect/turf_decal/corner/opaque/orange{ dir = 10 }, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/light/directional/south, +/obj/item/clothing/shoes/magboots/syndie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/item/pipe_dispenser, +/obj/item/storage/belt/utility/syndicate, +/obj/item/clothing/under/syndicate/gec, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/head/hardhat/red{ + name = "hard hat" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "Zg" = ( /obj/effect/turf_decal/industrial/warning{ dir = 6 }, -/obj/structure/tank_dispenser/oxygen, +/obj/structure/sign/poster/solgov/suns{ + pixel_x = 32 + }, +/obj/structure/crate_shelf, /turf/open/floor/pod/dark, /area/ship/cargo) "Zk" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/bottom/middle{ +/obj/effect/turf_decal/syndicateemblem/bottom/right{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 1 + }, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Zt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/cryopod/syndicate{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/techfloor{ + dir = 9 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "Zw" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 10 @@ -8658,13 +8702,9 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ZC" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/dark, /area/ship/cargo) "ZD" = ( @@ -8673,19 +8713,12 @@ }, /area/ship/engineering/engine) "ZJ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "ZO" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -8747,6 +8780,7 @@ mp mp mp mp +mp UN UN UN @@ -8766,6 +8800,7 @@ mp mp mp mp +mp "} (2,1,1) = {" mp @@ -8774,6 +8809,7 @@ mp mp mp mp +mp ms ae LX @@ -8801,10 +8837,12 @@ mp mp mp mp +mp "} (3,1,1) = {" mp mp +mp Pz LX ae @@ -8836,10 +8874,12 @@ LX Pz mp mp +mp "} (4,1,1) = {" mp mp +mp FR NO iJ @@ -8871,10 +8911,12 @@ wM FR mp mp +mp "} (5,1,1) = {" mp mp +mp FR TR xh @@ -8887,11 +8929,11 @@ Vk xw hZ Rc -WX +iL Fm DK IU -DF +si pw Rj YB @@ -8906,10 +8948,12 @@ TR FR mp mp +mp "} (6,1,1) = {" mp mp +mp FR iu Rd @@ -8941,8 +8985,10 @@ GC FR mp mp +mp "} (7,1,1) = {" +mp FR FR FR @@ -8976,8 +9022,10 @@ FR FR FR FR +mp "} (8,1,1) = {" +mp qM bY lj @@ -9011,8 +9059,10 @@ qz ni BE gh +mp "} (9,1,1) = {" +mp gh xW SA @@ -9046,8 +9096,10 @@ qz aa Pn gh +mp "} (10,1,1) = {" +mp FR FR ZX @@ -9081,9 +9133,11 @@ FR FR FR FR +mp "} (11,1,1) = {" mp +mp pF CB Sp @@ -9116,10 +9170,12 @@ Ot FR mp mp +mp "} (12,1,1) = {" mp mp +mp ZX ZX ED @@ -9151,16 +9207,18 @@ FR FR mp mp +mp "} (13,1,1) = {" mp mp mp +mp ZX Qd bM zH -bV +zZ ZX hN IT @@ -9186,16 +9244,18 @@ FR mp mp mp +mp "} (14,1,1) = {" mp mp mp +mp ZX fz zK qK -YR +Zc ZX RG BV @@ -9221,16 +9281,18 @@ FR mp mp mp +mp "} (15,1,1) = {" mp mp -bL +mp +mp ZX WK pB wA -bQ +De ZX Dk NI @@ -9256,11 +9318,13 @@ FR mp mp mp +mp "} (16,1,1) = {" mp mp mp +mp ZX wP oC @@ -9283,14 +9347,15 @@ Et yf qo mX +ia Vy Hu Pb -yn FR mp mp mp +mp "} (17,1,1) = {" ms @@ -9302,6 +9367,7 @@ xj xj xj xj +xj oB ZD Na @@ -9321,7 +9387,8 @@ PL PL PL PL -jA +kT +Bj Bj Bj Bj @@ -9329,13 +9396,14 @@ We "} (18,1,1) = {" xj -RB -jx +lw +iG Ii +Ii +HG pj qA Fa -nE xj Kq ZD @@ -9352,11 +9420,12 @@ xo pc TT PL +Gm Si Sg -wR PL -NE +Fu +EG yN nr Bj @@ -9365,12 +9434,13 @@ Bj (19,1,1) = {" xj xj +cW +sf Ux Kx fN -mO +VG Qa -dD xj Jz ZD @@ -9387,30 +9457,32 @@ ZD ZD ZD PL -Si -si +dm +cD sr Eo -lT -da -vn +Tt +EG +ET +ET Bj Bj "} (20,1,1) = {" mp -xj -Sj -VO +ML +dD +sf +sf +VU wz -VG +UW qP ma -xj +VH yF -SM sd -xP +QN xa Ru Ei @@ -9420,32 +9492,34 @@ xa xP oX PN -PN +IO PL -sG +YO ji wg gk -Kg -IB -fX +mO +EG +ET +fK Bj mp "} (21,1,1) = {" mp ML +Yo +sf lY -VO +Xf tU VG -cD +qP ml Yl DW -YT gW -cq +cT ag Ax kd @@ -9454,22 +9528,25 @@ jk ag cq ea +BG tY -kl PL -Si Rv +jx TC on -cX -AK +ep +EG +da kH Bj mp "} (22,1,1) = {" mp -ML +xj +wb +TM sf VO ih @@ -9477,8 +9554,7 @@ Ky dU Qv UF -HL -lw +mG vz vz vz @@ -9489,33 +9565,35 @@ gX sO sO sO -VH -oi +AK +Pe PL -Si +Bq +Fr Up -hS PL -Nh -MK -vE +Tt +EG +Bj +Bj Bj mp "} (23,1,1) = {" mp xj -dH -lq -Sy -Bq -gZ -zP +xj +xj +xj +xj +xj +xj +xj +xj dp WL -ru vz -Wj +eF Cj ON MA @@ -9524,66 +9602,70 @@ Qs Ry PM sO +xz kR -Fr PL PL jH jH PL -BG +BL +EG da -Xf +pR Bj mp "} (24,1,1) = {" mp JM +hP +Ed +CJ +Sj +Nr +gZ +GH JM -JM -JM -JM -JM -JM -JM +Sy mG -lw vz -dm +kl yM ts -Xg +fX vz ID TI Fj sO -KJ -ox +WY +kf +Bj IC aD oc -oc -oc -ln +Eh +Tt +EG +ET ET -kc Bj mp "} (25,1,1) = {" mp -JM -yP -He +Wd +Wd +Wd +Wd +Wd LG -Nr -Wr +hY qI PY +Gj RU -Tt sp sp Ee @@ -9594,31 +9676,33 @@ sp sp Ee sp -VY -GH +wR +KJ Bj -Ed -ow +YR +ET +WV oG -pR -KK -AK -Ey +Tt +EG +ET +ET Bj mp "} (26,1,1) = {" mp Wd +Zt +Yn +lG Wd -Wd -Wd -WG +ln Ql -QR +bV JM +IB oi -zO sp cC ir @@ -9629,31 +9713,33 @@ AQ oJ NC sp +WX Fl -cd -Bj Bj +vE +ow dq Bj -Bj -pD -sc -pN +Tt +EG +da +HY Bj mp "} (27,1,1) = {" mp Wd +Sb +gz gz yO -Wd +DF ps No -aA JM +Tn tH -At sp qN im @@ -9664,31 +9750,33 @@ KF WB wa sp -Gy -oi +wh +Pe Bj pL -SV -pE +QO +Bj +Bj Dp -CJ -da -Eh -wh +EG +Bj +Bj +Bj mp "} (28,1,1) = {" mp Wd +KK +cj fn -iG -SR -FI -YO +Wd +SZ +bv Fi JM -Zt -pO +YT +fJ sp pm qT @@ -9699,31 +9787,33 @@ Dx gL GG sp +wh Gy nt -Bj +sG Gk HH Pa +At +EG +da +pR Bj -HG -IB -hY -wh mp "} (29,1,1) = {" mp +Wd Va Wd Wd Wd -bv -JY JM JM +JM +JM +pO qY -Bs sp sp Ee @@ -9734,33 +9824,35 @@ sp sp Ee sp -kT -oi -Bj -Bj +qp +Pe Bj Bj Bj -fJ -AK +Ey +Ey +GD +EG +ET fK -TM +Bj mp "} (30,1,1) = {" mp +mp lo CV Go +pH +GP +SR Bw -Bw -Bw -Bw +pD Yz hr -Id BK -Yp +Nh Xs Id UA @@ -9769,31 +9861,33 @@ bH pU Yp ZO -Id +ru +WG lg tn -Yn Bj +KB +GD GD -mB EG -ia -ia +ET +ET Bj mp "} (31,1,1) = {" mp +mp VC AW ZC Um -pH -ep +Um +tp Bw -KJ -oi -UW +Wj +IB +nE IN wu If @@ -9804,20 +9898,22 @@ KM kM XE sz -KM +SM +ak Pe -oi -Gm +hS Bj -CQ +dH +GD Nj -Bj -CQ -SZ +dE +da +pN Bj mp "} (32,1,1) = {" +mp JT VC AW @@ -9825,14 +9921,14 @@ UK EO fQ EQ +Bs KQ yz ZJ -Zc ex dz -uh -uh +dz +dz tg uX uh @@ -9840,30 +9936,32 @@ uh dz dz zS -Tn -oi -lw +zO +Pe +gi Bj -xe +CQ +CQ MK +CQ +Bj Bj -Qx -tp Bj mp "} (33,1,1) = {" mp +mp vQ dg NT Wo Uc ng +vn KA Wy oj -eF dz ii XU @@ -9875,30 +9973,32 @@ YJ jM vW dz +JY gI fm -zZ -Bj -WV -xz Bj -BL +ET +ET +ET +ET +ET qL Bj mp "} (34,1,1) = {" mp +mp jT Bw Bw +VY gE -Vv Zg Bw +cX dl bR -hP dz Dh st @@ -9910,13 +10010,14 @@ On JE rt dz +Kg ak Pe -cW Bj +QR OY -MK -Bj +OY +cd Bj Bj Bj @@ -9926,16 +10027,17 @@ mp mp mp mp +mp Bw Bw Bw Bw Bw +pE GM -iL -je je je +FI je je Jf @@ -9946,8 +10048,9 @@ uK fl dz dz +Xg Fs -qp +Bj Bj Bj Bj @@ -9962,31 +10065,33 @@ mp mp mp mp +mp +He IV Ya -Sb -RW +Yj +yP GW -pO je KI pp FE CF -dE +zc Wm bN -De +RT Ap Ie ck dz -Gy +wh +Qk XL -RW +SV GN -NF -IV +zk +mp mp mp mp @@ -9996,13 +10101,14 @@ mp mp mp mp +mp ZV -IV +He +yn ql Yj -RW -GW -kf +yP +hd je hb jz @@ -10016,28 +10122,30 @@ Ap Ie FW dz +lT Qk XL RW lO zk -IV xZ mp mp mp +mp "} (38,1,1) = {" mp mp mp mp +mp vd -xB -xB -xB -gi -pO +NE +NE +NE +kc +GW je zG hW @@ -10051,8 +10159,8 @@ WR Ie Ks dz -KJ -hd +dk +lx xB xB xB @@ -10061,6 +10169,7 @@ mp mp mp mp +mp "} (39,1,1) = {" mp @@ -10070,9 +10179,10 @@ mp mp mp mp -xB -HY -EX +mp +NE +RB +mG je iZ Iw @@ -10086,8 +10196,8 @@ nb VM SS dz +dk ka -lx xB mp mp @@ -10096,6 +10206,7 @@ mp mp mp mp +mp "} (40,1,1) = {" mp @@ -10104,6 +10215,7 @@ mp mp mp mp +mp nb nb Ym @@ -10114,7 +10226,7 @@ pp nb Xc Kk -KB +mB zp np nb @@ -10131,6 +10243,7 @@ mp mp mp mp +mp "} (41,1,1) = {" mp @@ -10139,6 +10252,7 @@ mp mp mp mp +mp Kw Hj do @@ -10147,11 +10261,11 @@ nb nb nb nb +ox Xb vL -wb -vL -lG +Xb +bL nb nb nb @@ -10166,6 +10280,7 @@ mp mp mp mp +mp "} (42,1,1) = {" mp @@ -10174,11 +10289,13 @@ mp mp mp mp +mp Kw bo Gv RA nb +lq Qt dL zy @@ -10189,7 +10306,6 @@ bd PA kE wr -Yo nb BU et @@ -10201,6 +10317,7 @@ mp mp mp mp +mp "} (43,1,1) = {" mp @@ -10209,22 +10326,23 @@ mp mp mp mp +mp Kw eL Fq QT en +jA +oD oD -Bc Bc ie VJ aX vO hU -dk -dk -dk +hU +hU vA yg Ir @@ -10236,6 +10354,7 @@ mp mp mp mp +mp "} (44,1,1) = {" mp @@ -10244,22 +10363,23 @@ mp mp mp mp +mp nb nb PB nb nb +YW Tl -vL +PA OK FS kV mx WZ +dL +HL tZ -vL -OK -Fu nb nb hR @@ -10271,6 +10391,7 @@ mp mp mp mp +mp "} (45,1,1) = {" mp @@ -10279,20 +10400,21 @@ mp mp mp mp +mp nb Uf Jr -Fc +iY nb VB nb -VU -cj +bQ +YF +YF EJ -UI +YF YF Sd -Jw nb FV nb @@ -10306,6 +10428,7 @@ mp mp mp mp +mp "} (46,1,1) = {" mp @@ -10314,6 +10437,7 @@ mp mp mp mp +mp nb iK jG @@ -10322,12 +10446,12 @@ nb mp QE uo -pr +sc +Sa +EX Sa -Gj tS tr -YW QE mp nb @@ -10341,6 +10465,7 @@ mp mp mp mp +mp "} (47,1,1) = {" mp @@ -10349,6 +10474,7 @@ mp mp mp mp +mp nb GU Mw @@ -10362,7 +10488,7 @@ jh zf oP Ao -RT +aA QE mp nb @@ -10376,6 +10502,7 @@ mp mp mp mp +mp "} (48,1,1) = {" mp @@ -10384,6 +10511,7 @@ mp mp mp mp +mp nb pl zJ @@ -10411,6 +10539,7 @@ mp mp mp mp +mp "} (49,1,1) = {" mp @@ -10419,6 +10548,7 @@ mp mp mp mp +mp nb nb nn @@ -10446,6 +10576,7 @@ mp mp mp mp +mp "} (50,1,1) = {" mp @@ -10455,6 +10586,7 @@ mp mp mp mp +mp nb rW nb @@ -10481,6 +10613,7 @@ mp mp mp mp +mp "} (51,1,1) = {" mp @@ -10490,6 +10623,7 @@ mp mp mp mp +mp kX Hd kX @@ -10516,6 +10650,7 @@ mp mp mp mp +mp "} (52,1,1) = {" mp @@ -10526,6 +10661,7 @@ mp mp mp mp +mp bg mp mp @@ -10551,4 +10687,5 @@ mp mp mp mp +mp "} diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 48a1cedc2afa..808a6e93f80e 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -450,7 +450,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/retro, 17) sleepyhead.apply_damage_type(15, BURN) to_chat(sleepyhead, "The symptoms of cryosleep set in as you awaken...") - +/obj/machinery/cryopod/syndicate + icon_state = "sleeper_s-open" + open_state = "sleeper_s-open" + close_state = "sleeper_s" /obj/machinery/cryopod/poor name = "low quality cryogenic freezer" diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm index fbe35ec5738a..62312dcb2712 100644 --- a/code/modules/clothing/outfits/syndicate.dm +++ b/code/modules/clothing/outfits/syndicate.dm @@ -50,6 +50,8 @@ box = /obj/item/storage/box/survival/syndie + job_icon = "assistant" + /datum/outfit/job/syndicate/assistant/gorlex name = "Junior Agent (Gorlex Marauders)" @@ -75,16 +77,14 @@ /datum/outfit/job/syndicate/assistant/twink name = "Deck Assistant (Twinkleshine)" - uniform = /obj/item/clothing/under/syndicate/intern - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/chameleon - r_pocket = /obj/item/kitchen/knife/combat/survival - back = /obj/item/storage/backpack - belt = /obj/item/storage/belt/military/assault - implants = list(/obj/item/implant/weapons_auth) + uniform = /obj/item/clothing/under/syndicate + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger id = /obj/item/card/id/syndicate_command/crew_id + shoes = null + gloves = null + ears = null + implants = list(/obj/item/implant/weapons_auth) + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -122,6 +122,8 @@ box = /obj/item/storage/box/survival/engineer + job_icon = "atmospherictechnician" + pda_slot = ITEM_SLOT_LPOCKET backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) @@ -151,6 +153,7 @@ backpack_contents = list(/obj/item/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup + job_icon = "bartender" /datum/outfit/job/syndicate/bartender/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -160,18 +163,20 @@ W.registered_age = AGE_MINOR to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!") - /datum/outfit/job/syndicate/bartender/twink - name = "Bartender (Twinkleshine)" + name = "Bartender (Twinkleshine, Donk)" uniform = /obj/item/clothing/under/syndicate/donk - shoes = /obj/item/clothing/shoes/laceup - gloves = /obj/item/clothing/gloves/color/white - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon - belt = /obj/item/storage/belt/bandolier - implants = list(/obj/item/implant/weapons_auth) id = /obj/item/card/id/syndicate_command/crew_id + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + suit = null + belt = null + head = null + shoes = null + gloves = null + ears = null + implants = list(/obj/item/implant/weapons_auth) + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -225,28 +230,27 @@ box = /obj/item/storage/box/survival/syndie + job_icon = "captain" + /datum/outfit/job/syndicate/captain/aclf name = "Captain (ACLF)" /datum/outfit/job/syndicate/captain/twink - name = "Captain (Twinkleshine)" + name = "Commodore (Twinkleshine, ACLF)" uniform = /obj/item/clothing/under/syndicate/aclf - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat + head = null + gloves = null + shoes = null ears = /obj/item/radio/headset/syndicate/alt/captain - mask = /obj/item/clothing/mask/chameleon - l_pocket = /obj/item/melee/transforming/energy/sword/saber/red - suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - suit_store = /obj/item/gun/ballistic/revolver/mateba - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault - glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + suit = null + belt = null implants = list(/obj/item/implant/weapons_auth) -/datum/outfit/job/syndicate/captain/sbc/post_equip(mob/living/carbon/human/H) +/datum/outfit/job/syndicate/captain/twink/post_equip(mob/living/carbon/human/H) . = ..() assign_codename(H) @@ -282,6 +286,8 @@ l_hand = /obj/item/export_scanner backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) + job_icon = "cargotechnician" + /datum/outfit/job/syndicate/cargo_tech/donk name = "Customer Associate (Donk! Co)" @@ -303,6 +309,8 @@ box = /obj/item/storage/box/survival/medical + job_icon = "chemist" + /datum/outfit/job/syndicate/chemist/gec name = "Chemist (GEC)" @@ -339,6 +347,7 @@ pda_slot = ITEM_SLOT_LPOCKET chameleon_extras = /obj/item/stamp/ce + job_icon = "chiefengineer" /datum/outfit/job/syndicate/ce/gec name = "Chief Engineer (GEC)" @@ -380,6 +389,8 @@ suit_store = /obj/item/flashlight/pen backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) + job_icon = "chiefmedicalofficer" + /datum/outfit/job/syndicate/cmo/suns name = "Medical Director (SUNS)" @@ -401,6 +412,8 @@ backpack_contents = list(/obj/item/storage/box/ids=1,\ /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) + job_icon = "headofpersonnel" + /datum/outfit/job/syndicate/head_of_personnel/cybersun name = "Intelligence Officer (Cybersun)" @@ -433,25 +446,29 @@ l_pocket = /obj/item/restraints/handcuffs backpack_contents = list(/obj/item/melee/baton/loaded=1) + job_icon = "headofsecurity" + /datum/outfit/job/syndicate/hos/gorlex name = "Sergeant (Syndicate)" /datum/outfit/job/syndicate/hos/twink - name = "Lieutenant (Twinkleshine)" + name = "Lieutenant (Twinkleshine, 2nd Battlegroup)" + uniform = /obj/item/clothing/under/syndicate/aclf - head = /obj/item/clothing/head/HoS/beret/syndicate - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/chameleon - gloves = /obj/item/clothing/gloves/combat - l_pocket = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault - shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/armor/vest - alt_suit = /obj/item/clothing/suit/aclf + head = null + ears = null + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + gloves = null + l_pocket = null + r_pocket = null + belt = null + shoes = null + suit = null + alt_suit = null id = /obj/item/card/id/syndicate_command/lieutenant implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/melee/baton) + + backpack_contents = null backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -480,6 +497,8 @@ l_hand = /obj/item/storage/firstaid/medical suit_store = /obj/item/flashlight/pen + job_icon = "medicaldoctor" + /datum/outfit/job/syndicate/doctor/suns name = "Medical Doctor (SUNS)" @@ -524,6 +543,8 @@ backpack_contents = list(/obj/item/roller=1) pda_slot = ITEM_SLOT_LPOCKET + job_icon = "paramedic" + /datum/outfit/job/syndicate/paramedic/gorlex name = "Paramedic (Gorlex)" @@ -536,22 +557,24 @@ suit = /obj/item/clothing/suit/toggle/labcoat/raincoat /datum/outfit/job/syndicate/paramedic/twink - name = "Medic (Twinkleshine)" + name = "Medic (Twinkleshine, CyberSun)" - gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil - uniform = /obj/item/clothing/under/syndicate/medic - glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/storage/belt/medical - back = /obj/item/storage/backpack/duffelbag/syndie/med - shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/longcoat/roboblack - alt_suit = /obj/item/clothing/suit/toggle/labcoat - suit_store = null - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + uniform = /obj/item/clothing/under/rank/medical/doctor/red id = /obj/item/card/id/syndicate_command/crew_id/med + belt = null + head = null + gloves = null + shoes = null + suit = null + alt_suit = null + suit_store = null + ears = null + l_pocket = null + r_pocket = null implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/pda/brig_phys) + + backpack_contents = null backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -579,6 +602,8 @@ belt = /obj/item/pda/medical pda_slot = ITEM_SLOT_BELT + job_icon = "psychologist" + /datum/outfit/job/syndicate/psychologist/suns name = "Ship Psychologist (SUNS)" @@ -593,6 +618,8 @@ alt_suit = null shoes = /obj/item/clothing/shoes/sandal/slippers + job_icon = "assistant" //todo: patient sechud icon + //Quartermaster /datum/outfit/job/syndicate/quartermaster @@ -611,6 +638,8 @@ l_hand = /obj/item/clipboard backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) + job_icon = "quartermaster" + /datum/outfit/job/syndicate/quartermaster/donk name = "Manager (Donk! Co.)" id = /obj/item/card/id/syndicate_command/captain_id @@ -646,25 +675,28 @@ /obj/item/melee/baton/loaded=1, ) + job_icon = "securityofficer" /datum/outfit/job/syndicate/security/gorlex name = "Assault Operative (Gorlex)" /datum/outfit/job/syndicate/security/twink - name = "Operative (Twinkleshine)" + name = "Operative (Twinkleshine, ACLF)" + uniform = /obj/item/clothing/under/syndicate/combat - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/chameleon - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - l_pocket = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger id = /obj/item/card/id/syndicate_command/crew_id + head = null + ears = null + suit = null + belt = null + gloves = null + shoes = null + l_pocket = null implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/gun_voucher/syndicate=1) - head = null + backpack_contents = null + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/syndie @@ -695,6 +727,8 @@ /obj/item/mining_voucher=1,\ /obj/item/stack/marker_beacon/ten=1) + job_icon = "shaftminer" + /datum/outfit/job/syndicate/miner/gorlex name = "Wrecker (Gorlex Marauders)" @@ -703,18 +737,19 @@ ears = /obj/item/radio/headset/alt /datum/outfit/job/syndicate/miner/twink - name = "Miner (Twinkleshine)" + name = "Miner (Twinkleshine, SUNS)" - uniform = /obj/item/clothing/under/syndicate/gorlex - shoes = /obj/item/clothing/shoes/workboots - glasses = /obj/item/clothing/glasses/meson/night - gloves = /obj/item/clothing/gloves/explorer - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/mining/alt + uniform = /obj/item/clothing/under/syndicate/coldres + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + id = /obj/item/card/id/syndicate_command/crew_id + shoes = null + glasses = null + gloves = null + ears = null + r_pocket = null + l_pocket = null + belt = null implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id/engi backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -772,6 +807,8 @@ pda_slot = ITEM_SLOT_LPOCKET backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) + job_icon = "stationengineer" + /datum/outfit/job/syndicate/engineer/gec name = "Ship Engineer (GEC)" @@ -789,23 +826,23 @@ glasses = null /datum/outfit/job/syndicate/engineer/twink - name = "Ship Engineer (Twinkleshine)" + name = "Ship Engineer (Twinkleshine, GEC)" uniform = /obj/item/clothing/under/syndicate/gec + id = /obj/item/card/id/syndicate_command/crew_id/engi + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + ears = null accessory = null - glasses = /obj/item/clothing/glasses/meson/night - head = /obj/item/clothing/head/hardhat/orange - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon - back = /obj/item/storage/backpack/industrial - belt = /obj/item/storage/belt/utility/syndicate - shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/hazardvest - alt_suit = /obj/item/clothing/suit/toggle/hazard + glasses = null + head = null + gloves = null + belt = null + shoes = null + suit = null + alt_suit = null + l_pocket = null + r_pocket = null implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id/engi - backpack_contents = list(/obj/item/construction/rcd/combat, /obj/item/rcd_ammo/large) box = /obj/item/storage/box/survival/syndie diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 206c0746bc85..e4b96c6a2b49 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -172,7 +172,7 @@ return max(0, minimal_player_age - C.player_age) /datum/job/proc/radio_help_message(mob/M) - to_chat(M, "Prefix your message with :h to speak on your department's radio. To see other prefixes, look closely at your headset.") + to_chat(M, "Your ship most likely does not have telecomms. Prefix your message with :L or :R, depending on the hand you're holding the radio with, to speak with a handheld radio. Otherwise, you can speak with your headset by prefixing your message with :h.") /datum/outfit/job name = "Standard Gear" diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm index 551e60501940..039141bb5fd5 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -16,6 +16,14 @@ return idcard.registered_name else return real_name + if(istype(wear_mask, /obj/item/clothing/mask/gas/syndicate/voicechanger)) + var/obj/item/clothing/mask/gas/syndicate/voicechanger/V = wear_mask + if(V.voice_change && wear_id) + var/obj/item/card/id/idcard = wear_id.GetID() + if(istype(idcard)) + return idcard.registered_name + else + return real_name else return real_name if(istype(wear_mask, /obj/item/clothing/mask/infiltrator)) From 29434c5ee794247c123174e71c86a92cacaadbf8 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:41:17 -0300 Subject: [PATCH 02/21] sidings... --- .../syndicate/syndicate_twinkleshine.dmm | 380 ++++++++++-------- 1 file changed, 214 insertions(+), 166 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index dfa69f6ee37f..eb2f33e47413 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -403,21 +403,14 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "cT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/item/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 8 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/turf/open/floor/plating, -/area/ship/hallway/aft) +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "cW" = ( /obj/machinery/light/directional/north, /obj/item/kitchen/rollingpin, @@ -545,8 +538,9 @@ /turf/open/floor/carpet/red, /area/ship/crew/canteen) "dE" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "dH" = ( @@ -561,6 +555,9 @@ /obj/item/clothing/under/rank/prisoner/skirt, /obj/item/clothing/under/rank/prisoner, /obj/item/clothing/under/rank/prisoner, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "dL" = ( @@ -632,6 +629,10 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/aft) +"ec" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/starboard) "eg" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -675,6 +676,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "er" = ( @@ -736,6 +740,11 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"eN" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/dark, +/area/ship/security) "eQ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -802,14 +811,28 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "fJ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/port) +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." + }, +/obj/item/radio/headset/syndicate/alt, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/machinery/light/directional/east, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, +/turf/open/floor/mineral/plastitanium, +/area/ship/security) "fK" = ( /obj/machinery/light/directional/south, /turf/open/floor/mineral/plastitanium/red, @@ -1466,17 +1489,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"iY" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 1 - }, -/obj/structure/fluff/broken_flooring{ - icon_state = "plating"; - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) "iZ" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 @@ -1540,6 +1552,15 @@ }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) +"jo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/door/window, +/turf/open/floor/wood{ + color = "#422C14" + }, +/area/ship/crew/canteen) "jr" = ( /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ dir = 8 @@ -1698,22 +1719,11 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "kf" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/turf/open/floor/plating, -/area/ship/hallway/starboard) +/turf/open/floor/plasteel/dark, +/area/ship/security) "kl" = ( /obj/structure/closet/secure_closet{ anchored = 1; @@ -2109,6 +2119,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "mS" = ( @@ -2269,6 +2282,14 @@ /obj/machinery/door/airlock/grunge, /turf/open/floor/mineral/plastitanium, /area/ship/security) +"nw" = ( +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 1 + }, +/obj/item/rack_parts, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) "nE" = ( /obj/effect/turf_decal/corner/opaque/syndiered, /turf/open/floor/plasteel/tech, @@ -2687,8 +2708,7 @@ /obj/item/radio/headset/syndicate/alt, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, -/obj/machinery/light/directional/east, -/obj/item/clothing/head/beret/black, +/obj/machinery/light/directional/west, /obj/item/flashlight/seclite, /obj/item/kitchen/knife/combat, /turf/open/floor/mineral/plastitanium, @@ -2708,28 +2728,21 @@ /turf/open/floor/plating, /area/ship/hallway/port) "pR" = ( -/obj/structure/closet/secure_closet/security{ - populate = 0; - icon_state = "syndicate"; - name = "operative's locker" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/clothing/suit/armor/vest/syndie, -/obj/item/clothing/head/helmet/operator, -/obj/item/gun/ballistic/automatic/pistol/no_mag, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/storage/belt/security/webbing{ - name = "syndicate webbing"; - desc = "Unique and versatile chest rig, can hold syndicate gear." +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -8 }, -/obj/item/radio/headset/syndicate/alt, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/gloves/color/black, -/obj/machinery/light/directional/west, -/obj/item/flashlight/seclite, -/obj/item/kitchen/knife/combat, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) "pU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -4403,6 +4416,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "Ax" = ( @@ -4489,6 +4505,30 @@ rad_insulation = 0 }, /area/ship/security) +"Bn" = ( +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" + }, +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." + }, +/obj/item/radio/headset/syndicate/alt, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/machinery/light/directional/east, +/obj/item/clothing/head/beret/black, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, +/turf/open/floor/mineral/plastitanium, +/area/ship/security) "Bq" = ( /obj/structure/rack, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate{ @@ -4578,6 +4618,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "BM" = ( @@ -4676,6 +4719,23 @@ }, /turf/open/floor/circuit/red, /area/ship/engineering/communications) +"Cq" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "Cw" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -4879,6 +4939,9 @@ pixel_y = 22; pixel_x = -12 }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "Dt" = ( @@ -5106,7 +5169,10 @@ /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 1 }, -/obj/item/rack_parts, +/obj/structure/fluff/broken_flooring{ + icon_state = "plating"; + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Fh" = ( @@ -5265,6 +5331,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "FE" = ( @@ -5448,6 +5517,9 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "GD" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "GE" = ( @@ -5645,14 +5717,11 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "HG" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/door/window, -/turf/open/floor/wood{ - color = "#422C14" +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 }, -/area/ship/crew/canteen) +/turf/open/floor/plasteel/dark, +/area/ship/security) "HH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -5688,26 +5757,16 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "HY" = ( -/obj/structure/closet/secure_closet/security{ - populate = 0; - icon_state = "syndicate"; - name = "operative's locker" +/obj/structure/table/reinforced, +/obj/machinery/computer/secure_data/laptop{ + dir = 8; + pixel_y = 6; + pixel_x = 1 }, -/obj/item/clothing/suit/armor/vest/syndie, -/obj/item/clothing/head/helmet/operator, -/obj/item/gun/ballistic/automatic/pistol/no_mag, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/storage/belt/security/webbing{ - name = "syndicate webbing"; - desc = "Unique and versatile chest rig, can hold syndicate gear." +/obj/machinery/door/window/brigdoor/eastright, +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(3,150) }, -/obj/item/radio/headset/syndicate/alt, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/gloves/color/black, -/obj/machinery/light/directional/east, -/obj/item/flashlight/seclite, -/obj/item/kitchen/knife/combat, /turf/open/floor/mineral/plastitanium, /area/ship/security) "Ib" = ( @@ -5902,10 +5961,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) -"IO" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/starboard) "IT" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -6217,6 +6272,9 @@ /area/ship/hallway/port) "KB" = ( /obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "KD" = ( @@ -6568,21 +6626,21 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Nh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/item/kirbyplants{ icon_state = "plant-21"; - pixel_x = -8 + pixel_x = 8 }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "2-8" }, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Nj" = ( /obj/effect/turf_decal/spline/fancy/opaque/black/corner{ dir = 1 @@ -7105,6 +7163,20 @@ /obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel/tech, /area/ship/crew/canteen) +"QC" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "QD" = ( /obj/machinery/door/window/eastright{ name = "Engine Access" @@ -7133,34 +7205,6 @@ /obj/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, /area/ship/bridge) -"QN" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/aft) -"QO" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/secure_data/laptop{ - dir = 8; - pixel_y = 6; - pixel_x = 1 - }, -/obj/machinery/door/window/brigdoor/eastright, -/obj/machinery/door/window/brigdoor/westleft{ - req_access = list(3,150) - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) "QR" = ( /obj/structure/bed, /obj/machinery/light/directional/east, @@ -7461,6 +7505,21 @@ /obj/machinery/door/airlock/grunge, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) +"Sk" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) "Sp" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/corner/opaque/orange/full, @@ -7683,6 +7742,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "TC" = ( @@ -8258,20 +8320,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) -"WY" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = 23 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/starboard) "WZ" = ( /obj/effect/turf_decal/syndicateemblem/bottom/middle, /obj/effect/turf_decal/syndicateemblem/middle/left{ @@ -9400,7 +9448,7 @@ lw iG Ii Ii -HG +jo pj qA Fa @@ -9482,7 +9530,7 @@ ma VH yF sd -QN +Sk xa Ru Ei @@ -9492,7 +9540,7 @@ xa xP oX PN -IO +ec PL YO ji @@ -9519,7 +9567,7 @@ ml Yl DW gW -cT +Nh ag Ax kd @@ -9612,7 +9660,7 @@ PL BL EG da -pR +pN Bj mp "} @@ -9639,8 +9687,8 @@ ID TI Fj sO -WY -kf +QC +Cq Bj IC aD @@ -9723,7 +9771,7 @@ Bj Tt EG da -HY +fJ Bj mp "} @@ -9754,7 +9802,7 @@ wh Pe Bj pL -QO +HY Bj Bj Dp @@ -9776,7 +9824,7 @@ bv Fi JM YT -fJ +cT sp pm qT @@ -9797,7 +9845,7 @@ Pa At EG da -pR +pN Bj mp "} @@ -9831,7 +9879,7 @@ Bj Bj Ey Ey -GD +kf EG ET fK @@ -9852,7 +9900,7 @@ pD Yz hr BK -Nh +pR Xs Id UA @@ -9867,8 +9915,8 @@ lg tn Bj KB -GD -GD +dE +HG EG ET ET @@ -9906,9 +9954,9 @@ Bj dH GD Nj -dE +eN da -pN +Bn Bj mp "} @@ -10404,7 +10452,7 @@ mp nb Uf Jr -iY +Fc nb VB nb @@ -10441,7 +10489,7 @@ mp nb iK jG -Fc +nw nb mp QE From 77465038ced7cf4496e9dca2f1203fbf11472bba Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:53:59 -0300 Subject: [PATCH 03/21] come again? --- _maps/shuttles/syndicate/syndicate_twinkleshine.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index eb2f33e47413..5a6cd5b8a5de 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -4701,7 +4701,7 @@ pixel_x = 6; pixel_y = 5; name = "README - notice to the captain"; - default_raw_text = "

Dear Commodore,

Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers.

This vessel is staffed with workers from every branch of the Syndicate. Please take the time to familiarize yourself with the ship's features and crew, and make sure to maintain positive relationships with your crew.



check under your bed"; + default_raw_text = "

Dear Commodore,

Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers.

This vessel is staffed with workers from every branch of the Syndicate. Please take the time to familiarize yourself with the ship's features and crew, and make sure to maintain positive relationships with your crew.



check under your bed"; desc = "This sheet of paper looks old and dusty."; color = "#3f010d" }, From 798594c1ad18d9bee92b769652fb24571196d197 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Tue, 28 Nov 2023 16:14:23 -0300 Subject: [PATCH 04/21] fukcing sanitization... --- _maps/shuttles/syndicate/syndicate_twinkleshine.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 5a6cd5b8a5de..a7fe085c3e05 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -4701,7 +4701,7 @@ pixel_x = 6; pixel_y = 5; name = "README - notice to the captain"; - default_raw_text = "

Dear Commodore,

Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers.

This vessel is staffed with workers from every branch of the Syndicate. Please take the time to familiarize yourself with the ship's features and crew, and make sure to maintain positive relationships with your crew.



check under your bed"; + default_raw_text = "

Dear Commodore,

Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers.

This vessel is staffed with workers from every branch of the Syndicate. Please take the time to familiarize yourself with the ship's features and crew, and make sure to maintain positive relationships with your crew.



check under your bed"; desc = "This sheet of paper looks old and dusty."; color = "#3f010d" }, From e3e64ab9b5e5fc855f930988a88d8623e613d167 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Wed, 29 Nov 2023 08:51:03 -0300 Subject: [PATCH 05/21] hammers --- code/modules/clothing/outfits/syndicate.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm index 62312dcb2712..dc985063ad7a 100644 --- a/code/modules/clothing/outfits/syndicate.dm +++ b/code/modules/clothing/outfits/syndicate.dm @@ -455,17 +455,18 @@ name = "Lieutenant (Twinkleshine, 2nd Battlegroup)" uniform = /obj/item/clothing/under/syndicate/aclf + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + id = /obj/item/card/id/syndicate_command/lieutenant head = null ears = null - mask = /obj/item/clothing/mask/gas/syndicate/voicechanger gloves = null l_pocket = null r_pocket = null belt = null shoes = null suit = null + suit_store = null alt_suit = null - id = /obj/item/card/id/syndicate_command/lieutenant implants = list(/obj/item/implant/weapons_auth) backpack_contents = null From 7bc1ffe167fee8f6ae3f118e25a1f060aa9b3ba7 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 2 Dec 2023 16:09:30 -0300 Subject: [PATCH 06/21] misc --- .../syndicate/syndicate_twinkleshine.dmm | 181 ++++++++++++++---- code/modules/clothing/outfits/syndicate.dm | 4 + 2 files changed, 145 insertions(+), 40 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index a7fe085c3e05..3078afe8d32e 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -269,6 +269,7 @@ /area/ship/engineering/atmospherics) "cd" = ( /obj/machinery/light/directional/east, +/obj/effect/turf_decal/steeldecal/steel_decals3, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "ch" = ( @@ -318,6 +319,7 @@ "ck" = ( /obj/machinery/chem_heater, /obj/effect/turf_decal/corner/opaque/orange/full, +/obj/effect/turf_decal/steeldecal/steel_decals_central1, /turf/open/floor/plasteel/dark, /area/ship/medical) "cp" = ( @@ -371,6 +373,10 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) +"cI" = ( +/obj/effect/turf_decal/steeldecal/steel_decals10, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "cJ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -1449,6 +1455,14 @@ pixel_x = 16; pixel_y = 2 }, +/obj/item/stack/ore/salvage/scrapmetal{ + pixel_x = -1; + pixel_y = -13 + }, +/obj/item/stack/ore/salvage/scrapbluespace{ + pixel_x = -5; + pixel_y = 7 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "iL" = ( @@ -1931,6 +1945,7 @@ /obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 1 }, +/obj/effect/turf_decal/steeldecal/steel_decals_central7, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "lv" = ( @@ -2287,7 +2302,10 @@ /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 1 }, -/obj/item/rack_parts, +/obj/item/rack_parts{ + pixel_x = -6; + pixel_y = 11 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "nE" = ( @@ -2458,7 +2476,10 @@ /obj/machinery/camera/autoname{ dir = 10 }, -/obj/structure/table_frame, +/obj/structure/table_frame{ + pixel_y = 2; + pixel_x = -3 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "oP" = ( @@ -2529,6 +2550,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, +/obj/effect/turf_decal/steeldecal/steel_decals_central7, /turf/open/floor/wood{ color = "#422C14" }, @@ -3419,6 +3441,15 @@ }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) +"uH" = ( +/obj/structure/sign/directions/engineering{ + pixel_y = 5; + dir = 8 + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 + }, +/area/ship/crew/dorm/dormtwo) "uK" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 @@ -3567,6 +3598,10 @@ name = "lieutenant moth plushie"; desc = "A plushie depicting an adorable mothperson, featuring realistic mothperson agony sounds every time you hug it. They seem to be hiding something." }, +/obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "vO" = ( @@ -3668,6 +3703,10 @@ }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) +"wx" = ( +/obj/effect/turf_decal/steeldecal/steel_decals4, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "wz" = ( /obj/structure/chair/stool/bar{ dir = 1 @@ -4651,6 +4690,18 @@ }, /turf/open/floor/engine/plasma, /area/ship/engineering/atmospherics) +"BT" = ( +/obj/structure/sign/directions/security{ + pixel_y = -4 + }, +/obj/structure/sign/directions/engineering{ + pixel_y = 5; + dir = 8 + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 + }, +/area/ship/crew/office) "BU" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 @@ -4778,6 +4829,7 @@ /area/ship/engineering/engine) "CJ" = ( /obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/steeldecal/steel_decals_central4, /turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/dorm) "CQ" = ( @@ -4824,11 +4876,12 @@ /area/ship/medical) "CU" = ( /obj/machinery/light/directional/south, -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 1 +/obj/item/chair{ + pixel_x = -12; + pixel_y = -4 }, -/turf/open/floor/plasteel/tech/grid, +/obj/effect/turf_decal/techfloor, +/turf/open/floor/plating, /area/ship/bridge) "CV" = ( /obj/effect/turf_decal/industrial/warning{ @@ -4960,6 +5013,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) +"DB" = ( +/obj/effect/turf_decal/steeldecal/steel_decals8, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "DF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -5057,6 +5114,12 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) +"Eq" = ( +/obj/structure/sign/directions/security, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 + }, +/area/ship/crew/office) "Et" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -5151,6 +5214,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 }, +/obj/effect/turf_decal/steeldecal/steel_decals_central6{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Fa" = ( @@ -5173,6 +5239,10 @@ icon_state = "plating"; dir = 4 }, +/obj/item/stack/ore/salvage/scrapplasma{ + pixel_x = 3; + pixel_y = 2 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Fh" = ( @@ -5216,6 +5286,13 @@ dir = 1 }, /obj/structure/rack, +/obj/item/storage/bag/trash{ + pixel_x = -6 + }, +/obj/item/storage/bag/trash{ + pixel_y = 3; + pixel_x = 6 + }, /obj/item/soap/syndie{ pixel_y = -3; pixel_x = -2 @@ -5224,10 +5301,6 @@ pixel_y = -6; pixel_x = 2 }, -/obj/item/storage/bag/trash{ - pixel_x = -6 - }, -/obj/item/storage/bag/trash, /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "Fl" = ( @@ -5383,6 +5456,7 @@ /obj/machinery/chem_dispenser, /obj/machinery/light/directional/south, /obj/effect/turf_decal/corner/opaque/orange/full, +/obj/effect/turf_decal/steeldecal/steel_decals_central1, /turf/open/floor/plasteel/dark, /area/ship/medical) "Gg" = ( @@ -6200,6 +6274,7 @@ "Ks" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/corner/opaque/orange/full, +/obj/effect/turf_decal/steeldecal/steel_decals_central1, /turf/open/floor/plasteel/dark, /area/ship/medical) "Ku" = ( @@ -6540,11 +6615,6 @@ pixel_x = -7; pixel_y = -15 }, -/obj/item/chair{ - pixel_x = 10; - pixel_y = 8; - dir = 8 - }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "MA" = ( @@ -6990,6 +7060,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "PE" = ( @@ -7391,10 +7462,6 @@ pixel_y = 7; pixel_x = -4 }, -/obj/item/storage/firstaid/tactical{ - pixel_y = 4; - pixel_x = 8 - }, /turf/open/floor/plasteel/dark, /area/ship/medical) "RU" = ( @@ -7458,10 +7525,6 @@ pixel_y = 6; pixel_x = -3 }, -/obj/machinery/door/window/brigdoor/northleft, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/item/ammo_casing/caseless/rocket/hedp{ pixel_x = -11; pixel_y = -5 @@ -7474,10 +7537,16 @@ pixel_x = -1; pixel_y = -6 }, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(3,150) + }, /obj/item/storage/backpack/duffelbag/syndie/c4{ pixel_x = -1; pixel_y = -10 }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Si" = ( @@ -7492,12 +7561,20 @@ }, /obj/structure/rack, /obj/item/clothing/suit/armor/riot{ - pixel_x = 5; - pixel_y = -3 + pixel_x = -4; + pixel_y = -5 }, /obj/item/clothing/head/helmet/riot{ - pixel_y = 5; - pixel_x = -4 + pixel_y = 11; + pixel_x = -6 + }, +/obj/item/clothing/glasses/hud/security/night{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/clothing/glasses/hud/security/night{ + pixel_x = 6; + pixel_y = 5 }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) @@ -7836,15 +7913,11 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "Uf" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/half, /obj/item/wallframe/extinguisher_cabinet{ pixel_y = 17; pixel_x = -2 }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plating, /area/ship/bridge) "Ug" = ( /obj/machinery/power/emitter/welded, @@ -7892,6 +7965,10 @@ icon_state = "syndicate"; name = "ammo locker" }, +/obj/item/ammo_box/magazine/ebr, +/obj/item/ammo_box/magazine/ebr, +/obj/item/ammo_box/magazine/ebr, +/obj/item/ammo_box/magazine/ebr, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Uu" = ( @@ -8331,6 +8408,9 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Xb" = ( +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xc" = ( @@ -8561,6 +8641,12 @@ /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) +"Yv" = ( +/obj/effect/turf_decal/steeldecal/steel_decals_central2{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "Yz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -8726,6 +8812,21 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) +"Zu" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/turf_decal/steeldecal/steel_decals_central6{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/crew/cryo) "Zw" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 10 @@ -9603,7 +9704,7 @@ dU Qv UF mG -vz +uH vz vz uE @@ -9779,7 +9880,7 @@ mp mp Wd Sb -gz +Zu gz yO DF @@ -9862,7 +9963,7 @@ JM JM pO qY -sp +BT sp Ee sp @@ -9871,7 +9972,7 @@ CR sp sp Ee -sp +Eq qp Pe Bj @@ -10025,11 +10126,11 @@ JY gI fm Bj +wx ET +DB ET -ET -ET -ET +Yv qL Bj mp @@ -10312,7 +10413,7 @@ nb ox Xb vL -Xb +cI bL nb nb diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm index dc985063ad7a..e940c377423c 100644 --- a/code/modules/clothing/outfits/syndicate.dm +++ b/code/modules/clothing/outfits/syndicate.dm @@ -80,6 +80,7 @@ uniform = /obj/item/clothing/under/syndicate mask = /obj/item/clothing/mask/gas/syndicate/voicechanger id = /obj/item/card/id/syndicate_command/crew_id + belt = null shoes = null gloves = null ears = null @@ -249,6 +250,8 @@ belt = null implants = list(/obj/item/implant/weapons_auth) + backpack_contents = null + /datum/outfit/job/syndicate/captain/twink/post_equip(mob/living/carbon/human/H) . = ..() @@ -694,6 +697,7 @@ gloves = null shoes = null l_pocket = null + r_pocket = null implants = list(/obj/item/implant/weapons_auth) backpack_contents = null From ff6db5d64feeba7c07c9e6f0034d1d2faad05eee Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Fri, 8 Dec 2023 01:45:56 -0300 Subject: [PATCH 07/21] aweawaewasdasdsd --- _maps/shuttles/syndicate/syndicate_twinkleshine.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index d1c3707b7425..779f15856c24 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -2288,9 +2288,6 @@ "nt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, From a434dd9fbd06ca1c8958cee91b318ec3fa283b2f Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Fri, 8 Dec 2023 15:30:45 -0300 Subject: [PATCH 08/21] hehe --- code/modules/clothing/outfits/syndicate.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm index 7764f9463217..999d6c5d6423 100644 --- a/code/modules/clothing/outfits/syndicate.dm +++ b/code/modules/clothing/outfits/syndicate.dm @@ -248,7 +248,6 @@ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger suit = null belt = null - implants = list(/obj/item/implant/weapons_auth) backpack_contents = null From be3b93a00b65a7576dffd0876241aac3afc6e51e Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 9 Dec 2023 00:38:07 -0300 Subject: [PATCH 09/21] Update syndicate_twinkleshine.dmm --- .../syndicate/syndicate_twinkleshine.dmm | 276 ++++++++---------- 1 file changed, 118 insertions(+), 158 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 779f15856c24..059e75f42c6f 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -531,7 +531,10 @@ /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 6 }, -/obj/structure/filingcabinet/double, +/obj/machinery/suit_storage_unit/syndicate{ + suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/sbg; + name = "lieutenant's suit storage unit" + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "dz" = ( @@ -564,6 +567,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/security) "dL" = ( @@ -583,7 +587,6 @@ /obj/structure/sign/poster/contraband/tools{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/modular_computer/console/preset/engineering, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) @@ -620,10 +623,6 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "ea" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, @@ -633,6 +632,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/aft) "ec" = ( @@ -831,7 +831,7 @@ name = "syndicate webbing"; desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/alt, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, /obj/machinery/light/directional/east, @@ -1063,21 +1063,9 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "gW" = ( -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/aft) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "gX" = ( /obj/machinery/door/airlock/hatch{ name = "Custodial Closet"; @@ -1092,6 +1080,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/janitor) "gZ" = ( @@ -1214,6 +1208,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "hS" = ( @@ -1331,18 +1331,19 @@ icon_state = "tac"; populate = 0 }, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/webbing, -/obj/item/clothing/under/syndicate/medic, -/obj/item/clothing/under/syndicate/medic/skirt, /obj/item/clothing/under/rank/medical/doctor/red, /obj/item/clothing/suit/longcoat/roboblack{ name = "syndicate medic's black longcoat" }, +/obj/item/clothing/under/syndicate/medic/skirt, +/obj/item/clothing/under/syndicate/medic, /obj/item/clothing/head/helmet/medical, /obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical/webbing, +/obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/clothing/shoes/sneakers/white, +/obj/item/radio/headset, /turf/open/floor/plasteel/dark, /area/ship/medical) "im" = ( @@ -1427,7 +1428,6 @@ }, /area/ship/crew/canteen) "iI" = ( -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "iJ" = ( @@ -1739,27 +1739,28 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "kl" = ( +/obj/machinery/light/directional/north, /obj/structure/closet/secure_closet{ anchored = 1; icon_state = "hos"; name = "Captain's Locker"; req_access = list(150, 20) }, -/obj/item/areaeditor/shuttle, -/obj/item/clothing/under/syndicate/officer, -/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, -/obj/item/clothing/head/HoS/syndicate, -/obj/item/shield/riot/tele, -/obj/item/storage/lockbox/medal, -/obj/machinery/light/directional/north, /obj/item/card/id/syndicate_command/captain_id, +/obj/item/storage/lockbox/medal, /obj/item/codespeak_manual{ charges = 2 }, +/obj/item/megaphone/sec{ + name = "syndicate megaphone" + }, +/obj/item/book/granter/martial/cqc, /obj/item/radio/headset/syndicate/captain, -/obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/combat, -/obj/item/book/granter/martial/cqc, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, +/obj/item/clothing/under/syndicate/officer, +/obj/item/clothing/head/HoS/syndicate, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "ky" = ( @@ -1797,7 +1798,7 @@ name = "syndicate webbing"; desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/alt, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, /obj/structure/closet/secure_closet/security{ @@ -2497,14 +2498,11 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "oX" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/effect/turf_decal/industrial/warning, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/aft) "pc" = ( @@ -2517,7 +2515,6 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ph" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, /obj/item/modular_computer/tablet/preset/advanced{ pixel_x = 8 @@ -2668,15 +2665,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/port) "pF" = ( @@ -2724,7 +2716,7 @@ name = "syndicate webbing"; desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/alt, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, /obj/machinery/light/directional/west, @@ -2939,7 +2931,6 @@ dir = 1 }, /obj/machinery/firealarm/directional/north, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ pixel_y = 22; pixel_x = -12 @@ -3064,16 +3055,10 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "sd" = ( -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/aft) +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/security) "sf" = ( /turf/open/floor/carpet/red, /area/ship/crew/canteen) @@ -3159,17 +3144,6 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/corner, /turf/open/floor/plasteel/dark, /area/ship/medical) -"sz" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) "sC" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/computer/atmos_control/tank/toxin_tank{ @@ -3436,6 +3410,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "uH" = ( @@ -4108,9 +4088,6 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/sign/warning/radiation{ - pixel_x = -32 - }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/port) "yI" = ( @@ -4156,6 +4133,10 @@ /obj/effect/turf_decal/industrial/warning/corner{ dir = 1 }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) "yP" = ( @@ -4556,7 +4537,7 @@ name = "syndicate webbing"; desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/alt, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, /obj/machinery/light/directional/east, @@ -4626,21 +4607,10 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "BK" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/structure/bed, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "BL" = ( /obj/structure/sign/poster/contraband/c20r{ pixel_y = 32 @@ -4657,6 +4627,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/security) "BM" = ( @@ -4920,19 +4891,20 @@ icon_state = "tac"; populate = 0 }, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/webbing, -/obj/item/clothing/under/syndicate/medic, -/obj/item/clothing/under/syndicate/medic/skirt, +/obj/machinery/light/directional/north, /obj/item/clothing/under/rank/medical/doctor/red, /obj/item/clothing/suit/longcoat/roboblack{ name = "syndicate medic's black longcoat" }, -/obj/machinery/light/directional/north, +/obj/item/clothing/under/syndicate/medic/skirt, +/obj/item/clothing/under/syndicate/medic, /obj/item/clothing/head/helmet/medical, /obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical/webbing, +/obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/clothing/shoes/sneakers/white, +/obj/item/radio/headset, /turf/open/floor/plasteel/dark, /area/ship/medical) "Dk" = ( @@ -5012,6 +4984,7 @@ /area/ship/crew/office) "DB" = ( /obj/effect/turf_decal/steeldecal/steel_decals8, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "DF" = ( @@ -5356,6 +5329,10 @@ pixel_x = -4; pixel_y = 2 }, +/obj/item/storage/toolbox/ammo/shotgun{ + pixel_x = 4; + pixel_y = -2 + }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Fs" = ( @@ -5371,15 +5348,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/starboard) "Ft" = ( @@ -5562,7 +5534,7 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Gx" = ( -/obj/item/trash/sosjerky, +/obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Gy" = ( @@ -5591,6 +5563,7 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 4 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/security) "GE" = ( @@ -5629,15 +5602,10 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/structure/sign/poster/contraband/space_up{ pixel_y = -32 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/port) "GN" = ( @@ -5765,7 +5733,6 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -5805,7 +5772,6 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "HL" = ( @@ -5940,6 +5906,11 @@ icon_state = "0-8" }, /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 10; + pixel_y = -20 + }, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "IB" = ( @@ -5976,7 +5947,9 @@ /obj/item/clothing/suit/gorlex, /obj/item/clothing/head/gorlexcap, /obj/item/clothing/shoes/combat, -/obj/item/megaphone/sec, +/obj/item/megaphone/sec{ + name = "syndicate megaphone" + }, /obj/item/gun/ballistic/automatic/pistol/no_mag, /obj/item/clothing/head/HoS/beret/syndicate, /obj/item/radio/headset/syndicate/alt/leader, @@ -6026,10 +5999,7 @@ dir = 1 }, /obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "IT" = ( @@ -6128,9 +6098,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/sign/warning/radiation{ - pixel_y = 32 - }, /obj/effect/turf_decal/trimline/opaque/orange/filled/warning, /obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ dir = 1 @@ -6712,6 +6679,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black/corner{ dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/security) "No" = ( @@ -6872,7 +6840,6 @@ /area/ship/engineering/engine) "Oz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) @@ -7058,6 +7025,12 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "PE" = ( @@ -7544,6 +7517,8 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/item/clothing/glasses/hud/security/night, +/obj/item/clothing/glasses/hud/security/night, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Si" = ( @@ -7565,18 +7540,14 @@ pixel_y = 11; pixel_x = -6 }, -/obj/item/clothing/glasses/hud/security/night{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/item/clothing/glasses/hud/security/night{ - pixel_x = 6; - pixel_y = 5 - }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Sj" = ( /obj/machinery/door/airlock/grunge, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "Sk" = ( @@ -7694,7 +7665,7 @@ name = "Secret Box Moth"; real_name = "Box Moth"; gender = "female"; - faction = list("neutral","PlayerSyndicate") + faction = list("neutral","playerSyndicate") }, /obj/item/reagent_containers/food/snacks/spacetwinkie{ pixel_y = 12; @@ -7800,7 +7771,6 @@ /turf/open/floor/plating, /area/ship/hallway/port) "Tq" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, /obj/item/paper_bin/construction, /obj/item/pen, @@ -7995,7 +7965,6 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "UB" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) @@ -8431,15 +8400,10 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/structure/sign/poster/contraband/space_cola{ pixel_y = 32 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/starboard) "Xj" = ( @@ -8870,15 +8834,12 @@ dir = 1 }, /obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "ZQ" = ( @@ -8907,7 +8868,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) @@ -9571,7 +9531,7 @@ Si Sg PL Fu -EG +sd yN nr Bj @@ -9608,7 +9568,7 @@ cD sr Eo Tt -EG +sd ET ET Bj @@ -9627,7 +9587,7 @@ qP ma VH yF -sd +oX Sk xa Ru @@ -9645,7 +9605,7 @@ ji wg gk mO -EG +sd ET fK Bj @@ -9664,7 +9624,7 @@ qP ml Yl DW -gW +ea Nh ag Ax @@ -9682,7 +9642,7 @@ jx TC on ep -EG +sd da kH Bj @@ -9719,7 +9679,7 @@ Fr Up PL Tt -EG +sd Bj Bj Bj @@ -9867,7 +9827,7 @@ ow dq Bj Tt -EG +sd da fJ Bj @@ -9904,7 +9864,7 @@ HY Bj Bj Dp -EG +sd Bj Bj Bj @@ -9941,7 +9901,7 @@ Gk HH Pa At -EG +sd da pN Bj @@ -9978,7 +9938,7 @@ Bj Ey Ey kf -EG +sd ET fK Bj @@ -9997,7 +9957,7 @@ Bw pD Yz hr -BK +ZO pR Xs Id @@ -10043,7 +10003,7 @@ yX KM kM XE -sz +IN SM ak Pe @@ -10126,7 +10086,7 @@ Bj wx ET DB -ET +gW Yv qL Bj @@ -10161,7 +10121,7 @@ ak Pe Bj QR -OY +BK OY cd Bj From ed9646d825362c48ee47adf678ecd82ef25756fc Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 30 Dec 2023 16:31:20 -0300 Subject: [PATCH 10/21] balls --- .../syndicate/syndicate_twinkleshine.dmm | 353 ++++++++++++------ code/modules/clothing/outfits/syndicate.dm | 2 +- 2 files changed, 248 insertions(+), 107 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 059e75f42c6f..7cdb127f2707 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -46,6 +46,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 4 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 10 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "al" = ( @@ -242,6 +245,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, /obj/machinery/light/directional/south, /obj/machinery/vending/snack/random, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "bU" = ( @@ -415,6 +421,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "cW" = ( @@ -637,7 +646,7 @@ /area/ship/hallway/aft) "ec" = ( /obj/structure/closet/crate/bin, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "eg" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, @@ -831,7 +840,9 @@ name = "syndicate webbing"; desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/item/radio/headset/alt, +/obj/item/radio/headset/syndicate/alt{ + keyslot = null + }, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, /obj/machinery/light/directional/east, @@ -1343,7 +1354,9 @@ /obj/item/storage/belt/medical/webbing, /obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/clothing/shoes/sneakers/white, -/obj/item/radio/headset, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "im" = ( @@ -1363,6 +1376,9 @@ desc = "A poster that details the dangerously unsafe power generation methods of most ships."; pixel_x = -32 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "ir" = ( @@ -1564,6 +1580,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "jo" = ( @@ -1751,16 +1770,19 @@ /obj/item/codespeak_manual{ charges = 2 }, +/obj/item/gun/ballistic/revolver, /obj/item/megaphone/sec{ name = "syndicate megaphone" }, -/obj/item/book/granter/martial/cqc, /obj/item/radio/headset/syndicate/captain, /obj/item/clothing/gloves/combat, /obj/item/clothing/shoes/combat, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/clothing/under/syndicate/officer, /obj/item/clothing/head/HoS/syndicate, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "ky" = ( @@ -1798,7 +1820,9 @@ name = "syndicate webbing"; desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/item/radio/headset/alt, +/obj/item/radio/headset/syndicate/alt{ + keyslot = null + }, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, /obj/structure/closet/secure_closet/security{ @@ -1827,6 +1851,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "kR" = ( @@ -2015,12 +2042,13 @@ /area/ship/hallway/starboard) "lT" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 + dir = 10 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/light/directional/north, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, -/area/ship/hallway/starboard) +/area/ship/hallway/port) "lY" = ( /obj/machinery/holopad/emergency/bar, /turf/open/floor/carpet/red, @@ -2308,6 +2336,9 @@ /area/ship/bridge) "nE" = ( /obj/effect/turf_decal/corner/opaque/syndiered, +/obj/effect/turf_decal/borderfloorblack{ + dir = 9 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "nS" = ( @@ -2347,6 +2378,9 @@ dir = 1; pixel_y = -28 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "oj" = ( @@ -2354,6 +2388,9 @@ dir = 10 }, /obj/machinery/vending/cigarette/syndicate, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "on" = ( @@ -2650,6 +2687,7 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "pE" = ( @@ -2716,7 +2754,9 @@ name = "syndicate webbing"; desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/item/radio/headset/alt, +/obj/item/radio/headset/syndicate/alt{ + keyslot = null + }, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, /obj/machinery/light/directional/west, @@ -2798,6 +2838,7 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "qr" = ( @@ -2960,6 +3001,9 @@ pixel_x = -13; pixel_y = -20 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "ra" = ( @@ -3227,7 +3271,6 @@ /area/ship/engineering/atmospherics) "tg" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay"; req_one_access_txt = "150"; req_access = list(150); dir = 4 @@ -3305,6 +3348,9 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "tS" = ( @@ -3397,7 +3443,7 @@ /area/ship/bridge) "uE" = ( /obj/machinery/door/airlock/hatch{ - name = "Captain's Quarters"; + name = "Captain Quarters"; req_access = list(150, 20); dir = 4 }, @@ -3447,7 +3493,6 @@ /area/ship/engineering/communications) "uX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay"; req_one_access_txt = "150"; req_access = list(150); dir = 4 @@ -3641,6 +3686,7 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "wi" = ( @@ -3678,6 +3724,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "wx" = ( @@ -3832,6 +3881,9 @@ dir = 9 }, /obj/machinery/light/directional/west, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "xc" = ( @@ -3955,6 +4007,7 @@ /obj/machinery/newscaster/directional/north{ pixel_y = 32 }, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "xB" = ( @@ -3973,6 +4026,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "xW" = ( @@ -4164,6 +4220,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "zc" = ( @@ -4309,6 +4368,7 @@ dir = 5 }, /obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "zQ" = ( @@ -4408,6 +4468,11 @@ /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 4 }, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Ap" = ( @@ -4454,6 +4519,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "Ay" = ( @@ -4474,6 +4542,7 @@ dir = 5 }, /obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "AL" = ( @@ -4537,7 +4606,9 @@ name = "syndicate webbing"; desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/item/radio/headset/alt, +/obj/item/radio/headset/syndicate/alt{ + keyslot = null + }, /obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/color/black, /obj/machinery/light/directional/east, @@ -4548,14 +4619,22 @@ /area/ship/security) "Bq" = ( /obj/structure/rack, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/obj/item/ammo_box/magazine/sniper_rounds{ + pixel_x = 9; + pixel_y = 4 + }, +/obj/item/ammo_box/magazine/sniper_rounds{ + pixel_x = 6; + pixel_y = 1 + }, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate{ spawnwithmagazine = 0; pixel_x = -3; pixel_y = 6 }, -/obj/machinery/camera/autoname{ - dir = 6 - }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Bs" = ( @@ -4604,6 +4683,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "BK" = ( @@ -4650,6 +4730,9 @@ dir = 4; pixel_x = -28 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "BS" = ( @@ -4900,11 +4983,14 @@ /obj/item/clothing/under/syndicate/medic, /obj/item/clothing/head/helmet/medical, /obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical/webbing, /obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/clothing/shoes/sneakers/white, -/obj/item/radio/headset, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "Dk" = ( @@ -5037,6 +5123,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "Ed" = ( @@ -5072,6 +5161,9 @@ dir = 4; pixel_x = -28 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "En" = ( @@ -5318,20 +5410,24 @@ "Fr" = ( /obj/structure/rack, /obj/item/storage/toolbox/ammo/c10mm{ - pixel_x = 7; - pixel_y = 14 + pixel_x = -5; + pixel_y = 10; + name = "ammo can (10mm)" }, /obj/item/storage/toolbox/ammo/a308{ pixel_x = 6; - pixel_y = 6 + pixel_y = 6; + name = "ammo can (.308)" }, /obj/item/storage/toolbox/ammo/c45{ pixel_x = -4; - pixel_y = 2 + pixel_y = 2; + name = "ammo can (.45)" }, /obj/item/storage/toolbox/ammo/shotgun{ pixel_x = 4; - pixel_y = -2 + pixel_y = -2; + name = "ammo can (Buckshot)" }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) @@ -5447,8 +5543,11 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, /area/ship/hallway/port) "Gk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -5475,6 +5574,20 @@ pixel_y = 2; spawnwithmagazine = 0 }, +/obj/item/ammo_box/magazine/ebr{ + pixel_x = 10; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/ebr{ + pixel_x = 4 + }, +/obj/item/ammo_box/magazine/ebr{ + pixel_y = -3; + pixel_x = 7 + }, +/obj/item/ammo_box/magazine/ebr{ + pixel_y = -2 + }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Gn" = ( @@ -5850,6 +5963,9 @@ dir = 8; pixel_x = 20 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Ig" = ( @@ -6180,6 +6296,7 @@ dir = 5 }, /obj/machinery/vending/coffee, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "Ke" = ( @@ -6202,6 +6319,9 @@ }, /obj/machinery/light/directional/north, /obj/machinery/vending/cola/random, +/obj/effect/turf_decal/borderfloorblack/corner{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "Kk" = ( @@ -6394,6 +6514,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "KQ" = ( @@ -7060,7 +7183,11 @@ /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "PN" = ( -/turf/open/floor/plasteel/mono/dark, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "PQ" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -7142,7 +7269,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, @@ -7216,6 +7342,7 @@ pixel_x = 11; pixel_y = 23 }, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "QD" = ( @@ -7340,6 +7467,9 @@ /obj/machinery/camera/autoname{ dir = 5 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "Rv" = ( @@ -7355,6 +7485,20 @@ spawnwithmagazine = 0 }, /obj/machinery/light/directional/north, +/obj/item/ammo_box/magazine/m12g{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_y = -7 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_y = -9; + pixel_x = -10 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_y = -12 + }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Ry" = ( @@ -7440,6 +7584,9 @@ }, /obj/machinery/newscaster/directional/south, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "RW" = ( @@ -7463,12 +7610,6 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 23 @@ -7476,6 +7617,7 @@ /obj/effect/turf_decal/techfloor{ dir = 1 }, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) "Sd" = ( @@ -7490,35 +7632,6 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Sg" = ( -/obj/structure/rack, -/obj/item/gun/ballistic/rocketlauncher{ - pixel_y = 6; - pixel_x = -3 - }, -/obj/item/ammo_casing/caseless/rocket/hedp{ - pixel_x = -11; - pixel_y = -5 - }, -/obj/item/ammo_casing/caseless/rocket{ - pixel_x = -6; - pixel_y = -3 - }, -/obj/item/ammo_casing/caseless/rocket{ - pixel_x = -1; - pixel_y = -6 - }, -/obj/machinery/door/window/brigdoor/eastright{ - req_access = list(3,150) - }, -/obj/item/storage/backpack/duffelbag/syndie/c4{ - pixel_x = -1; - pixel_y = -10 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/clothing/glasses/hud/security/night, -/obj/item/clothing/glasses/hud/security/night, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Si" = ( @@ -7532,13 +7645,13 @@ pixel_y = 12 }, /obj/structure/rack, -/obj/item/clothing/suit/armor/riot{ - pixel_x = -4; - pixel_y = -5 +/obj/item/clothing/suit/armor/riot/minutemen{ + desc = "Designed to protect against close range attacks. This one is painted black."; + pixel_y = 1; + pixel_x = 5 }, /obj/item/clothing/head/helmet/riot{ - pixel_y = 11; - pixel_x = -6 + pixel_x = -8 }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) @@ -7563,6 +7676,9 @@ pixel_x = -20; pixel_y = 12 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/aft) "Sp" = ( @@ -7697,6 +7813,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "SR" = ( @@ -7847,6 +7966,14 @@ }, /turf/open/floor/engine, /area/ship/engineering/engine) +"TU" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "TY" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 9 @@ -7898,44 +8025,29 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "Up" = ( -/obj/item/ammo_box/magazine/sniper_rounds{ - pixel_x = -8; - pixel_y = 14 - }, -/obj/item/ammo_box/magazine/sniper_rounds{ - pixel_x = 3; - pixel_y = 10 - }, -/obj/item/ammo_box/magazine/m12g/small{ - pixel_y = -2 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "explosives locker" }, -/obj/item/ammo_box/magazine/m12g/small{ - pixel_x = -9; - pixel_y = 6 +/obj/item/storage/backpack/duffelbag/syndie/c4{ + pixel_x = -1; + pixel_y = -10 }, -/obj/item/ammo_box/magazine/m12g/small{ - pixel_x = 1; - pixel_y = 2 +/obj/item/gun/ballistic/rocketlauncher{ + pixel_y = 6; + pixel_x = -3 }, -/obj/item/ammo_box/magazine/m12g/small{ +/obj/item/ammo_casing/caseless/rocket/hedp, +/obj/item/ammo_casing/caseless/rocket/hedp, +/obj/item/ammo_casing/caseless/rocket{ pixel_x = -6; - pixel_y = -2 + pixel_y = -3 }, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/structure/closet/secure_closet/security{ - populate = 0; - icon_state = "syndicate"; - name = "ammo locker" +/obj/item/ammo_casing/caseless/rocket{ + pixel_x = -6; + pixel_y = -3 }, -/obj/item/ammo_box/magazine/ebr, -/obj/item/ammo_box/magazine/ebr, -/obj/item/ammo_box/magazine/ebr, -/obj/item/ammo_box/magazine/ebr, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Uu" = ( @@ -7962,6 +8074,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "UB" = ( @@ -8000,8 +8115,11 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, /turf/open/floor/plating, /area/ship/hallway/port) "UH" = ( @@ -8208,6 +8326,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Wd" = ( @@ -8228,6 +8349,7 @@ dir = 5 }, /obj/structure/closet/crate/bin, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "Wm" = ( @@ -8338,6 +8460,9 @@ dir = 10 }, /obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "WR" = ( @@ -8361,6 +8486,7 @@ /obj/structure/closet/firecloset/wall{ pixel_y = 28 }, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "WZ" = ( @@ -8456,6 +8582,9 @@ /obj/machinery/camera/autoname{ dir = 8 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "XL" = ( @@ -8537,7 +8666,6 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Yl" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, @@ -8547,6 +8675,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, /turf/open/floor/plating, /area/ship/hallway/port) "Ym" = ( @@ -8681,6 +8813,12 @@ pixel_x = 3; spawnwithmagazine = 0 }, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "YR" = ( @@ -8827,6 +8965,9 @@ dir = 10 }, /obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "ZO" = ( @@ -9660,7 +9801,7 @@ Ky dU Qv UF -mG +lT uH vz vz @@ -9734,7 +9875,7 @@ gZ GH JM Sy -mG +lT vz kl yM @@ -9782,7 +9923,7 @@ sp sp Ee sp -wR +TU KJ Bj YR @@ -10191,7 +10332,7 @@ Ap Ie ck dz -wh +dk Qk XL SV @@ -10228,7 +10369,7 @@ Ap Ie FW dz -lT +wR Qk XL RW diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm index 999d6c5d6423..9a27d26981ac 100644 --- a/code/modules/clothing/outfits/syndicate.dm +++ b/code/modules/clothing/outfits/syndicate.dm @@ -176,7 +176,6 @@ shoes = null gloves = null ears = null - implants = list(/obj/item/implant/weapons_auth) backpack = /obj/item/storage/backpack/security @@ -249,6 +248,7 @@ suit = null belt = null backpack_contents = null + implants = list(/obj/item/implant/weapons_auth) /datum/outfit/job/syndicate/captain/twink/post_equip(mob/living/carbon/human/H) From e537dfdd3106e6ecf023f07a3299fe062a964978 Mon Sep 17 00:00:00 2001 From: meem <75212565+meemofcourse@users.noreply.github.com> Date: Mon, 1 Jan 2024 02:43:21 -0300 Subject: [PATCH 11/21] Update syndicate_twinkleshine.json Signed-off-by: meem <75212565+meemofcourse@users.noreply.github.com> --- _maps/configs/syndicate_twinkleshine.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index 697fd4dc09c7..2f46694e7634 100644 --- a/_maps/configs/syndicate_twinkleshine.json +++ b/_maps/configs/syndicate_twinkleshine.json @@ -17,7 +17,7 @@ "map_short_name": "Twinkleshine-class", "map_path": "_maps/shuttles/syndicate/syndicate_twinkleshine.dmm", "job_slots": { - "Commodore": { + "Flotilla Admiral": { "outfit": "/datum/outfit/job/syndicate/captain/twink", "officer": true, "slots": 1 From e07320ea167787d7f9a23b862d97338eafd053e3 Mon Sep 17 00:00:00 2001 From: meem <75212565+meemofcourse@users.noreply.github.com> Date: Mon, 1 Jan 2024 02:45:25 -0300 Subject: [PATCH 12/21] Update syndicate_twinkleshine.dmm change Commodore to Flotilla Admiral Signed-off-by: meem <75212565+meemofcourse@users.noreply.github.com> --- _maps/shuttles/syndicate/syndicate_twinkleshine.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 7cdb127f2707..97836a6e399b 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -4803,7 +4803,7 @@ pixel_x = 6; pixel_y = 5; name = "README - notice to the captain"; - default_raw_text = "

Dear Commodore,

Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers.

This vessel is staffed with workers from every branch of the Syndicate. Please take the time to familiarize yourself with the ship's features and crew, and make sure to maintain positive relationships with your crew.



check under your bed"; + default_raw_text = "

Dear Admiral,

Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers.

This vessel is staffed with workers from every branch of the Syndicate. Please take the time to familiarize yourself with the ship's features and crew, and make sure to maintain positive relationships with your crew.



check under your bed"; desc = "This sheet of paper looks old and dusty."; color = "#3f010d" }, From 9ebb0daff0e40d6eee28d67d8202a5856a9668b1 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Mon, 1 Jan 2024 02:52:04 -0300 Subject: [PATCH 13/21] commodore to FADM --- code/modules/clothing/outfits/syndicate.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm index 9a27d26981ac..af046571a4d3 100644 --- a/code/modules/clothing/outfits/syndicate.dm +++ b/code/modules/clothing/outfits/syndicate.dm @@ -237,7 +237,7 @@ /datum/outfit/job/syndicate/captain/twink - name = "Commodore (Twinkleshine, ACLF)" + name = "Flotilla Admiral (Twinkleshine, ACLF)" uniform = /obj/item/clothing/under/syndicate/officer head = null From c207943553b8215879ad5b0bef2efd2e1b5225d8 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Fri, 2 Feb 2024 22:20:34 -0300 Subject: [PATCH 14/21] Update syndicate_twinkleshine.dmm --- _maps/shuttles/syndicate/syndicate_twinkleshine.dmm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 97836a6e399b..9b0e73e25017 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -3500,9 +3500,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -3516,9 +3513,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ship/medical) "uY" = ( From 1174d2a4818bc22527e830f651506daef24cde73 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Fri, 2 Feb 2024 23:05:00 -0300 Subject: [PATCH 15/21] hng --- .../clothing/outfits/factions/syndicate.dm | 225 ++++++++---------- 1 file changed, 94 insertions(+), 131 deletions(-) diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index af046571a4d3..8474df979d4f 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -1,12 +1,14 @@ //top outfit of everything syndicate. Don't change this. /datum/outfit/job/syndicate - name = "Syndicate (mostly) Empty" + name = "Syndicate - Base Outfit" - uniform = /obj/item/clothing/under/syndicate + uniform = /obj/item/clothing/under/color/black box = /obj/item/storage/box/survival/syndie id = /obj/item/card/id/syndicate_command/crew_id + faction_icon = "bg_syndicate" + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/syndie @@ -28,8 +30,9 @@ //and now, for the Assistants /datum/outfit/job/syndicate/assistant - name = "Junior Agent (Assistant)" + name = "Syndicate - Junior Agent" jobtype = /datum/job/assistant + job_icon = "assistant" uniform = /obj/item/clothing/under/syndicate/intern alt_uniform = null @@ -41,7 +44,6 @@ id = /obj/item/card/id/syndicate_command/crew_id r_pocket = /obj/item/radio - belt = /obj/item/pda backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -50,16 +52,14 @@ box = /obj/item/storage/box/survival/syndie - job_icon = "assistant" - /datum/outfit/job/syndicate/assistant/gorlex - name = "Junior Agent (Gorlex Marauders)" + name = "Syndicate - Junior Agent (Gorlex Marauders)" uniform = /obj/item/clothing/under/syndicate/gorlex alt_uniform = /obj/item/clothing/under/syndicate /datum/outfit/job/syndicate/assistant/gec - name = "Deckhand (GEC)" + name = "Syndicate - Deckhand (GEC)" uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/toggle/hazard @@ -67,7 +67,7 @@ head = /obj/item/clothing/head/safety_helmet /datum/outfit/job/syndicate/assistant/cybersun - name = "Junior Agent (Cybersun)" + name = "Syndicate - Junior Agent (Cybersun)" uniform = /obj/item/clothing/under/syndicate/cybersun shoes = /obj/item/clothing/shoes/jackboots @@ -75,13 +75,13 @@ head = /obj/item/clothing/head/soft/cybersun /datum/outfit/job/syndicate/assistant/twink - name = "Deck Assistant (Twinkleshine)" + name = "Syndicate - Deck Assistant (Twinkleshine)" uniform = /obj/item/clothing/under/syndicate mask = /obj/item/clothing/mask/gas/syndicate/voicechanger id = /obj/item/card/id/syndicate_command/crew_id belt = null - shoes = null + shoes = /obj/item/clothing/shoes/combat gloves = null ears = null implants = list(/obj/item/implant/weapons_auth) @@ -101,10 +101,10 @@ //atmos techs -//Shiptest /datum/outfit/job/syndicate/atmos - name = "Atmospheric Technician (Syndicate)" + name = "Syndicate - Atmospheric Technician" jobtype = /datum/job/atmos + job_icon = "atmospherictechnician" belt = /obj/item/storage/belt/utility/atmostech @@ -114,7 +114,6 @@ dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering r_pocket = /obj/item/analyzer - l_pocket = /obj/item/pda/atmos backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng @@ -123,13 +122,11 @@ box = /obj/item/storage/box/survival/engineer - job_icon = "atmospherictechnician" - pda_slot = ITEM_SLOT_LPOCKET backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) /datum/outfit/job/syndicate/atmos/gec - name = "Atmospheric Technician (GEC)" + name = "Syndicate - Atmospheric Technician (GEC)" uniform = /obj/item/clothing/under/syndicate/gec/atmos_tech suit = /obj/item/clothing/suit/toggle/hazard @@ -140,13 +137,13 @@ //bartenders /datum/outfit/job/syndicate/bartender - name = "Bartender (Syndicate)" + name = "Syndicate - Bartender" jobtype = /datum/job/bartender + job_icon = "bartender" id = /obj/item/card/id/syndicate_command/crew_id head = /obj/item/clothing/head/HoS/beret/syndicate glasses = /obj/item/clothing/glasses/sunglasses/reagent - belt = /obj/item/pda/bar uniform = /obj/item/clothing/under/rank/civilian/bartender alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple alt_suit = /obj/item/clothing/suit/apron/purple_bartender @@ -154,8 +151,6 @@ backpack_contents = list(/obj/item/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup - job_icon = "bartender" - /datum/outfit/job/syndicate/bartender/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -165,7 +160,7 @@ to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!") /datum/outfit/job/syndicate/bartender/twink - name = "Bartender (Twinkleshine, Donk)" + name = "Syndicate - Bartender (Twinkleshine)" uniform = /obj/item/clothing/under/syndicate/donk id = /obj/item/card/id/syndicate_command/crew_id @@ -173,7 +168,7 @@ suit = null belt = null head = null - shoes = null + shoes = /obj/item/clothing/shoes/laceup gloves = null ears = null @@ -191,16 +186,17 @@ //botanist /datum/outfit/job/syndicate/botanist - name = "Botanist (Syndicate)" + name = "Syndicate - Botanist" jobtype = /datum/job/hydro - belt = /obj/item/pda/botanist + job_icon = "botanist" + suit = /obj/item/clothing/suit/apron alt_suit = /obj/item/clothing/suit/apron/overalls gloves =/obj/item/clothing/gloves/botanic_leather suit_store = /obj/item/plant_analyzer /datum/outfit/job/syndicate/botanist/suns - name = "Botanist-Chemist (SUNS)" + name = "Syndicate - Botanist-Chemist (SUNS)" id = /obj/item/card/id/syndicate_command/crew_id shoes = /obj/item/clothing/shoes/jackboots @@ -208,11 +204,12 @@ suit = /obj/item/clothing/suit/toggle/labcoat/chemist suit_store = null -//Capitan (Captain) +//Captain /datum/outfit/job/syndicate/captain - name = "Captain (Syndicate)" + name = "Syndicate - Captain" jobtype = /datum/job/captain + job_icon = "captain" id = /obj/item/card/id/syndicate_command/captain_id ears = /obj/item/radio/headset/syndicate/alt/captain @@ -221,7 +218,7 @@ head = /obj/item/clothing/head/HoS/syndicate gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain) + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -230,8 +227,6 @@ box = /obj/item/storage/box/survival/syndie - job_icon = "captain" - /datum/outfit/job/syndicate/captain/aclf name = "Captain (ACLF)" @@ -241,8 +236,8 @@ uniform = /obj/item/clothing/under/syndicate/officer head = null - gloves = null - shoes = null + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/combat ears = /obj/item/radio/headset/syndicate/alt/captain mask = /obj/item/clothing/mask/gas/syndicate/voicechanger suit = null @@ -257,14 +252,14 @@ /datum/outfit/job/syndicate/captain/gorlex - name = "Captain (Gorlex Marauders)" + name = "Syndicate - Captain (Gorlex Marauders)" uniform = /obj/item/clothing/under/syndicate/officer head = /obj/item/clothing/head/gorlexcap suit = /obj/item/clothing/suit/gorlex /datum/outfit/job/syndicate/captain/cybersun - name = "Captain (Cybersun)" + name = "Syndicate - Captain (Cybersun)" uniform = /obj/item/clothing/under/syndicate/cybersun/officer suit = /obj/item/clothing/suit/armor/vest/capcarapace/cybersun @@ -275,65 +270,59 @@ //cargo tech /datum/outfit/job/syndicate/cargo_tech - name = "Cargo Tech (Syndicate)" + name = "Syndicate - Cargo Tech" jobtype = /datum/job/cargo_tech + job_icon = "cargotechnician" id = /obj/item/card/id/syndicate_command/crew_id uniform = /obj/item/clothing/under/syndicate/donk suit = /obj/item/clothing/suit/hazardvest/donk - belt = /obj/item/pda/cargo alt_suit = /obj/item/clothing/suit/hazardvest l_hand = /obj/item/export_scanner backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) - job_icon = "cargotechnician" - /datum/outfit/job/syndicate/cargo_tech/donk - name = "Customer Associate (Donk! Co)" + name = "Syndicate - Customer Associate (Donk)" //chemist /datum/outfit/job/syndicate/chemist - name = "Chemist (Syndicate)" + name = "Syndicate - Chemist" jobtype = /datum/job/chemist + job_icon = "chemist" - uniform = /obj/item/clothing/under/syndicate/intern + uniform = /obj/item/clothing/under/syndicate id = /obj/item/card/id/syndicate_command/crew_id - l_pocket =/obj/item/pda/chemist glasses = /obj/item/clothing/glasses/science - belt = /obj/item/pda/chemist shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat/chemist box = /obj/item/storage/box/survival/medical - job_icon = "chemist" - /datum/outfit/job/syndicate/chemist/gec - name = "Chemist (GEC)" + name = "Syndicate - Chemist (GEC)" uniform = /obj/item/clothing/under/syndicate/intern suit = /obj/item/clothing/suit/toggle/hazard head = /obj/item/clothing/head/hardhat belt = /obj/item/storage/belt/utility/full/engi id = /obj/item/card/id/syndicate_command/crew_id - l_pocket =/obj/item/pda/chemist //Chief Engineer /datum/outfit/job/syndicate/ce - name = "Chief Engineer (Syndicate)" + name = "Syndicate - Chief Engineer" jobtype = /datum/job/chief_engineer + job_icon = "chiefengineer" id = /obj/item/card/id/syndicate_command/crew_id ears = /obj/item/radio/headset/syndicate/alt glasses = /obj/item/clothing/glasses/sunglasses belt = /obj/item/storage/belt/utility/chief/full - l_pocket = /obj/item/pda/heads/ce uniform = /obj/item/clothing/under/rank/engineering/chief_engineer shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/hardhat/white @@ -348,10 +337,9 @@ pda_slot = ITEM_SLOT_LPOCKET chameleon_extras = /obj/item/stamp/ce - job_icon = "chiefengineer" /datum/outfit/job/syndicate/ce/gec - name = "Chief Engineer (GEC)" + name = "Syndicate - Chief Engineer (GEC)" uniform = /obj/item/clothing/under/syndicate/gec/chief_engineer suit = /obj/item/clothing/suit/toggle/hazard @@ -362,7 +350,7 @@ gloves = /obj/item/clothing/gloves/combat /datum/outfit/job/syndicate/ce/gorlex - name = "Foreman (Gorlex Marauders)" + name = "Syndicate - Foreman (Gorlex Marauders)" ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/gorlex @@ -375,14 +363,14 @@ //Chief Medical Officer /datum/outfit/job/syndicate/cmo - name = "Medical Director (Cybersun)" + name = "Syndicate - Medical Director (Cybersun)" jobtype = /datum/job/cmo + job_icon = "chiefmedicalofficer" uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun ears = /obj/item/radio/headset/syndicate/alt/captain id = /obj/item/card/id/syndicate_command/captain_id shoes = /obj/item/clothing/shoes/jackboots - belt = /obj/item/pda/heads/cmo l_pocket = /obj/item/pinpointer/crew head = /obj/item/clothing/head/beret/cmo/cybersun suit = /obj/item/clothing/suit/toggle/labcoat/raincoat @@ -391,13 +379,12 @@ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) /datum/outfit/job/syndicate/cmo/suns - name = "Medical Director (SUNS)" + name = "Syndicate - Medical Director (SUNS)" uniform = /obj/item/clothing/under/syndicate ears = /obj/item/radio/headset/syndicate/alt/captain id = /obj/item/card/id/syndicate_command/captain_id shoes = /obj/item/clothing/shoes/jackboots - belt = /obj/item/pda/heads/cmo l_pocket = /obj/item/pinpointer/crew shoes = /obj/item/clothing/shoes/sneakers/brown suit = /obj/item/clothing/suit/toggle/labcoat/cmo @@ -405,16 +392,12 @@ suit_store = /obj/item/flashlight/pen backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) - job_icon = "chiefmedicalofficer" - -/datum/outfit/job/syndicate/cmo/suns - name = "Medical Director (SUNS)" - //"Head Of Personnel" /datum/outfit/job/syndicate/head_of_personnel - name = "Bridge Officer (Syndicate)" + name = "Syndicate - Bridge Officer" jobtype = /datum/job/head_of_personnel + job_icon = "headofpersonnel" ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/aclfgrunt @@ -424,14 +407,11 @@ id = /obj/item/card/id/syndicate_command/crew_id r_pocket = /obj/item/kitchen/knife/combat/survival glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/pda/heads/head_of_personnel backpack_contents = list(/obj/item/storage/box/ids=1,\ /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) - job_icon = "headofpersonnel" - /datum/outfit/job/syndicate/head_of_personnel/cybersun - name = "Intelligence Officer (Cybersun)" + name = "Syndicate - Intelligence Officer (Cybersun)" ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/cybersun/officer @@ -446,15 +426,15 @@ //head of security /datum/outfit/job/syndicate/hos - name = "Head Of Security (Syndicate)" + name = "Syndicate - Head Of Security" jobtype = /datum/job/hos + job_icon = "headofsecurity" ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/combat head = /obj/item/clothing/head/HoS/syndicate suit = /obj/item/clothing/suit/armor/vest/syndie id = /obj/item/card/id/syndicate_command/crew_id - belt = /obj/item/pda/heads/hos shoes = /obj/item/clothing/shoes/jackboots glasses = /obj/item/clothing/glasses/hud/security/sunglasses suit_store = /obj/item/gun/energy/e_gun @@ -462,24 +442,22 @@ l_pocket = /obj/item/restraints/handcuffs backpack_contents = list(/obj/item/melee/baton/loaded=1) - job_icon = "headofsecurity" - /datum/outfit/job/syndicate/hos/gorlex - name = "Sergeant (Syndicate)" + name = "Syndicate - Sergeant (Gorlex)" /datum/outfit/job/syndicate/hos/twink - name = "Lieutenant (Twinkleshine, 2nd Battlegroup)" + name = "Syndicate - Lieutenant (Twinkleshine)" - uniform = /obj/item/clothing/under/syndicate/officer + uniform = /obj/item/clothing/under/syndicate/aclfgrunt mask = /obj/item/clothing/mask/gas/syndicate/voicechanger id = /obj/item/card/id/syndicate_command/lieutenant head = null ears = null - gloves = null + gloves = /obj/item/clothing/gloves/combat l_pocket = null r_pocket = null belt = null - shoes = null + shoes = /obj/item/clothing/shoes/combat suit = null suit_store = null alt_suit = null @@ -501,31 +479,29 @@ //medical doctors (assorted) /datum/outfit/job/syndicate/doctor - name = "Medical Doctor (Syndicate)" + name = "Syndicate - Medical Doctor" jobtype = /datum/job/doctor + job_icon = "medicaldoctor" uniform = /obj/item/clothing/under/syndicate id = /obj/item/card/id/syndicate_command/crew_id shoes = /obj/item/clothing/shoes/jackboots - belt = /obj/item/pda/medical shoes = /obj/item/clothing/shoes/sneakers/white alt_suit = /obj/item/clothing/suit/apron/surgical l_hand = /obj/item/storage/firstaid/medical - job_icon = "medicaldoctor" - /datum/outfit/job/syndicate/doctor/suns - name = "Medical Doctor (SUNS)" + name = "Syndicate - Medical Doctor (SUNS)" /datum/outfit/job/syndicate/doctor/cybersun - name = "Medical Doctor (Cybersun)" + name = "Syndicate - Medical Doctor (Cybersun)" uniform = /obj/item/clothing/under/syndicate/medic accessory = /obj/item/clothing/accessory/armband/medblue shoes = /obj/item/clothing/shoes/jackboots /datum/outfit/job/syndicate/doctor/gorlex - name = "Medical Doctor (Gorlex)" + name = "Syndicate - Medical Doctor (Gorlex)" uniform = /obj/item/clothing/under/syndicate/gorlex glasses = /obj/item/clothing/glasses/hud/health/prescription @@ -538,9 +514,9 @@ /datum/outfit/job/syndicate/paramedic - name = "Paramedic (Syndicate)" + name = "Syndicate - Paramedic" jobtype = /datum/job/paramedic - + job_icon = "paramedic" id = /obj/item/card/id/syndicate_command/crew_id uniform = /obj/item/clothing/under/syndicate/gorlex @@ -553,18 +529,15 @@ gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil belt = /obj/item/storage/belt/medical/paramedic id = /obj/item/card/id - l_pocket = /obj/item/pda/medical suit_store = /obj/item/flashlight/pen backpack_contents = list(/obj/item/roller=1) pda_slot = ITEM_SLOT_LPOCKET - job_icon = "paramedic" - /datum/outfit/job/syndicate/paramedic/gorlex - name = "Paramedic (Gorlex)" + name = "Syndicate - Paramedic (Gorlex)" /datum/outfit/job/syndicate/paramedic/cybersun - name = "Field Medic (Cybersun Industries)" + name = "Syndicate - Field Medic (Cybersun Industries)" uniform = /obj/item/clothing/under/syndicate/medic head = /obj/item/clothing/head/soft/cybersun/medical @@ -572,15 +545,15 @@ suit = /obj/item/clothing/suit/toggle/labcoat/raincoat /datum/outfit/job/syndicate/paramedic/twink - name = "Medic (Twinkleshine, CyberSun)" + name = "Syndicate - Medic (Twinkleshine)" mask = /obj/item/clothing/mask/gas/syndicate/voicechanger uniform = /obj/item/clothing/under/rank/medical/doctor/red id = /obj/item/card/id/syndicate_command/crew_id/med belt = null head = null - gloves = null - shoes = null + gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil + shoes = /obj/item/clothing/shoes/combat suit = null alt_suit = null suit_store = null @@ -605,8 +578,9 @@ //psychologist /datum/outfit/job/syndicate/psychologist - name = "Psychologist (Syndicate)" + name = "Syndicate - Psychologist" jobtype = /datum/job/psychologist + job_icon = "psychologist" id = /obj/item/card/id/syndicate_command/crew_id uniform = /obj/item/clothing/under/rank/medical/psychiatrist @@ -614,32 +588,29 @@ shoes = /obj/item/clothing/shoes/laceup alt_uniform = null l_hand = /obj/item/clipboard - belt = /obj/item/pda/medical pda_slot = ITEM_SLOT_BELT - job_icon = "psychologist" - /datum/outfit/job/syndicate/psychologist/suns name = "Ship Psychologist (SUNS)" //patient (prisoner) /datum/outfit/job/syndicate/patient - name = "Long Term Patient" + name = "Syndicate - Long Term Patient" jobtype = /datum/job/prisoner + job_icon = "assistant" id = /obj/item/card/id/patient uniform = /obj/item/clothing/under/rank/medical/gown alt_suit = null shoes = /obj/item/clothing/shoes/sandal/slippers - job_icon = "assistant" //todo: patient sechud icon - //Quartermaster /datum/outfit/job/syndicate/quartermaster - name = "Quartermaster (Syndicate)" + name = "Syndicate - Quartermaster" jobtype = /datum/job/qm + job_icon = "quartermaster" id = /obj/item/card/id/syndicate_command/captain_id @@ -648,15 +619,12 @@ suit = /obj/item/clothing/suit/hazardvest/donk/qm ears = /obj/item/radio/headset/syndicate/alt shoes = /obj/item/clothing/shoes/laceup - belt = /obj/item/pda/quartermaster glasses = /obj/item/clothing/glasses/sunglasses l_hand = /obj/item/clipboard backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) - job_icon = "quartermaster" - /datum/outfit/job/syndicate/quartermaster/donk - name = "Manager (Donk! Co.)" + name = "Syndicate - Manager (Donk)" id = /obj/item/card/id/syndicate_command/captain_id ears = /obj/item/radio/headset/syndicate/alt @@ -668,9 +636,9 @@ //security officers /datum/outfit/job/syndicate/security - name = "Operative (Syndicate)" + name = "Syndicate - Operative" jobtype = /datum/job/officer - + job_icon = "securityofficer" uniform = /obj/item/clothing/under/syndicate r_pocket = /obj/item/kitchen/knife/combat/survival @@ -690,13 +658,12 @@ /obj/item/melee/baton/loaded=1, ) - job_icon = "securityofficer" /datum/outfit/job/syndicate/security/gorlex - name = "Assault Operative (Gorlex)" + name = "Syndicate - Assault Operative (Gorlex)" /datum/outfit/job/syndicate/security/twink - name = "Operative (Twinkleshine, ACLF)" + name = "Syndicate - Operative (Twinkleshine)" uniform = /obj/item/clothing/under/syndicate/combat mask = /obj/item/clothing/mask/gas/syndicate/voicechanger @@ -705,8 +672,8 @@ ears = null suit = null belt = null - gloves = null - shoes = null + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/combat l_pocket = null r_pocket = null implants = list(/obj/item/implant/weapons_auth) @@ -727,10 +694,10 @@ //Miners /datum/outfit/job/syndicate/miner - name = "Miner (Syndicate)" + name = "Syndicate - Miner" jobtype = /datum/job/mining + job_icon = "shaftminer" - belt = /obj/item/pda/shaftminer ears = /obj/item/radio/headset/headset_cargo/mining shoes = /obj/item/clothing/shoes/workboots/mining gloves = /obj/item/clothing/gloves/explorer @@ -743,22 +710,20 @@ /obj/item/mining_voucher=1,\ /obj/item/stack/marker_beacon/ten=1) - job_icon = "shaftminer" - /datum/outfit/job/syndicate/miner/gorlex - name = "Wrecker (Gorlex Marauders)" + name = "Syndicate - Wrecker (Gorlex Marauders)" uniform = /obj/item/clothing/under/syndicate/gorlex shoes = /obj/item/clothing/shoes/workboots ears = /obj/item/radio/headset/alt /datum/outfit/job/syndicate/miner/twink - name = "Miner (Twinkleshine, SUNS)" + name = "Syndicate - Miner (Twinkleshine)" uniform = /obj/item/clothing/under/syndicate/coldres mask = /obj/item/clothing/mask/gas/syndicate/voicechanger id = /obj/item/card/id/syndicate_command/crew_id - shoes = null + shoes = /obj/item/clothing/shoes/workboots glasses = null gloves = null ears = null @@ -779,7 +744,7 @@ assign_codename(H) /datum/outfit/job/syndicate/miner/cybersun - name = "Field Agent (Cybersun)" + name = "Syndicate - Field Agent (Cybersun)" id = /obj/item/card/id/syndicate_command/crew_id ears = /obj/item/radio/headset @@ -789,7 +754,7 @@ r_pocket = /obj/item/radio /datum/outfit/job/syndicate/miner/gec - name = "Shaft Miner (GEC)" + name = "Syndicate - Shaft Miner (GEC)" id = /obj/item/card/id/syndicate_command/crew_id ears = /obj/item/radio/headset @@ -805,8 +770,9 @@ //"station" engineers /datum/outfit/job/syndicate/engineer - name = "Ship Technician (Syndicate)" + name = "Syndicate - Ship Technician" jobtype = /datum/job/engineer + job_icon = "stationengineer" id = /obj/item/card/id/syndicate_command/crew_id uniform = /obj/item/clothing/under/syndicate/aclfgrunt @@ -815,7 +781,6 @@ shoes = /obj/item/clothing/shoes/jackboots belt = /obj/item/storage/belt/utility/full/engi - l_pocket = /obj/item/pda/engineering head = /obj/item/clothing/head/hardhat/dblue r_pocket = /obj/item/t_scanner @@ -823,10 +788,8 @@ pda_slot = ITEM_SLOT_LPOCKET backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) - job_icon = "stationengineer" - /datum/outfit/job/syndicate/engineer/gec - name = "Ship Engineer (GEC)" + name = "Syndicate - Ship Engineer (GEC)" uniform = /obj/item/clothing/under/syndicate/gec suit = /obj/item/clothing/suit/toggle/hazard @@ -834,7 +797,7 @@ id = /obj/item/card/id/syndicate_command/crew_id /datum/outfit/job/syndicate/engineer/gorlex - name = "Mechanic (Gorlex Marauders)" + name = "Syndicate - Mechanic (Gorlex Marauders)" uniform = /obj/item/clothing/under/syndicate/gorlex shoes = /obj/item/clothing/shoes/workboots @@ -842,7 +805,7 @@ glasses = null /datum/outfit/job/syndicate/engineer/twink - name = "Ship Engineer (Twinkleshine, GEC)" + name = "Syndicate - Ship Engineer (Twinkleshine)" uniform = /obj/item/clothing/under/syndicate/gec id = /obj/item/card/id/syndicate_command/crew_id/engi @@ -851,9 +814,9 @@ accessory = null glasses = null head = null - gloves = null + gloves = /obj/item/clothing/gloves/tackler/combat belt = null - shoes = null + shoes = /obj/item/clothing/shoes/combat suit = null alt_suit = null l_pocket = null @@ -867,7 +830,7 @@ assign_codename(H) /datum/outfit/job/syndicate/engineer/cybersun - name = "Engineer (Cybersun)" + name = "Syndicate - Engineer (Cybersun)" uniform = /obj/item/clothing/under/syndicate/cybersun/research shoes = /obj/item/clothing/shoes/workboots From 2ff8536019f7321da5aea9f14e611817a09a7054 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Tue, 6 Feb 2024 15:37:14 -0300 Subject: [PATCH 16/21] redshield officer --- _maps/configs/syndicate_twinkleshine.json | 5 + .../syndicate/syndicate_twinkleshine.dmm | 331 +++++++++++------- code/modules/clothing/masks/gasmask.dm | 1 + .../clothing/outfits/factions/syndicate.dm | 17 +- 4 files changed, 220 insertions(+), 134 deletions(-) diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index 2f46694e7634..ef84cca126f5 100644 --- a/_maps/configs/syndicate_twinkleshine.json +++ b/_maps/configs/syndicate_twinkleshine.json @@ -27,6 +27,11 @@ "officer": true, "slots": 1 }, + "Redshield Officer": { + "outfit": "/datum/outfit/job/syndicate/hos/suns/twink", + "officer": true, + "slots": 1 + }, "Medic": { "outfit": "/datum/outfit/job/syndicate/paramedic/twink", "slots": 2 diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 9b0e73e25017..14b85222a647 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -77,6 +77,11 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"aC" = ( +/obj/machinery/light/directional/west, +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "aD" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 @@ -115,6 +120,9 @@ /obj/effect/turf_decal/syndicateemblem/middle/left{ dir = 4 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "bf" = ( @@ -192,19 +200,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "bL" = ( -/obj/machinery/light/directional/south, /obj/structure/table/reinforced, -/obj/item/folder/syndicate/red{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/item/folder/syndicate/blue{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/folder/red{ - pixel_x = -4 - }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "bM" = ( @@ -381,6 +377,9 @@ /area/ship/security/armory) "cI" = ( /obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "cJ" = ( @@ -580,6 +579,9 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "dL" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "dO" = ( @@ -1041,10 +1043,6 @@ /obj/item/radio/headset/syndicate{ keyslot = null }, -/obj/item/paper{ - name = "note from SUNS"; - default_raw_text = "

Message from SUNS


We could not afford to equip you with our top of the line research and mining equipment, but we hope this will suffice. Sorry!" - }, /turf/open/floor/pod/dark, /area/ship/cargo) "gI" = ( @@ -1127,36 +1125,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) -"hj" = ( -/obj/item/hypospray/mkii/CMO/combat{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/item/reagent_containers/glass/bottle/vial/large{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/item/reagent_containers/glass/bottle/vial/large{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/item/reagent_containers/glass/bottle/vial/large{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/item/reagent_containers/glass/bottle/vial/large{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/structure/sign/poster/contraband/mothpill{ - pixel_x = 32 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/opaque/orange/line{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/medical) "hr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1604,25 +1572,8 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "jv" = ( -/obj/item/storage/bag/chemistry, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/glass/beaker, -/obj/structure/closet/wall/orange{ - name = "Chemical Closet"; - pixel_y = 28 - }, -/obj/structure/sign/warning/chemdiamond{ - pixel_x = 30 - }, -/obj/item/clothing/glasses/sunglasses/chemical, -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/opaque/orange/line{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/ship/medical) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "jx" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 5 @@ -1757,6 +1708,15 @@ }, /turf/open/floor/plasteel/dark, /area/ship/security) +"kh" = ( +/obj/effect/turf_decal/syndicateemblem/middle/middle{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "kl" = ( /obj/machinery/light/directional/north, /obj/structure/closet/secure_closet{ @@ -1795,8 +1755,10 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "kE" = ( -/obj/machinery/light/directional/west, /obj/effect/turf_decal/syndicateemblem/top/right, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "kF" = ( @@ -1897,6 +1859,9 @@ /obj/effect/turf_decal/syndicateemblem/top/middle{ dir = 8 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "kX" = ( @@ -1961,19 +1926,15 @@ /area/ship/cargo) "lq" = ( /obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 - }, /obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 1 }, -/obj/effect/turf_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "lv" = ( @@ -2130,6 +2091,9 @@ /obj/effect/turf_decal/syndicateemblem/middle/left{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "mB" = ( @@ -2409,7 +2373,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "ox" = ( -/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/item/paper_bin/carbon, /obj/item/pen/fountain, @@ -2727,6 +2690,9 @@ /obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 8 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "pL" = ( @@ -3257,6 +3223,11 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) +"sV" = ( +/obj/item/clothing/suit/space/hardsuit/security/suns, +/obj/machinery/suit_storage_unit/inherit, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "sW" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -3392,6 +3363,9 @@ /area/ship/hallway/starboard) "tZ" = ( /obj/effect/turf_decal/syndicateemblem/bottom/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ug" = ( @@ -3708,6 +3682,9 @@ dir = 4 }, /obj/effect/turf_decal/syndicateemblem/bottom/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "wu" = ( @@ -3907,6 +3884,9 @@ /obj/effect/turf_decal/syndicateemblem/middle/right{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "xh" = ( @@ -4304,6 +4284,9 @@ /obj/effect/turf_decal/syndicateemblem/middle/left{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "zG" = ( @@ -4311,15 +4294,7 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/syndie/surgery{ - pixel_y = 4; - pixel_x = -6 - }, -/obj/item/reagent_containers/medigel/sterilizine{ - pixel_x = 9; - pixel_y = 1 - }, +/obj/structure/table/optable, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "zH" = ( @@ -5266,6 +5241,12 @@ /obj/effect/turf_decal/radiation, /turf/open/floor/engine, /area/ship/engineering/engine) +"EW" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "EX" = ( /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 @@ -5479,6 +5460,13 @@ pixel_x = 6 }, /obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/item/storage/backpack/duffelbag/syndie/surgery{ + pixel_x = 3 + }, +/obj/item/reagent_containers/medigel/sterilizine{ + pixel_x = -11; + pixel_y = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "FI" = ( @@ -5500,6 +5488,9 @@ /obj/effect/turf_decal/syndicateemblem/middle/right{ dir = 8 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "FV" = ( @@ -5780,18 +5771,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/structure/closet/crate/freezer, -/obj/item/bodypart/chest/robot, -/obj/item/bodypart/leg/right/robot, -/obj/item/bodypart/r_arm/robot, -/obj/item/bodypart/leg/left/robot, -/obj/item/bodypart/l_arm/robot, -/obj/item/organ/ears/cat, -/obj/item/organ/tail/cat, -/obj/item/organ/liver/cybernetic/tier2, -/obj/item/organ/lungs/cybernetic/tier2, -/obj/item/organ/heart/cybernetic/tier2, -/obj/item/organ/ears/cybernetic, +/obj/structure/closet/crate/freezer/surplus_limbs/organs, /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "Hd" = ( @@ -5852,6 +5832,22 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) +"Hx" = ( +/obj/structure/table/reinforced, +/obj/item/folder/syndicate/red{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/folder/syndicate/blue{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/folder/red{ + pixel_x = -4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "HF" = ( /obj/structure/table, /obj/item/wrench/medical{ @@ -5883,6 +5879,9 @@ /area/ship/engineering/atmospherics) "HL" = ( /obj/effect/turf_decal/syndicateemblem/middle/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "HQ" = ( @@ -6479,6 +6478,9 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 }, +/obj/machinery/camera/autoname{ + dir = 6 + }, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "KJ" = ( @@ -6584,8 +6586,6 @@ /obj/item/clothing/under/syndicate, /obj/item/clothing/under/syndicate/skirt, /obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/aclfgrunt, -/obj/item/clothing/under/syndicate/aclfgrunt, /obj/item/clothing/shoes/sneakers/black, /obj/item/clothing/shoes/sneakers/black, /obj/item/clothing/shoes/sneakers/black, @@ -6979,6 +6979,9 @@ /obj/effect/turf_decal/syndicateemblem/middle/left{ dir = 8 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ON" = ( @@ -7109,15 +7112,18 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Pv" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ - dir = 1 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 }, -/obj/structure/table/optable, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/turf_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/turf/open/floor/plasteel/white, -/area/ship/medical/surgery) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "Pz" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -7128,6 +7134,9 @@ /obj/effect/turf_decal/syndicateemblem/middle/middle{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "PB" = ( @@ -7304,9 +7313,27 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/janitor) "Qt" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/syndicateemblem/middle/middle, -/turf/open/floor/mineral/plastitanium/red, +/obj/structure/closet/secure_closet/warden{ + name = "redshield's locker"; + populate = 0 + }, +/obj/item/clothing/shoes/combat/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/glasses/hud/security/suns, +/obj/item/clothing/gloves/tackler/dolphin/suns, +/obj/item/clothing/suit/toggle/suns/pkcoat, +/obj/item/clothing/suit/armor/vest/bulletproof/suns/hos, +/obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos, +/obj/item/clothing/head/welding/suns/hos, +/obj/item/clothing/under/syndicate/suns/pkuniform, +/obj/item/radio/headset/syndicate/alt{ + keyslot = null + }, +/obj/item/gun/ballistic/automatic/powered/gauss/modelh, +/obj/item/storage/belt/sabre/solgov, +/obj/item/ammo_box/magazine/modelh, +/obj/item/ammo_box/magazine/modelh, +/turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Qv" = ( /obj/effect/turf_decal/corner/opaque/syndiered/border{ @@ -7833,10 +7860,15 @@ pixel_y = 1 }, /obj/structure/table/glass, -/obj/effect/turf_decal/trimline/opaque/orange/line, /obj/effect/turf_decal/trimline/opaque/orange/filled/line{ dir = 8 }, +/obj/effect/turf_decal/trimline/opaque/orange/line{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/mothpill{ + pixel_x = 32 + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "ST" = ( @@ -7868,6 +7900,9 @@ /obj/effect/turf_decal/syndicateemblem/top/right{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Tn" = ( @@ -8263,18 +8298,31 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "VM" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 25 +/obj/effect/turf_decal/trimline/opaque/orange/filled/corner{ + dir = 8 }, +/obj/structure/table/glass, /obj/effect/turf_decal/trimline/opaque/orange/line{ - dir = 1 + dir = 5 }, -/obj/effect/turf_decal/trimline/opaque/orange/filled/corner{ - dir = 8 +/obj/structure/closet/wall/orange{ + name = "Chemical Closet"; + pixel_y = 28 }, +/obj/item/storage/bag/chemistry, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, +/obj/item/clothing/glasses/sunglasses/chemical, +/obj/structure/sign/warning/chemdiamond{ + pixel_x = 30 + }, +/obj/item/hypospray/mkii/CMO/combat, +/obj/item/reagent_containers/glass/bottle/vial/large, +/obj/item/reagent_containers/glass/bottle/vial/large, +/obj/item/reagent_containers/glass/bottle/vial/large, +/obj/item/reagent_containers/glass/bottle/vial/large, /turf/open/floor/plasteel/dark, /area/ship/medical) "VO" = ( @@ -8491,20 +8539,24 @@ /obj/effect/turf_decal/syndicateemblem/middle/right{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Xb" = ( /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 4 }, +/obj/effect/turf_decal/steeldecal/steel_decals10, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xc" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 }, +/obj/machinery/fax, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xf" = ( @@ -8773,6 +8825,13 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"YI" = ( +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "YJ" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /obj/machinery/iv_drip, @@ -8849,6 +8908,9 @@ /obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Zc" = ( @@ -8894,6 +8956,9 @@ /obj/effect/turf_decal/syndicateemblem/middle/right{ dir = 4 }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Zt" = ( @@ -10462,8 +10527,8 @@ nb Ym nb nb -Pv -pp +nb +nb nb Xc Kk @@ -10471,8 +10536,8 @@ mB zp np nb -jv -hj +nb +nb nb nb Fh @@ -10499,17 +10564,17 @@ Hj do wL nb -nb -nb -nb +Pv +jv +Hx ox Xb vL cI bL -nb -nb -nb +aC +Qt +sV nb MP Oj @@ -10537,8 +10602,8 @@ Gv RA nb lq -Qt -dL +YI +EW zy xg pI @@ -10612,7 +10677,7 @@ nb nb YW Tl -PA +kh OK FS kV diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 9d1bdc939fd3..34e77816c941 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -80,6 +80,7 @@ strip_delay = 60 /obj/item/clothing/mask/gas/syndicate/voicechanger + desc = "A close-fitting tactical mask that can be connected to an air supply. This one has an integrated voice changer." var/voice_change = 1 /obj/item/clothing/mask/gas/clown_hat diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index b4b3b24d6d41..ba08e2c36058 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -522,6 +522,7 @@ /datum/outfit/job/syndicate/hos/twink name = "Syndicate - Lieutenant (Twinkleshine)" + job_icon = "lieutenant" uniform = /obj/item/clothing/under/syndicate/aclfgrunt mask = /obj/item/clothing/mask/gas/syndicate/voicechanger @@ -551,7 +552,7 @@ . = ..() assign_codename(H) -/datum/outfit/job/syndicate/hos/suns/ +/datum/outfit/job/syndicate/hos/suns name = "Syndicate - Senior Peacekeeper (SUNS)" uniform = /obj/item/clothing/under/syndicate/suns/pkuniform suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos @@ -571,6 +572,20 @@ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos head = /obj/item/clothing/head/HoS/syndicate/suns +/datum/outfit/job/syndicate/hos/suns/twink + name = "Syndicate - Redshield Officer (SUNS)" + + suit = null + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + ears = null + head = null + suit_store = null + glasses = null + +/datum/outfit/job/syndicate/hos/suns/twink/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + //medical doctors (assorted) /datum/outfit/job/syndicate/doctor From ea14880b5b73c9f2acac97afe37a95ac547a431e Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Tue, 6 Feb 2024 15:47:57 -0300 Subject: [PATCH 17/21] miner --- .../syndicate/syndicate_twinkleshine.dmm | 117 +++++++++--------- .../clothing/outfits/factions/syndicate.dm | 15 ++- 2 files changed, 65 insertions(+), 67 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 14b85222a647..5f2279fce5da 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -77,11 +77,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) -"aC" = ( -/obj/machinery/light/directional/west, -/obj/structure/table/reinforced, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) "aD" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 @@ -173,6 +168,13 @@ }, /turf/open/floor/plating, /area/ship/engineering/atmospherics) +"br" = ( +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "bv" = ( /obj/structure/dresser, /obj/effect/turf_decal/corner/transparent/bar/diagonal, @@ -580,7 +582,7 @@ /area/ship/security) "dL" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 + dir = 8 }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) @@ -1029,20 +1031,19 @@ req_access = list(150, 48); populate = 0 }, -/obj/item/shovel, /obj/item/storage/bag/ore, /obj/item/mining_scanner, /obj/item/mining_scanner, /obj/item/pickaxe/mini, /obj/item/storage/belt/mining/alt, /obj/item/flashlight/seclite, -/obj/item/stack/sheet/mineral/sandbags, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/gloves/explorer, -/obj/item/clothing/mask/gas/explorer, /obj/item/radio/headset/syndicate{ keyslot = null }, +/obj/item/clothing/under/syndicate/suns/workerjumpsuit, +/obj/item/clothing/head/safety_helmet/suns, +/obj/item/clothing/suit/toggle/suns/workervest, +/obj/item/clothing/gloves/suns, /turf/open/floor/pod/dark, /area/ship/cargo) "gI" = ( @@ -1632,6 +1633,22 @@ /obj/item/bedsheet/medical, /turf/open/floor/plasteel/dark, /area/ship/medical) +"jO" = ( +/obj/structure/table/reinforced, +/obj/item/folder/syndicate/red{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/folder/syndicate/blue{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/folder/red{ + pixel_x = -4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "jT" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -1708,15 +1725,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/security) -"kh" = ( -/obj/effect/turf_decal/syndicateemblem/middle/middle{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/bridge) "kl" = ( /obj/machinery/light/directional/north, /obj/structure/closet/secure_closet{ @@ -3223,11 +3231,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) -"sV" = ( -/obj/item/clothing/suit/space/hardsuit/security/suns, -/obj/machinery/suit_storage_unit/inherit, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) "sW" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -4555,6 +4558,15 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"Bi" = ( +/obj/effect/turf_decal/syndicateemblem/middle/middle{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "Bj" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 @@ -5241,12 +5253,6 @@ /obj/effect/turf_decal/radiation, /turf/open/floor/engine, /area/ship/engineering/engine) -"EW" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/bridge) "EX" = ( /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 @@ -5833,19 +5839,8 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "Hx" = ( -/obj/structure/table/reinforced, -/obj/item/folder/syndicate/red{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/item/folder/syndicate/blue{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/folder/red{ - pixel_x = -4 - }, /obj/machinery/light/directional/west, +/obj/structure/table/reinforced, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "HF" = ( @@ -6567,6 +6562,11 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) +"Lw" = ( +/obj/item/clothing/suit/space/hardsuit/security/suns, +/obj/machinery/suit_storage_unit/inherit, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "LF" = ( /obj/effect/turf_decal/atmos/air{ dir = 8 @@ -7135,7 +7135,7 @@ dir = 1 }, /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 + dir = 4 }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) @@ -7939,6 +7939,12 @@ }, /turf/open/floor/plasteel/dark, /area/ship/security) +"Tv" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "TC" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 6 @@ -8825,13 +8831,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) -"YI" = ( -/obj/effect/turf_decal/syndicateemblem/middle/middle, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/bridge) "YJ" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /obj/machinery/iv_drip, @@ -10566,15 +10565,15 @@ wL nb Pv jv -Hx +jO ox Xb vL cI bL -aC +Hx Qt -sV +Lw nb MP Oj @@ -10602,14 +10601,14 @@ Gv RA nb lq -YI -EW +br +dL zy xg pI Zk bd -PA +Bi kE wr nb @@ -10677,13 +10676,13 @@ nb nb YW Tl -kh +PA OK FS kV mx WZ -dL +Tv HL tZ nb diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index ba08e2c36058..137c8e4c5cd7 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -189,7 +189,7 @@ to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!") /datum/outfit/job/syndicate/bartender/twink - name = "Syndicate - Bartender (Twinkleshine)" + name = "Syndicate - Bartender (Twinkleshine, Donk)" uniform = /obj/item/clothing/under/syndicate/donk id = /obj/item/card/id/syndicate_command/crew_id @@ -521,7 +521,7 @@ name = "Syndicate - Sergeant (Gorlex)" /datum/outfit/job/syndicate/hos/twink - name = "Syndicate - Lieutenant (Twinkleshine)" + name = "Syndicate - Lieutenant (Twinkleshine, NGR)" job_icon = "lieutenant" uniform = /obj/item/clothing/under/syndicate/aclfgrunt @@ -573,7 +573,7 @@ head = /obj/item/clothing/head/HoS/syndicate/suns /datum/outfit/job/syndicate/hos/suns/twink - name = "Syndicate - Redshield Officer (SUNS)" + name = "Syndicate - Redshield Officer (Twinkleshine, SUNS)" suit = null mask = /obj/item/clothing/mask/gas/syndicate/voicechanger @@ -668,7 +668,7 @@ suit = /obj/item/clothing/suit/toggle/labcoat/raincoat /datum/outfit/job/syndicate/paramedic/twink - name = "Syndicate - Medic (Twinkleshine)" + name = "Syndicate - Medic (Twinkleshine, Cybersun)" mask = /obj/item/clothing/mask/gas/syndicate/voicechanger uniform = /obj/item/clothing/under/rank/medical/doctor/red @@ -893,19 +893,18 @@ ears = /obj/item/radio/headset/alt /datum/outfit/job/syndicate/miner/twink - name = "Syndicate - Miner (Twinkleshine)" + name = "Syndicate - Miner (Twinkleshine, SUNS)" - uniform = /obj/item/clothing/under/syndicate/coldres + uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit mask = /obj/item/clothing/mask/gas/syndicate/voicechanger id = /obj/item/card/id/syndicate_command/crew_id - shoes = /obj/item/clothing/shoes/workboots + shoes = /obj/item/clothing/shoes/jackboots/suns glasses = null gloves = null ears = null r_pocket = null l_pocket = null belt = null - implants = list(/obj/item/implant/weapons_auth) backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec From 5dca0df5c80ee70f1ce140a6a30befdfab0b56a6 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Wed, 7 Feb 2024 14:47:55 -0300 Subject: [PATCH 18/21] review --- .../syndicate/syndicate_twinkleshine.dmm | 1742 ++++++++--------- .../clothing/outfits/factions/syndicate.dm | 2 +- 2 files changed, 848 insertions(+), 896 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 5f2279fce5da..b4f0f4c26301 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -39,8 +39,17 @@ /turf/open/floor/plating, /area/ship/hallway/aft) "aj" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "ak" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -78,10 +87,43 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "aD" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ +/obj/structure/sign/poster/contraband/m90{ + icon_state = "poster-m90"; + pixel_x = -32 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/obj/machinery/photocopier, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "syndicate"; + name = "lieutenant locker"; + req_access = list(3,150) + }, +/obj/item/clothing/under/syndicate/officer, +/obj/item/clothing/suit/gorlex, +/obj/item/clothing/head/gorlexcap, +/obj/item/clothing/shoes/combat, +/obj/item/megaphone/sec{ + name = "syndicate megaphone" + }, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/clothing/head/HoS/beret/syndicate, +/obj/item/radio/headset/syndicate/alt/leader, +/obj/item/clothing/gloves/krav_maga/combatglovesplus, +/obj/item/ammo_box/magazine/m10mm/ap, +/obj/item/ammo_box/magazine/m10mm/ap, +/obj/item/clothing/suit/armor/hos/trenchcoat, +/obj/machinery/button/door{ + pixel_x = 9; + pixel_y = 25; + id = "twinkle_armory"; + name = "Armory Access"; + req_access = list(3,150) + }, /turf/open/floor/mineral/plastitanium, /area/ship/security) "aE" = ( @@ -93,10 +135,22 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "aG" = ( -/obj/machinery/light/directional/east, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) +/obj/structure/closet/secure_closet/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/item/kitchen/knife, +/obj/item/cutting_board, +/obj/item/clothing/under/suit/waiter/syndicate, +/obj/item/clothing/suit/hazardvest/donk, +/obj/item/clothing/under/syndicate/donk, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "aX" = ( /obj/effect/turf_decal/syndicateemblem/middle/right{ dir = 8 @@ -401,19 +455,19 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "cL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "cT" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -428,22 +482,26 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "cW" = ( -/obj/machinery/light/directional/north, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/storage/box/ingredients/carnivore, -/obj/item/storage/box/ingredients/vegetarian, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/turf/open/floor/carpet/red, -/area/ship/crew/canteen) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ + dir = 1 + }, +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10); + dir = 4; + name = "Engineering Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/engine, +/area/ship/engineering/engine) "cX" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -528,24 +586,30 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "dp" = ( +/obj/effect/turf_decal/industrial/warning, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/port) +/turf/open/floor/pod/dark, +/area/ship/cargo) "dq" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 +/obj/structure/table/reinforced, +/obj/machinery/computer/secure_data/laptop{ + dir = 8; + pixel_y = 6; + pixel_x = 1 }, -/obj/machinery/suit_storage_unit/syndicate{ - suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/sbg; - name = "lieutenant's suit storage unit" +/obj/machinery/door/window/brigdoor/eastright, +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "dz" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -608,17 +672,10 @@ /turf/open/floor/engine/o2, /area/ship/engineering/atmospherics) "dU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/sign/poster/official/moth{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/light/directional/east, +/obj/structure/chair/stool/bar{ + dir = 8 }, /turf/open/floor/wood, /area/ship/crew/canteen) @@ -653,19 +710,28 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "eg" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/button/door{ - dir = 4; - pixel_x = -25; - name = "Engine Shutters"; - id = "twinkle_engines" +/obj/machinery/power/terminal{ + dir = 8 }, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 1 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "en" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -765,8 +831,8 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "eQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "eR" = ( /obj/structure/grille, @@ -859,22 +925,26 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "fN" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/wood{ - color = "#422C14" +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ + dir = 1 }, -/area/ship/crew/canteen) +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10); + dir = 4; + name = "Engineering Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ship/engineering/engine) "fO" = ( /obj/structure/railing, /obj/structure/railing{ @@ -886,13 +956,12 @@ /turf/open/floor/plating, /area/ship/external/dark) "fQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/obj/structure/closet/crate/bin, +/turf/open/floor/wood, +/area/ship/crew/canteen) "fT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -950,17 +1019,11 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "gk" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 - }, -/obj/machinery/door/poddoor{ - id = "twinkle_armory" + dir = 6 }, /turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) +/area/ship/security) "gm" = ( /obj/effect/turf_decal/industrial/warning, /obj/structure/cable{ @@ -985,17 +1048,18 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "gv" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "gz" = ( /obj/structure/cable/yellow{ @@ -1238,13 +1302,18 @@ /area/ship/crew/dorm) "hZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "ia" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -1288,21 +1357,13 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ih" = ( -/obj/structure/chair/stool/bar{ +/obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ +/obj/structure/chair/stool/bar{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/wood{ - color = "#422C14" - }, +/turf/open/floor/wood, /area/ship/crew/canteen) "ii" = ( /obj/effect/turf_decal/corner/opaque/syndiered/full, @@ -1357,18 +1418,11 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "iu" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance/four, -/obj/item/reagent_containers/food/snacks/burger/red{ - name = "suspicious red burger"; - desc = "A suspicious looking burger."; - color = "#730622" +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) +/turf/open/floor/wood, +/area/ship/crew/canteen) "iz" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 @@ -1399,19 +1453,26 @@ /area/ship/engineering/engine) "iC" = ( /obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 4 + dir = 8 }, -/turf/open/floor/plating, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "iG" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/turf/open/floor/wood{ - color = "#422C14" +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/area/ship/crew/canteen) +/obj/effect/turf_decal/techfloor/orange, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/engineering/atmospherics) "iI" = ( /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) @@ -1559,18 +1620,14 @@ dir = 4 }, /obj/machinery/door/window, -/turf/open/floor/wood{ - color = "#422C14" - }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/wood, /area/ship/crew/canteen) "jr" = ( -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/components/binary/volume_pump{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "jv" = ( /turf/open/floor/mineral/plastitanium, @@ -1754,13 +1811,9 @@ /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "ky" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/computer/atmos_control/tank/air_tank{ - dir = 8 - }, -/turf/open/floor/plating, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "kE" = ( /obj/effect/turf_decal/syndicateemblem/top/right, @@ -1946,19 +1999,25 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "lv" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "lw" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - pixel_y = 4 +/obj/machinery/door/airlock/atmos/glass{ + req_one_access_txt = "150"; + req_access = list(150,10); + dir = 4 }, -/turf/open/floor/wood{ - color = "#422C14" +/obj/structure/cable/yellow{ + icon_state = "4-10" }, -/area/ship/crew/canteen) +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) "lx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -2019,25 +2078,34 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "lY" = ( -/obj/machinery/holopad/emergency/bar, -/turf/open/floor/carpet/red, +/obj/structure/cable/yellow{ + icon_state = "4-9" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/turf/open/floor/wood, /area/ship/crew/canteen) "ma" = ( -/obj/structure/sign/donk, -/turf/closed/wall/r_wall/syndicate/nodiagonal{ - rad_insulation = 0 +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, +/turf/open/floor/wood, /area/ship/crew/canteen) "ml" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/door/airlock/public/glass, -/turf/open/floor/plasteel/tech, +/turf/open/floor/wood, /area/ship/crew/canteen) "mm" = ( /obj/structure/chair{ @@ -2053,10 +2121,13 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "mo" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/computer/atmos_control/tank/air_tank{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "mp" = ( /turf/template_noop, @@ -2271,7 +2342,21 @@ /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 1 }, -/turf/open/floor/plating, +/obj/item/trash/pistachios, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "nr" = ( /obj/structure/table, @@ -2287,12 +2372,13 @@ /turf/open/floor/mineral/plastitanium, /area/ship/security) "nt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/obj/machinery/suit_storage_unit/syndicate{ + suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/sbg; + name = "lieutenant's suit storage unit" }, -/obj/machinery/door/airlock/grunge, /turf/open/floor/mineral/plastitanium, /area/ship/security) "nw" = ( @@ -2387,25 +2473,15 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "oB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering{ - req_access = list(150,10); - dir = 4 - }, -/turf/open/floor/engine, -/area/ship/engineering/engine) +/obj/machinery/firealarm/directional/east, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "oC" = ( /obj/effect/turf_decal/corner/opaque/orange{ dir = 6 @@ -2534,28 +2610,11 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "pj" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/steeldecal/steel_decals_central7, -/turf/open/floor/wood{ - color = "#422C14" - }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/wood, /area/ship/crew/canteen) "pl" = ( /obj/effect/turf_decal/techfloor{ @@ -2626,17 +2685,15 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "pw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/light/directional/north, +/obj/structure/chair/office/dark{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "pB" = ( /obj/machinery/power/terminal{ dir = 1 @@ -2704,15 +2761,14 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "pL" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor/eastleft, -/obj/machinery/door/window/brigdoor/westright{ - req_access = list(3,150) +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 1 }, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/engineering/atmospherics) "pN" = ( /obj/structure/closet/secure_closet/security{ populate = 0; @@ -2846,16 +2902,17 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "qA" = ( -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-6" +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 }, -/obj/structure/railing/corner/wood, -/turf/open/floor/wood{ - color = "#422C14" +/obj/structure/cable/yellow{ + icon_state = "0-2" }, +/obj/effect/turf_decal/steeldecal/steel_decals_central7, +/turf/open/floor/wood, /area/ship/crew/canteen) "qF" = ( /obj/structure/table, @@ -2924,16 +2981,23 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/office) "qP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/wood, +/obj/machinery/light/directional/north, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/storage/box/ingredients/carnivore, +/obj/item/storage/box/ingredients/vegetarian, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/effect/spawner/lootdrop/donkpockets, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "qQ" = ( /obj/machinery/telecomms/broadcaster/preset_right{ @@ -3097,14 +3161,13 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "sj" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "sk" = ( /obj/effect/turf_decal/industrial/warning{ @@ -3239,25 +3302,27 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/engineering/engine) "sY" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/light/directional/east, -/turf/open/floor/plating, +/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "tg" = ( -/obj/machinery/door/airlock/medical/glass{ - req_one_access_txt = "150"; - req_access = list(150); - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, -/area/ship/medical) +/turf/open/floor/plasteel/patterned, +/area/ship/engineering/atmospherics) "th" = ( /obj/effect/turf_decal/industrial/caution{ dir = 4 @@ -3278,10 +3343,7 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "tl" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8 - }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "tn" = ( /obj/item/kirbyplants/random, @@ -3291,8 +3353,8 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "tp" = ( -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/pod/dark, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/pod/light, /area/ship/cargo) "tr" = ( /obj/effect/turf_decal/corner/opaque/syndiered/border{ @@ -3338,19 +3400,15 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "tU" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/wood{ - color = "#422C14" +/obj/item/trash/candy, +/obj/effect/turf_decal/techfloor/orange{ + dir = 9 }, -/area/ship/crew/canteen) +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/engineering/atmospherics) "tY" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3474,34 +3532,27 @@ req_access = list(150); dir = 4 }, +/obj/effect/turf_decal/corner/opaque/syndiered/full, /obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, /turf/open/floor/plasteel/dark, /area/ship/medical) "uY" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "vd" = ( /obj/machinery/porta_turret/ship/syndicate/heavy{ @@ -3558,21 +3609,20 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "vE" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/chair/office/dark{ - dir = 4 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/button/door{ - pixel_x = 9; - pixel_y = 25; - id = "twinkle_armory"; - name = "Armory Access"; - req_access = list(3,150) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "vJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3677,7 +3727,9 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "wm" = ( -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "wr" = ( /obj/machinery/airalarm/directional/south, @@ -3708,22 +3760,19 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "wz" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/door/airlock/atmos/glass{ + req_one_access_txt = "150"; + req_access = list(150,10); + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/wood{ - color = "#422C14" +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 8 }, -/area/ship/crew/canteen) +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) "wA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/dirt/dust, @@ -3893,10 +3942,16 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "xh" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 10 +/obj/machinery/power/terminal{ + dir = 8 }, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 9 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "xj" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -3968,14 +4023,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "xz" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -4224,19 +4277,14 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "zi" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "zk" = ( /obj/machinery/door/airlock/external{ @@ -4255,27 +4303,37 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "zr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "zs" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 1 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/button/door{ - dir = 4; - pixel_x = -25; - name = "Engine Shutters"; - id = "twinkle_engines" +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "zy" = ( /obj/effect/turf_decal/syndicateemblem/bottom/middle{ @@ -4454,11 +4512,18 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Aq" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 9 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "At" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4518,16 +4583,22 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "AL" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter"; - req_access = list(150,10); - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/engine, -/area/ship/engineering/engine) +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/hallway/port) "AQ" = ( /obj/structure/chair{ dir = 4 @@ -5234,11 +5305,10 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "EQ" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/dark, /area/ship/cargo) "ER" = ( @@ -5263,15 +5333,15 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Fa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/light/directional/west, +/obj/structure/cable/yellow{ + icon_state = "1-6" }, -/turf/open/floor/wood{ - color = "#422C14" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/chair/stool/bar{ + dir = 4 }, +/turf/open/floor/wood, /area/ship/crew/canteen) "Fc" = ( /obj/effect/turf_decal/techfloor, @@ -5638,8 +5708,9 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Gx" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/open/floor/plating, +/obj/machinery/light/directional/east, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "Gy" = ( /obj/structure/cable/yellow{ @@ -5658,10 +5729,19 @@ /turf/open/floor/plating, /area/ship/hallway/starboard) "GC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "4-8" }, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "GD" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ @@ -5804,16 +5884,20 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Hk" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/plating, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "Ht" = ( /obj/machinery/telecomms/receiver/preset_right{ @@ -5894,23 +5978,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) -"HY" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/secure_data/laptop{ +"Ib" = ( +/obj/machinery/door/window/eastright{ dir = 8; - pixel_y = 6; - pixel_x = 1 - }, -/obj/machinery/door/window/brigdoor/eastright, -/obj/machinery/door/window/brigdoor/westleft{ - req_access = list(3,150) - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) -"Ib" = ( -/obj/machinery/door/window/eastright{ - dir = 8; - req_one_access_txt = "150" + req_one_access_txt = "150" }, /obj/machinery/mass_driver{ dir = 4; @@ -5975,12 +6046,14 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ii" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 4 + }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/turf/open/floor/wood{ - color = "#422C14" - }, +/turf/open/floor/wood, /area/ship/crew/canteen) "Il" = ( /obj/effect/turf_decal/techfloor, @@ -6031,38 +6104,19 @@ /turf/open/floor/plating, /area/ship/hallway/port) "IC" = ( -/obj/structure/sign/poster/contraband/m90{ - icon_state = "poster-m90"; - pixel_x = -32 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 - }, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "syndicate"; - name = "lieutenant locker"; - req_access = list(3,150) +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/item/clothing/under/syndicate/officer, -/obj/item/clothing/suit/gorlex, -/obj/item/clothing/head/gorlexcap, -/obj/item/clothing/shoes/combat, -/obj/item/megaphone/sec{ - name = "syndicate megaphone" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/item/gun/ballistic/automatic/pistol/no_mag, -/obj/item/clothing/head/HoS/beret/syndicate, -/obj/item/radio/headset/syndicate/alt/leader, -/obj/item/clothing/gloves/krav_maga/combatglovesplus, -/obj/item/ammo_box/magazine/m10mm/ap, -/obj/item/ammo_box/magazine/m10mm/ap, -/obj/item/clothing/suit/armor/hos/trenchcoat, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plating, +/area/ship/hallway/port) "ID" = ( /obj/effect/turf_decal/siding/wood/end{ dir = 1 @@ -6196,25 +6250,19 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Jz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/machinery/door/airlock/engineering{ - req_access = list(150,10); - dir = 8 +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/engine, -/area/ship/engineering/engine) +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/hallway/port) "JA" = ( /obj/effect/turf_decal/industrial/warning/corner, /obj/structure/cable{ @@ -6288,18 +6336,19 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "Ke" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "Kg" = ( /obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ @@ -6350,20 +6399,10 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Ku" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "Kw" = ( /obj/machinery/door/poddoor{ @@ -6379,18 +6418,14 @@ pixel_x = -1; pixel_y = 1 }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "Ky" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/light/directional/east, -/obj/structure/railing/wood, -/obj/structure/closet/crate/bin, -/turf/open/floor/wood{ - color = "#422C14" +/obj/machinery/camera/autoname{ + dir = 8 }, +/turf/open/floor/wood, /area/ship/crew/canteen) "Kz" = ( /obj/structure/cable/yellow{ @@ -6479,19 +6514,18 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "KJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/door/airlock/grunge, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/starboard) +/turf/open/floor/mineral/plastitanium, +/area/ship/security) "KK" = ( /obj/machinery/cryopod/syndicate{ dir = 8 @@ -6521,14 +6555,19 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/port) "KU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "La" = ( /obj/structure/chair/stool{ @@ -6598,16 +6637,46 @@ /area/ship/crew/dorm) "LH" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/structure/closet/cardboard{ + name = "mot containment box"; + desc = "WARNING: Contains mot." }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 +/obj/item/storage/box/syndimaid, +/obj/item/trash/cheesie, +/mob/living/carbon/human/species/moth{ + name = "Secret Box Moth"; + real_name = "Box Moth"; + gender = "female"; + faction = list("neutral","playerSyndicate") }, -/turf/open/floor/plating, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_y = 12; + pixel_x = 10 + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_x = -9; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_x = 7 + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_x = -2; + pixel_y = 14 + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_y = -5; + pixel_x = -6 + }, +/obj/structure/sign/poster/contraband/syndiemoth{ + pixel_x = -32; + desc = "A Syndicate-commissioned poster that uses Syndie Moth(TM?) to tell the viewer to keep the nuclear authentication disk unsecured. It's signed by 'AspEv'." + }, +/obj/item/toy/balloon/syndicate, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "LX" = ( /obj/machinery/power/shuttle/engine/electric{ @@ -6643,19 +6712,8 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "Mo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "Mq" = ( /obj/effect/turf_decal/industrial/warning, @@ -6749,15 +6807,17 @@ /turf/open/floor/circuit/red, /area/ship/engineering/communications) "MZ" = ( -/obj/machinery/door/airlock/atmos/glass{ - req_one_access_txt = "150"; - req_access = list(150,10); +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "0-4" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 10 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "Na" = ( /obj/effect/turf_decal/industrial/warning, @@ -7008,37 +7068,40 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "OS" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/item/trash/pistachios, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "OY" = ( /obj/structure/bed, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "OZ" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/machinery/button/door{ + dir = 4; + pixel_x = -25; + name = "Engine Shutters"; + id = "twinkle_engines" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "Pa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -7160,11 +7223,16 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "PE" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 1 +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/item/trash/candy, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 10 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "PL" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -7218,22 +7286,12 @@ /turf/open/floor/plasteel, /area/ship/crew/dorm) "Qa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-9" - }, -/turf/open/floor/plasteel/stairs/wood{ - dir = 4 - }, -/area/ship/crew/canteen) -"Qd" = ( -/obj/effect/turf_decal/corner/opaque/orange{ - dir = 5 +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"Qd" = ( +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 5 }, /obj/machinery/power/port_gen/pacman, /obj/structure/cable/yellow{ @@ -7336,20 +7394,14 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Qv" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/structure/sign/poster/official/moth{ + pixel_x = 32 }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/public/glass, -/turf/open/floor/plasteel/tech, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood, /area/ship/crew/canteen) "QC" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -7436,25 +7488,29 @@ /area/ship/engineering) "Rc" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "Rd" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-8" }, -/turf/open/floor/plating, +/obj/structure/closet/emcloset, +/obj/effect/spawner/lootdrop/maintenance/four, +/obj/item/reagent_containers/food/snacks/burger/red{ + name = "suspicious red burger"; + desc = "A suspicious looking burger."; + color = "#730622" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "Rh" = ( /obj/effect/turf_decal/industrial/warning{ @@ -7471,15 +7527,17 @@ "Rj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/light/directional/east, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "1-5" + icon_state = "2-8" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/techfloor/orange{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "Ru" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -7722,15 +7780,8 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "Sv" = ( -/obj/machinery/door/airlock/atmos/glass{ - req_one_access_txt = "150"; - req_access = list(150,10); - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-10" - }, -/turf/open/floor/plating, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "Sy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -7775,60 +7826,39 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "SI" = ( -/obj/item/trash/syndi_cakes, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "0-2" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "SK" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/structure/closet/cardboard{ - name = "mot containment box"; - desc = "WARNING: Contains mot." - }, -/obj/item/storage/box/syndimaid, -/obj/item/trash/cheesie, -/mob/living/carbon/human/species/moth{ - name = "Secret Box Moth"; - real_name = "Box Moth"; - gender = "female"; - faction = list("neutral","playerSyndicate") - }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_y = 12; - pixel_x = 10 - }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_x = -9; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_x = 7 - }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_x = -2; - pixel_y = 14 +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_y = -5; - pixel_x = -6 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/structure/sign/poster/contraband/syndiemoth{ - pixel_x = -32; - desc = "A Syndicate-commissioned poster that uses Syndie Moth(TM?) to tell the viewer to keep the nuclear authentication disk unsecured. It's signed by 'AspEv'." +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/item/toy/balloon/syndicate, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "SM" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -7906,16 +7936,16 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Tn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/hallway/port) "Tq" = ( @@ -7968,29 +7998,34 @@ /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "TM" = ( -/obj/structure/closet/secure_closet/wall{ - dir = 8; - pixel_x = 28 +/obj/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter"; + req_access = list(150,10); + dir = 4 }, -/obj/item/kitchen/knife, -/obj/item/cutting_board, -/obj/item/clothing/under/suit/waiter/syndicate, -/obj/item/clothing/suit/hazardvest/donk, -/obj/item/clothing/under/syndicate/donk, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/radio/headset/syndicate{ - keyslot = null +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, -/turf/open/floor/carpet/red, -/area/ship/crew/canteen) +/turf/open/floor/engine, +/area/ship/engineering/engine) "TR" = ( -/obj/machinery/power/terminal{ - dir = 8 +/obj/item/trash/syndi_cakes, +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "1-4" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "TT" = ( /obj/machinery/vending/wallmed{ @@ -8022,25 +8057,35 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ua" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/button/door{ + dir = 4; + pixel_x = -25; + name = "Engine Shutters"; + id = "twinkle_engines" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "Uc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor{ + id = "twinkle_armory" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "Uf" = ( /obj/item/wallframe/extinguisher_cabinet{ pixel_y = 17; @@ -8091,12 +8136,32 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ux" = ( -/obj/structure/table/wood, -/obj/item/clothing/head/chefhat{ - pixel_x = 7 +/obj/machinery/door/airlock/medical/glass{ + req_one_access_txt = "150"; + req_access = list(150); + dir = 4 }, -/turf/open/floor/carpet/red, -/area/ship/crew/canteen) +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/syndiered/full, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/medical) "UA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -8143,20 +8208,20 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "UF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered/border{ + dir = 1 }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/borderfloorblack, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/plating, -/area/ship/hallway/port) +/obj/machinery/door/airlock/public/glass, +/turf/open/floor/plasteel/tech, +/area/ship/crew/canteen) "UH" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /turf/open/floor/plasteel/dark, @@ -8191,13 +8256,7 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "UW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/railing/wood, -/turf/open/floor/wood{ - color = "#422C14" - }, +/turf/open/floor/wood, /area/ship/crew/canteen) "Va" = ( /obj/structure/sign/syndicate, @@ -8214,18 +8273,10 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Vk" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) +/turf/open/floor/pod/light, +/area/ship/cargo) "Vu" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ dir = 4 @@ -8276,11 +8327,12 @@ /turf/open/floor/plating, /area/ship/cargo) "VG" = ( -/obj/structure/railing/wood, -/turf/open/floor/wood{ - color = "#422C14" +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/area/ship/crew/canteen) +/turf/open/floor/pod/dark, +/area/ship/cargo) "VH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -8342,9 +8394,19 @@ /area/ship/crew/canteen) "VU" = ( /obj/structure/table/wood, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/donkpockets, /obj/machinery/door/firedoor/border_only, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_y = 3; + pixel_x = -3 + }, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "VY" = ( @@ -8453,16 +8515,12 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "WC" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter"; - req_access = list(150,10); - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/purple/visible, +/obj/effect/turf_decal/techfloor/orange{ + dir = 10 }, -/turf/open/floor/engine, -/area/ship/engineering/engine) +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/engineering/atmospherics) "WG" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -8523,9 +8581,16 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "WV" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter"; + req_access = list(150,10); + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ship/engineering/engine) "WX" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 @@ -8567,8 +8632,10 @@ /area/ship/bridge) "Xf" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, /obj/machinery/door/firedoor/border_only, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "Xg" = ( @@ -8648,25 +8715,13 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "XN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 1 + dir = 10 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/atmospherics) "XU" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -8718,21 +8773,17 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Yl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/corner/opaque/syndiered/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/borderfloorblack, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plating, -/area/ship/hallway/port) +/obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/crew/canteen) "Ym" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -8809,18 +8860,17 @@ /turf/open/floor/plating, /area/ship/hallway/port) "YB" = ( -/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light/directional/east, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/plasteel/patterned, /area/ship/engineering/atmospherics) "YF" = ( /obj/effect/turf_decal/corner/opaque/syndiered/border{ @@ -8874,11 +8924,17 @@ /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "YR" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/eastleft, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/obj/machinery/light/directional/north, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "YT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -9085,7 +9141,6 @@ mp mp mp mp -mp UN UN UN @@ -9105,7 +9160,6 @@ mp mp mp mp -mp "} (2,1,1) = {" mp @@ -9114,7 +9168,6 @@ mp mp mp mp -mp ms ae LX @@ -9142,12 +9195,10 @@ mp mp mp mp -mp "} (3,1,1) = {" mp mp -mp Pz LX ae @@ -9179,36 +9230,34 @@ LX Pz mp mp -mp "} (4,1,1) = {" mp mp -mp FR NO iJ wM FR -PE -sj -SK +tU +aj LH Hk iC sj +MZ uP nk NK RE ch -uY Aq uY OS nq -sj +pL aj +WC FR NO iJ @@ -9216,69 +9265,64 @@ wM FR mp mp -mp "} (5,1,1) = {" mp mp -mp FR -TR xh XN eg OZ cL KU -Vk +zi xw hZ Rc +SK iL Fm DK IU si -pw Rj YB gv -KU +tg zi Ke zs Ua SI TR +PE FR mp mp -mp "} (6,1,1) = {" mp mp -mp FR -iu Rd Ku zr wm tl -aG +jr Gx -tl +Sv +jr FR -MZ +wz UN UN UN UN UN -Sv +lw FR -tl jr sY ky @@ -9287,13 +9331,12 @@ lv eQ Mo GC +iG FR mp mp -mp "} (7,1,1) = {" -mp FR FR FR @@ -9327,10 +9370,8 @@ FR FR FR FR -mp "} (8,1,1) = {" -mp qM bY lj @@ -9364,10 +9405,8 @@ qz ni BE gh -mp "} (9,1,1) = {" -mp gh xW SA @@ -9401,10 +9440,8 @@ qz aa Pn gh -mp "} (10,1,1) = {" -mp FR FR ZX @@ -9438,11 +9475,9 @@ FR FR FR FR -mp "} (11,1,1) = {" mp -mp pF CB Sp @@ -9475,12 +9510,10 @@ Ot FR mp mp -mp "} (12,1,1) = {" mp mp -mp ZX ZX ED @@ -9512,13 +9545,11 @@ FR FR mp mp -mp "} (13,1,1) = {" mp mp mp -mp ZX Qd bM @@ -9532,7 +9563,7 @@ Zz Zz ZD ZD -WC +WV ZD ZD um @@ -9549,13 +9580,11 @@ FR mp mp mp -mp "} (14,1,1) = {" mp mp mp -mp ZX fz zK @@ -9586,13 +9615,11 @@ FR mp mp mp -mp "} (15,1,1) = {" mp mp mp -mp ZX WK pB @@ -9606,7 +9633,7 @@ ZD ZD ZD ZD -AL +TM ZD ZD ZD @@ -9623,13 +9650,11 @@ FR mp mp mp -mp "} (16,1,1) = {" mp mp mp -mp ZX wP oC @@ -9660,7 +9685,6 @@ FR mp mp mp -mp "} (17,1,1) = {" ms @@ -9672,8 +9696,7 @@ xj xj xj xj -xj -oB +fN ZD Na vJ @@ -9696,19 +9719,17 @@ kT Bj Bj Bj -Bj We "} (18,1,1) = {" xj -lw -iG -Ii Ii +iu jo pj qA Fa +fQ xj Kq ZD @@ -9734,20 +9755,18 @@ sd yN nr Bj -Bj "} (19,1,1) = {" xj -xj -cW +qP sf -Ux Kx -fN -VG +ih +UW Qa +lY xj -Jz +cW ZD ZD ZD @@ -9771,19 +9790,17 @@ sd ET ET Bj -Bj "} (20,1,1) = {" -mp ML dD sf -sf VU -wz +ih +UW UW -qP ma +xj VH yF oX @@ -9802,26 +9819,24 @@ PL YO ji wg -gk +Uc mO sd ET fK Bj -mp "} (21,1,1) = {" -mp ML Yo sf -lY Xf -tU -VG -qP +ih +UW +Qa ml Yl +Jz DW ea Nh @@ -9845,20 +9860,18 @@ sd da kH Bj -mp "} (22,1,1) = {" -mp xj wb -TM -sf +aG VO ih Ky dU Qv UF +AL lT uH vz @@ -9882,10 +9895,8 @@ sd Bj Bj Bj -mp "} (23,1,1) = {" -mp xj xj xj @@ -9895,7 +9906,7 @@ xj xj xj xj -dp +Tn WL vz eF @@ -9919,10 +9930,8 @@ EG da pN Bj -mp "} (24,1,1) = {" -mp JM hP Ed @@ -9947,8 +9956,8 @@ sO QC Cq Bj -IC aD +nt oc Eh Tt @@ -9956,10 +9965,8 @@ EG ET ET Bj -mp "} (25,1,1) = {" -mp Wd Wd Wd @@ -9982,21 +9989,19 @@ sp Ee sp TU -KJ +vE Bj -YR -ET -WV +pw +ow +gk oG Tt EG ET ET Bj -mp "} (26,1,1) = {" -mp Wd Zt Yn @@ -10021,19 +10026,17 @@ sp WX Fl Bj -vE -ow +YR dq Bj +Bj Tt sd da fJ Bj -mp "} (27,1,1) = {" -mp Wd Sb Zu @@ -10043,7 +10046,7 @@ DF ps No JM -Tn +IC tH sp qN @@ -10058,19 +10061,17 @@ sp wh Pe Bj -pL -HY -Bj +ET +ET +ET Bj Dp sd Bj Bj Bj -mp "} (28,1,1) = {" -mp Wd KK cj @@ -10094,7 +10095,7 @@ GG sp wh Gy -nt +KJ sG Gk HH @@ -10104,10 +10105,8 @@ sd da pN Bj -mp "} (29,1,1) = {" -mp Wd Va Wd @@ -10141,11 +10140,9 @@ sd ET fK Bj -mp "} (30,1,1) = {" mp -mp lo CV Go @@ -10178,17 +10175,15 @@ EG ET ET Bj -mp "} (31,1,1) = {" mp -mp VC AW ZC Um -Um tp +VG Bw Wj IB @@ -10196,7 +10191,7 @@ nE IN wu If -KM +oB KM yX KM @@ -10215,17 +10210,15 @@ eN da Bn Bj -mp "} (32,1,1) = {" -mp JT VC AW UK EO -fQ EQ +dp Bs KQ yz @@ -10234,8 +10227,8 @@ ex dz dz dz -tg uX +Ux uh uh dz @@ -10252,16 +10245,14 @@ CQ Bj Bj Bj -mp "} (33,1,1) = {" mp -mp vQ dg NT Wo -Uc +Vk ng vn KA @@ -10289,11 +10280,9 @@ gW Yv qL Bj -mp "} (34,1,1) = {" mp -mp jT Bw Bw @@ -10326,13 +10315,11 @@ cd Bj Bj Bj -mp "} (35,1,1) = {" mp mp mp -mp Bw Bw Bw @@ -10363,14 +10350,12 @@ Bj Bj mp mp -mp "} (36,1,1) = {" mp mp mp mp -mp He IV Ya @@ -10400,13 +10385,11 @@ mp mp mp mp -mp "} (37,1,1) = {" mp mp mp -mp ZV He yn @@ -10437,14 +10420,12 @@ xZ mp mp mp -mp "} (38,1,1) = {" mp mp mp mp -mp vd NE NE @@ -10474,7 +10455,6 @@ mp mp mp mp -mp "} (39,1,1) = {" mp @@ -10484,7 +10464,6 @@ mp mp mp mp -mp NE RB mG @@ -10511,7 +10490,6 @@ mp mp mp mp -mp "} (40,1,1) = {" mp @@ -10520,7 +10498,6 @@ mp mp mp mp -mp nb nb Ym @@ -10548,7 +10525,6 @@ mp mp mp mp -mp "} (41,1,1) = {" mp @@ -10557,7 +10533,6 @@ mp mp mp mp -mp Kw Hj do @@ -10585,7 +10560,6 @@ mp mp mp mp -mp "} (42,1,1) = {" mp @@ -10594,7 +10568,6 @@ mp mp mp mp -mp Kw bo Gv @@ -10622,7 +10595,6 @@ mp mp mp mp -mp "} (43,1,1) = {" mp @@ -10631,7 +10603,6 @@ mp mp mp mp -mp Kw eL Fq @@ -10659,7 +10630,6 @@ mp mp mp mp -mp "} (44,1,1) = {" mp @@ -10668,7 +10638,6 @@ mp mp mp mp -mp nb nb PB @@ -10696,7 +10665,6 @@ mp mp mp mp -mp "} (45,1,1) = {" mp @@ -10705,7 +10673,6 @@ mp mp mp mp -mp nb Uf Jr @@ -10733,7 +10700,6 @@ mp mp mp mp -mp "} (46,1,1) = {" mp @@ -10742,7 +10708,6 @@ mp mp mp mp -mp nb iK jG @@ -10770,7 +10735,6 @@ mp mp mp mp -mp "} (47,1,1) = {" mp @@ -10779,7 +10743,6 @@ mp mp mp mp -mp nb GU Mw @@ -10807,7 +10770,6 @@ mp mp mp mp -mp "} (48,1,1) = {" mp @@ -10816,7 +10778,6 @@ mp mp mp mp -mp nb pl zJ @@ -10844,7 +10805,6 @@ mp mp mp mp -mp "} (49,1,1) = {" mp @@ -10853,7 +10813,6 @@ mp mp mp mp -mp nb nb nn @@ -10881,7 +10840,6 @@ mp mp mp mp -mp "} (50,1,1) = {" mp @@ -10891,7 +10849,6 @@ mp mp mp mp -mp nb rW nb @@ -10918,7 +10875,6 @@ mp mp mp mp -mp "} (51,1,1) = {" mp @@ -10928,7 +10884,6 @@ mp mp mp mp -mp kX Hd kX @@ -10955,7 +10910,6 @@ mp mp mp mp -mp "} (52,1,1) = {" mp @@ -10966,7 +10920,6 @@ mp mp mp mp -mp bg mp mp @@ -10992,5 +10945,4 @@ mp mp mp mp -mp "} diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 137c8e4c5cd7..49d13fbc145c 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -979,7 +979,7 @@ glasses = null /datum/outfit/job/syndicate/engineer/twink - name = "Syndicate - Ship Engineer (Twinkleshine)" + name = "Syndicate - Ship Engineer (Twinkleshine, GEC)" uniform = /obj/item/clothing/under/syndicate/gec id = /obj/item/card/id/syndicate_command/crew_id/engi From 04581808ae8477a08aff8b43d44b4d59c0d34620 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 10 Feb 2024 16:11:21 -0300 Subject: [PATCH 19/21] review --- .../syndicate/syndicate_twinkleshine.dmm | 235 +++++++----------- 1 file changed, 96 insertions(+), 139 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index b4f0f4c26301..e95417703a3d 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -49,7 +49,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "ak" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -413,13 +413,14 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "cC" = ( -/obj/machinery/vending/coffee{ - pixel_x = 6; - pixel_y = 4 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, +/obj/item/canvas/twentythreeXtwentythree{ + name = "Battleplan Board"; + desc = "Remember, no plan survives the battle."; + pixel_y = 32 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "cD" = ( @@ -464,10 +465,13 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/corner_techfloor_grid/full{ + dir = 8 + }, /obj/effect/turf_decal/techfloor/orange/corner{ dir = 1 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "cT" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -674,9 +678,6 @@ "dU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/light/directional/east, -/obj/structure/chair/stool/bar{ - dir = 8 - }, /turf/open/floor/wood, /area/ship/crew/canteen) "dV" = ( @@ -731,7 +732,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "en" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -832,7 +833,7 @@ /area/ship/security) "eQ" = ( /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "eR" = ( /obj/structure/grille, @@ -959,7 +960,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/closet/crate/bin, /turf/open/floor/wood, /area/ship/crew/canteen) "fT" = ( @@ -1059,7 +1059,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "gz" = ( /obj/structure/cable/yellow{ @@ -1130,6 +1130,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "gU" = ( @@ -1213,12 +1216,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"hE" = ( -/obj/structure/table/wood/reinforced, -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/turf/open/floor/carpet/red, -/area/ship/crew/office) "hN" = ( /obj/effect/turf_decal/corner/opaque/orange{ dir = 5 @@ -1313,7 +1310,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "ia" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -1390,7 +1387,6 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "im" = ( -/obj/structure/chair/comfy/black, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "ip" = ( @@ -1464,14 +1460,14 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "iG" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/effect/turf_decal/techfloor/orange, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "iI" = ( /turf/open/floor/plasteel/tech, @@ -1627,7 +1623,7 @@ /obj/machinery/atmospherics/components/binary/volume_pump{ dir = 8 }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "jv" = ( /turf/open/floor/mineral/plastitanium, @@ -1813,7 +1809,7 @@ "ky" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/machinery/light/directional/east, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "kE" = ( /obj/effect/turf_decal/syndicateemblem/top/right, @@ -1823,15 +1819,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "kF" = ( -/obj/structure/table/wood/reinforced, -/obj/item/storage/photo_album/syndicate{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/camera{ - pixel_x = -2 - }, -/turf/open/floor/carpet/red, +/obj/machinery/holopad/emergency/command, +/turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "kH" = ( /obj/item/clothing/suit/armor/vest/syndie, @@ -2002,7 +1991,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 8 }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "lw" = ( /obj/machinery/door/airlock/atmos/glass{ @@ -2096,6 +2085,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/chair/stool/bar{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "ml" = ( @@ -2108,9 +2100,6 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "mm" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/structure/noticeboard{ dir = 4; pixel_x = -32 @@ -2118,6 +2107,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "mo" = ( @@ -2127,7 +2119,7 @@ /obj/machinery/computer/atmos_control/tank/air_tank{ dir = 8 }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "mp" = ( /turf/template_noop, @@ -2356,7 +2348,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "nr" = ( /obj/structure/table, @@ -2520,6 +2512,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "oL" = ( @@ -2625,10 +2620,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "pm" = ( -/obj/structure/filingcabinet/double{ - pixel_x = -5; - pixel_y = 4 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, @@ -2767,7 +2758,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "pN" = ( /obj/structure/closet/secure_closet/security{ @@ -2971,13 +2962,11 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "qN" = ( -/obj/machinery/photocopier{ - pixel_x = 1 - }, /obj/machinery/light/directional/north, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, +/obj/structure/chair/comfy/black, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "qP" = ( @@ -3026,7 +3015,6 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, -/obj/machinery/holopad/emergency/command, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "qY" = ( @@ -3167,7 +3155,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "sk" = ( /obj/effect/turf_decal/industrial/warning{ @@ -3308,7 +3296,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 8 }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "tg" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -3321,7 +3309,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "th" = ( /obj/effect/turf_decal/industrial/caution{ @@ -3343,7 +3331,7 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "tl" = ( -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "tn" = ( /obj/item/kirbyplants/random, @@ -3407,7 +3395,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 9 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "tY" = ( /obj/structure/catwalk/over/plated_catwalk/dark, @@ -3552,7 +3540,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "vd" = ( /obj/machinery/porta_turret/ship/syndicate/heavy{ @@ -3729,7 +3717,7 @@ "wm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "wr" = ( /obj/machinery/airalarm/directional/south, @@ -3951,7 +3939,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 9 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "xj" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -4028,7 +4016,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "xz" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -4284,7 +4272,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "zk" = ( /obj/machinery/door/airlock/external{ @@ -4316,7 +4304,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "zs" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ @@ -4328,12 +4316,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/corner_techfloor_grid/full, /obj/effect/turf_decal/techfloor/orange/corner{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "zy" = ( /obj/effect/turf_decal/syndicateemblem/bottom/middle{ @@ -4523,7 +4511,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 9 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "At" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4600,9 +4588,6 @@ /turf/open/floor/plating, /area/ship/hallway/port) "AQ" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, @@ -4612,6 +4597,9 @@ /obj/machinery/camera/autoname{ dir = 5 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "AW" = ( @@ -5109,15 +5097,15 @@ /turf/open/floor/engine/air, /area/ship/engineering/atmospherics) "Dx" = ( -/obj/structure/chair{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "DB" = ( @@ -5710,7 +5698,7 @@ "Gx" = ( /obj/machinery/light/directional/east, /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Gy" = ( /obj/structure/cable/yellow{ @@ -5741,7 +5729,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "GD" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ @@ -5765,13 +5753,15 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "GG" = ( -/obj/item/kirbyplants/random, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, /obj/structure/sign/poster/contraband/aclf{ pixel_y = -32 }, +/obj/machinery/photocopier{ + pixel_x = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "GH" = ( @@ -5897,7 +5887,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "Ht" = ( /obj/machinery/telecomms/receiver/preset_right{ @@ -5963,21 +5953,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) -"HQ" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/item/canvas/twentythreeXtwentythree{ - name = "Battleplan Board"; - desc = "Remember, no plan survives the battle."; - pixel_x = -25; - pixel_y = 5 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/crew/office) "Ib" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -6348,7 +6323,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Kg" = ( /obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ @@ -6402,7 +6377,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Kw" = ( /obj/machinery/door/poddoor{ @@ -6490,18 +6465,10 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "KF" = ( -/obj/structure/table/wood/reinforced, -/obj/item/disk/nuclear/fake/obvious{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/book/manual/nuclear{ - pixel_x = -8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/carpet/red, +/turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "KI" = ( /obj/structure/table/optable, @@ -6567,7 +6534,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "La" = ( /obj/structure/chair/stool{ @@ -6587,18 +6554,12 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ls" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/item/canvas/twentythreeXtwentythree{ - name = "Battleplan Board"; - desc = "Remember, no plan survives the battle."; - pixel_x = -25; - pixel_y = -1 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "Lw" = ( @@ -6676,7 +6637,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "LX" = ( /obj/machinery/power/shuttle/engine/electric{ @@ -6713,7 +6674,7 @@ /area/ship/engineering/atmospherics) "Mo" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Mq" = ( /obj/effect/turf_decal/industrial/warning, @@ -6817,7 +6778,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 10 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "Na" = ( /obj/effect/turf_decal/industrial/warning, @@ -6873,10 +6834,10 @@ /turf/open/floor/plasteel, /area/ship/crew/dorm) "NC" = ( -/obj/item/kirbyplants/random, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/structure/filingcabinet/double, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "NE" = ( @@ -7079,7 +7040,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "OY" = ( /obj/structure/bed, @@ -7101,7 +7062,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "Pa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -7232,7 +7193,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 10 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "PL" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -7494,7 +7455,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Rd" = ( /obj/structure/cable/yellow{ @@ -7510,7 +7471,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 1 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Rh" = ( /obj/effect/turf_decal/industrial/warning{ @@ -7537,7 +7498,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 1 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Ru" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -7781,7 +7742,7 @@ /area/ship/engineering) "Sv" = ( /obj/machinery/portable_atmospherics/canister/toxins, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Sy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -7841,7 +7802,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "SK" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -7858,7 +7819,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/techfloor/orange, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "SM" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -8025,7 +7986,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "TT" = ( /obj/machinery/vending/wallmed{ @@ -8075,7 +8036,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "Uc" = ( /obj/structure/cable/yellow{ @@ -8519,7 +8480,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 10 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "WG" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -8658,14 +8619,10 @@ /turf/open/floor/engine/plasma, /area/ship/engineering/atmospherics) "Xq" = ( -/obj/structure/table/wood/reinforced, -/obj/item/storage/fancy/donut_box{ - name = "suspicious donut box" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/carpet/red, +/turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "Xs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -8721,7 +8678,7 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "XU" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -8747,9 +8704,6 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Yi" = ( -/obj/structure/chair{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, @@ -8762,6 +8716,9 @@ pixel_x = 20; pixel_y = 11 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "Yj" = ( @@ -8870,7 +8827,7 @@ /obj/structure/cable/yellow{ icon_state = "1-5" }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "YF" = ( /obj/effect/turf_decal/corner/opaque/syndiered/border{ @@ -9798,7 +9755,7 @@ sf VU ih UW -UW +Qa ma xj VH @@ -9833,7 +9790,7 @@ sf Xf ih UW -Qa +UW ml Yl Jz @@ -10018,7 +9975,7 @@ cC ir mm Ls -HQ +Ls AQ oJ NC @@ -10051,7 +10008,7 @@ tH sp qN im -hE +im kF Xq KF From 0c584f78a993fabe1542be06eb6cfed1c5d35747 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 10 Feb 2024 16:20:35 -0300 Subject: [PATCH 20/21] briefing room --- .../syndicate/syndicate_twinkleshine.dmm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index e95417703a3d..3ecdb4a95edc 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -421,6 +421,10 @@ desc = "Remember, no plan survives the battle."; pixel_y = 32 }, +/obj/structure/table, +/obj/machinery/fax{ + pixel_y = 5 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "cD" = ( @@ -2626,6 +2630,11 @@ /obj/structure/sign/poster/contraband/ss13{ pixel_y = 32 }, +/obj/structure/table, +/obj/item/megaphone{ + pixel_y = 4; + pixel_x = 3 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "pp" = ( @@ -2966,7 +2975,13 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, -/obj/structure/chair/comfy/black, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/pen/fourcolor{ + pixel_y = 5 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "qP" = ( @@ -5915,6 +5930,7 @@ "Hx" = ( /obj/machinery/light/directional/west, /obj/structure/table/reinforced, +/obj/item/binoculars, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "HF" = ( From 1122465ed8fd59aec090bfbdd64d87e05a85a118 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sun, 11 Feb 2024 02:58:26 -0300 Subject: [PATCH 21/21] sigh --- _maps/shuttles/syndicate/syndicate_twinkleshine.dmm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 13342361ab8b..4b6183391ff1 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -103,9 +103,9 @@ name = "lieutenant locker"; req_access = list(3,150) }, -/obj/item/clothing/under/syndicate/officer, -/obj/item/clothing/suit/gorlex, -/obj/item/clothing/head/gorlexcap, +/obj/item/clothing/under/syndicate/ngr/officer, +/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, +/obj/item/clothing/head/ngrcap, /obj/item/clothing/shoes/combat, /obj/item/megaphone/sec{ name = "syndicate megaphone" @@ -1003,7 +1003,7 @@ icon_state = "scrap"; color = "#505050"; desc = "This note is crumpled and torn."; - default_raw_text = "ever since the war ended some eighteen years ago, the syndicate has been at odds with ourselves. our branches' ideals and personal goals are dividing the syndicate more and more.

tensions keep rising on the frontier sectors, where it's less likely that people will get caught sabotaging or hindering each other, and you, presumably, have just been given captainship of a vessel full of members who all hate each other.

to put it bluntly, you're in deep. this melting pot of ideologies, at its worst, is going to tear your leadership apart. you're going to need to keep tensions low on this two decade old warship so it doesn't all go to shit.

keep track of where every member comes from:
-you are, most likely, from the aclf
-the lieutenant is an officer from the gorlex 2nd battlegroup
-the medics come from cybersun
-the engineers are from the gec
-the operatives are a mix of the 2nd battlegroup and the aclf
-the bartender is from donk
-the miner is from suns
-deck assistants are a wildcard, not contracted from anyone in specific" + default_raw_text = "ever since the war ended some eighteen years ago, the syndicate has been at odds with ourselves. our branches' ideals and personal goals are dividing the syndicate more and more.

tensions keep rising on the frontier sectors, where it's less likely that people will get caught sabotaging or hindering each other, and you, presumably, have just been given captainship of a vessel full of members who all hate each other.

to put it bluntly, you're in deep. this melting pot of ideologies, at its worst, is going to tear your leadership apart. you're going to need to keep tensions low on this two decade old warship so it doesn't all go to shit.

keep track of where every member comes from:
-you are, most likely, from the aclf
-the lieutenant is an officer from the new gorlex republic
-the medics come from cybersun
-the engineers are from the gec
-the operatives are a mix of the 2nd battlegroup and the aclf
-the bartender is from donk
-the miner is from suns
-deck assistants are a wildcard, not contracted from anyone in specific" }, /obj/structure/curtain/cloth/fancy{ name = "blood-red curtains" @@ -1803,7 +1803,7 @@ /obj/item/clothing/gloves/combat, /obj/item/clothing/shoes/combat, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, -/obj/item/clothing/under/syndicate/officer, +/obj/item/clothing/under/syndicate/ngr/officer, /obj/item/clothing/head/HoS/syndicate, /obj/item/ammo_box/a357, /obj/item/ammo_box/a357,