diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index e5765b1691dd..ef84cca126f5 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": { + "Flotilla Admiral": { "outfit": "/datum/outfit/job/syndicate/captain/twink", "officer": true, "slots": 1 @@ -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 91cbed05196a..4b6183391ff1 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -37,19 +37,29 @@ /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, +/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/tech/grid, /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/effect/turf_decal/borderfloorblack{ + dir = 10 }, -/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,23 +74,18 @@ /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/machinery/shieldgen{ + anchored = 1; + req_access = list(150) }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -10; - pixel_y = 5 +/obj/effect/turf_decal/corner/opaque/syndiered/bordercee{ + dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -3; - pixel_y = 3 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "aD" = ( /obj/structure/sign/poster/contraband/m90{ icon_state = "poster-m90"; @@ -92,14 +97,34 @@ /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/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{ - dir = 1 +/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" }, -/turf/open/floor/mineral/plastitanium/red, +/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" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -110,31 +135,44 @@ /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/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{ +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/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{ @@ -184,17 +222,17 @@ }, /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 +"br" = ( +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 }, -/turf/open/floor/carpet/nanoweave/red, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) +"bv" = ( +/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 +256,9 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "bL" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 11 - }, -/turf/template_noop, -/area/template_noop) +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "bM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -246,40 +280,28 @@ /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" +/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/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "bU" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -287,22 +309,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 +326,10 @@ /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, +/obj/effect/turf_decal/steeldecal/steel_decals3, +/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,21 +337,47 @@ }, /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, +/obj/effect/turf_decal/steeldecal/steel_decals_central1, /turf/open/floor/plasteel/dark, /area/ship/medical) "cp" = ( @@ -368,7 +398,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,26 +413,45 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "cC" = ( -/obj/machinery/vending/coffee, /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 + }, +/obj/structure/table, +/obj/machinery/fax{ + pixel_y = 5 + }, /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) -"cJ" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "6-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/turf/open/floor/mineral/plastitanium/red, +/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" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -411,20 +460,35 @@ /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/corner_techfloor_grid/full{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 1 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) +"cT" = ( +/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, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "cW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -432,34 +496,43 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/light/directional/south, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) -"cX" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10); + dir = 4; + name = "Engineering Access" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/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{ + 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 +557,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/ngr/officer, -/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,29 +594,28 @@ /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/effect/turf_decal/industrial/warning, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/canteen) +/turf/open/floor/pod/dark, +/area/ship/cargo) "dq" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/westright, -/obj/machinery/door/window/eastright{ - req_access = list(3,150) +/obj/machinery/computer/secure_data/laptop{ + dir = 8; + pixel_y = 6; + pixel_x = 1 }, -/obj/machinery/recharger, +/obj/machinery/door/window/brigdoor/eastright, /obj/machinery/door/firedoor/border_only{ - dir = 8 + dir = 4 }, /obj/machinery/door/firedoor/border_only{ - dir = 4 + dir = 8 }, /turf/open/floor/mineral/plastitanium, /area/ship/security) @@ -572,40 +625,38 @@ }, /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{ +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /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) -"dL" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/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, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 }, -/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"dL" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "dO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -616,12 +667,11 @@ /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 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/modular_computer/console/preset/engineering, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) @@ -631,11 +681,8 @@ /area/ship/engineering/atmospherics) "dU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/obj/machinery/light/directional/east, +/turf/open/floor/wood, /area/ship/crew/canteen) "dV" = ( /obj/machinery/stasis, @@ -651,10 +698,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 }, @@ -664,22 +707,36 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/aft) +"ec" = ( +/obj/structure/closet/crate/bin, +/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/tech/grid, /area/ship/engineering/atmospherics) "en" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -696,24 +753,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) "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 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "er" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, @@ -742,12 +799,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 @@ -757,9 +830,14 @@ }, /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, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "eR" = ( /obj/structure/grille, @@ -771,27 +849,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,37 +901,55 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "fJ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/structure/reagent_dispensers/water_cooler, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/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/light_switch{ - pixel_y = 22 +/obj/item/radio/headset/syndicate/alt{ + keyslot = null }, -/turf/open/floor/mineral/plastitanium/red, +/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/structure/table, -/obj/item/paper_bin{ - pixel_y = 3 - }, -/obj/item/pen{ - pixel_y = 3 - }, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/light/directional/south, +/turf/open/floor/mineral/plastitanium/red, /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/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ + dir = 1 + }, +/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 }, -/obj/machinery/vending/dinnerware, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/turf/open/floor/engine, +/area/ship/engineering/engine) "fO" = ( /obj/structure/railing, /obj/structure/railing{ @@ -861,13 +961,11 @@ /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) +/turf/open/floor/wood, +/area/ship/crew/canteen) "fT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -883,7 +981,6 @@ /area/ship/medical) "fV" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; dir = 4 }, @@ -899,13 +996,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 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/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,33 +1017,17 @@ /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 + dir = 10 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/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{ @@ -964,41 +1052,30 @@ /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/pod/dark, /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 +1086,47 @@ /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/machinery/light/directional/east, +/obj/structure/closet/secure_closet/miner{ + req_access = list(150, 48); + populate = 0 }, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, /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/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" = ( -/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 @@ -1047,6 +1134,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" = ( @@ -1054,21 +1144,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/central) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "gX" = ( /obj/machinery/door/airlock/hatch{ name = "Custodial Closet"; @@ -1083,18 +1161,27 @@ /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" = ( -/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,66 +1190,22 @@ /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) -"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/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/structure/cable/yellow{ - icon_state = "2-8" +/area/ship/hallway/port) +"hr" = ( +/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/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, @@ -1177,12 +1220,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 @@ -1196,14 +1233,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 }, @@ -1213,47 +1253,26 @@ /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" = ( -/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,38 +1286,60 @@ /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, /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/pod/dark, /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,23 +1358,39 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ih" = ( -/obj/structure/table/wood, -/obj/machinery/jukebox/boombox{ - pixel_x = -10 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/obj/machinery/door/firedoor/border_only, -/obj/item/clothing/head/chefhat{ - pixel_x = 7 +/obj/structure/chair/stool/bar{ + dir = 1 }, /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/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/syndicate{ + keyslot = null + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "im" = ( -/obj/structure/chair/comfy/black, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "ip" = ( @@ -1349,8 +1406,11 @@ 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/central) +/area/ship/hallway/aft) "ir" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 @@ -1358,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 @@ -1400,19 +1453,27 @@ /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/tech/grid, /area/ship/engineering/atmospherics) "iG" = ( -/obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ - icon_state = "0-2" + icon_state = "1-8" }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/cryo) +/obj/effect/turf_decal/techfloor/orange, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) "iI" = ( -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "iJ" = ( @@ -1432,31 +1493,37 @@ /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, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"iL" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 +/obj/effect/decal/cleanable/garbage{ + pixel_x = 16; + pixel_y = 2 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/item/stack/ore/salvage/scrapmetal{ + pixel_x = -1; + pixel_y = -13 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/item/stack/ore/salvage/scrapbluespace{ + pixel_x = -5; + pixel_y = 7 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"iL" = ( +/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/contraband/space_up{ - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/engineering{ + dir = 1; + req_access = list(150,10) }, -/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, @@ -1543,42 +1610,34 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"jr" = ( -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ +/obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"jo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/door/window, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"jr" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /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{ +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"jx" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 5 }, -/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) +/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 +1646,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 +1666,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" = ( @@ -1647,6 +1690,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{ @@ -1670,27 +1729,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,72 +1770,87 @@ }, /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/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/machinery/light/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/dark, +/area/ship/security) "kl" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/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/structure/cable/yellow{ - icon_state = "1-4" +/obj/item/card/id/syndicate_command/captain_id, +/obj/item/storage/lockbox/medal, +/obj/item/codespeak_manual{ + charges = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/item/gun/ballistic/revolver, +/obj/item/megaphone/sec{ + name = "syndicate megaphone" }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/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/ngr/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" = ( -/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/pod/dark, /area/ship/engineering/atmospherics) "kE" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/obj/effect/turf_decal/syndicateemblem/top/right, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium, +/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/book/random{ - pixel_x = -6 - }, -/turf/open/floor/carpet/red, +/obj/machinery/holopad/emergency/command, +/turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "kH" = ( -/obj/structure/rack, -/obj/effect/turf_decal/box/white/corners{ - dir = 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/effect/turf_decal/box/white/corners{ - dir = 8 +/obj/item/radio/headset/syndicate/alt{ + keyslot = null }, -/obj/structure/closet/emcloset/wall{ - dir = 1; - pixel_y = -28 +/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" = ( @@ -1781,34 +1867,56 @@ /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" = ( -/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 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "kX" = ( /obj/structure/sign/syndicate, @@ -1817,24 +1925,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 +1948,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 +1979,53 @@ /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) +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 + }, +/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" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 8 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "lw" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/door/airlock/atmos/glass{ + req_one_access_txt = "150"; + req_access = list(150,10); + dir = 4 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/cable/yellow{ + icon_state = "4-10" + }, +/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 }, -/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 +2039,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,58 +2054,56 @@ /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{ +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/effect/turf_decal/borderfloorblack{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"lY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-9" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/chair/stool/bar{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) -"lY" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder/constructed, /turf/open/floor/wood, /area/ship/crew/canteen) "ma" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/machinery/computer/slot_machine, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/structure/chair/stool/bar{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /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/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/ship/crew/canteen) "mm" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/structure/noticeboard{ dir = 4; pixel_x = -32 @@ -2007,13 +2111,19 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/structure/chair{ + dir = 1 + }, /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/pod/dark, /area/ship/engineering/atmospherics) "mp" = ( /turf/template_noop, @@ -2047,26 +2157,44 @@ /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 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/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 +2202,11 @@ /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{ +/obj/effect/turf_decal/siding/thinplating/dark{ 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" @@ -2219,42 +2338,63 @@ /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/tech/grid, /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{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - 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/structure/cable/yellow{ - icon_state = "4-8" +/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/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating, -/area/ship/hallway/central) -"nE" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 10 +/obj/item/rack_parts{ + pixel_x = -6; + pixel_y = 11 }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 4 +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"nE" = ( +/obj/effect/turf_decal/corner/opaque/syndiered, +/obj/effect/turf_decal/borderfloorblack{ + dir = 9 }, -/obj/machinery/vending/toyliberationstation, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "nS" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -2264,42 +2404,49 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "oc" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/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/scrubbers/hidden/layer4{ - dir = 1 +/obj/item/reagent_containers/food/snacks/donut/choco{ + pixel_x = 3; + pixel_y = 7 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -7; + pixel_y = 6 + }, +/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/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/closet/firecloset/wall{ + dir = 1; + pixel_y = -28 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/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/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/vending/cigarette/syndicate, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "on" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 @@ -2316,41 +2463,21 @@ /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) +/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/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/machinery/door/airlock/external{ - req_access = list(150,10); - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - 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 @@ -2370,21 +2497,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" = ( @@ -2394,6 +2516,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" = ( @@ -2414,7 +2539,6 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "oM" = ( -/obj/structure/table, /obj/machinery/button/massdriver{ pixel_x = 23; dir = 8; @@ -2433,6 +2557,10 @@ /obj/machinery/camera/autoname{ dir = 10 }, +/obj/structure/table_frame{ + pixel_y = 2; + pixel_x = -3 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "oP" = ( @@ -2453,16 +2581,13 @@ /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/central) +/area/ship/hallway/aft) "pc" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2473,7 +2598,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 @@ -2485,52 +2609,47 @@ /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/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/wood, /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/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, /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" = ( /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{ @@ -2566,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 @@ -2590,25 +2707,36 @@ /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 + }, +/obj/effect/turf_decal/borderfloorblack, +/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/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/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,59 +2748,82 @@ /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, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "pL" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 1 }, -/obj/machinery/camera/autoname, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) "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{ + keyslot = null + }, +/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) "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/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/sign/poster/contraband/stechkin{ - pixel_x = 32 +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -8 }, -/turf/open/floor/mineral/plastitanium/red, -/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{ @@ -2682,6 +2833,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 +2850,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 +2863,14 @@ /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) +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "qr" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2770,20 +2902,17 @@ /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/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, /obj/machinery/light_switch{ dir = 4; pixel_x = -20; pixel_y = 12 }, -/turf/open/floor/plasteel, +/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, @@ -2817,17 +2946,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,17 +2971,37 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "qN" = ( -/obj/machinery/photocopier, /obj/machinery/light/directional/north, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, +/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" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/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{ @@ -2866,7 +3014,6 @@ dir = 1 }, /obj/machinery/firealarm/directional/north, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ pixel_y = 22; pixel_x = -12 @@ -2883,23 +3030,23 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, -/obj/machinery/holopad/emergency/command, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "qY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -13; + pixel_y = -20 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/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 +3072,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 +3106,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,48 +3131,46 @@ /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{ - 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/central) +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/security) "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{ - 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/tech/grid, /area/ship/engineering/atmospherics) "sk" = ( /obj/effect/turf_decal/industrial/warning{ @@ -3080,23 +3226,8 @@ 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" = ( -/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{ @@ -3123,10 +3254,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 @@ -3170,26 +3305,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/pod/dark, /area/ship/engineering/atmospherics) "tg" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay"; - 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/pod/dark, +/area/ship/engineering/atmospherics) "th" = ( /obj/effect/turf_decal/industrial/caution{ dir = 4 @@ -3210,40 +3346,26 @@ /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/pod/dark, /area/ship/engineering/atmospherics) "tn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"tp" = ( +/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{ + dir = 1 }, -/obj/machinery/light/directional/west, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) -"tp" = ( -/obj/structure/toilet/secret{ - secret_type = "/obj/item/toy/plush/moth"; - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) -"tr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing{ - dir = 10; - layer = 3.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 +3382,20 @@ /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/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "tS" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/structure/railing{ + dir = 10; + layer = 3.1 }, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 @@ -3283,30 +3403,34 @@ /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, -/area/ship/crew/canteen) +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 1 + }, +/obj/item/trash/candy, +/obj/effect/turf_decal/techfloor/orange{ + dir = 9 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) "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" + icon_state = "1-4" }, -/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 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/turf/open/floor/plating, +/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, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ug" = ( /obj/structure/rack, @@ -3344,7 +3468,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, @@ -3357,8 +3481,8 @@ /area/ship/bridge) "uE" = ( /obj/machinery/door/airlock/hatch{ - name = "Captain's Quarters"; - req_access = list(151); + name = "Captain Quarters"; + req_access = list(150, 20); dir = 4 }, /obj/structure/cable/yellow{ @@ -3370,8 +3494,23 @@ /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" = ( +/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 @@ -3392,39 +3531,31 @@ /area/ship/engineering/communications) "uX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay"; req_one_access_txt = "150"; req_access = list(150); dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/turf_decal/corner/opaque/syndiered/full, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/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/mapping_helpers/airlock/unres{ + dir = 4 }, -/obj/effect/turf_decal/corner/opaque/syndiered/full, /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/tech/grid, /area/ship/engineering/atmospherics) "vd" = ( /obj/machinery/porta_turret/ship/syndicate/heavy{ @@ -3445,10 +3576,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 @@ -3469,16 +3608,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, -/area/ship/security) +/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/machinery/firealarm/directional/south, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "vJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3490,16 +3637,21 @@ /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." + }, +/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" = ( -/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" }, @@ -3537,19 +3689,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" @@ -3558,13 +3706,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) +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "wi" = ( /obj/effect/turf_decal/industrial/warning, /obj/structure/cable{ @@ -3582,31 +3730,52 @@ /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/pod/dark, /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, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/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" + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 }, /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/table/wood, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/obj/machinery/door/airlock/atmos/glass{ + req_one_access_txt = "150"; + req_access = list(150,10); + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) "wA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/dirt/dust, @@ -3634,7 +3803,6 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; dir = 4 }, @@ -3696,40 +3864,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/ammo_box/a12g, -/obj/item/ammo_box/a12g, -/obj/item/ammo_box/a12g, -/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 @@ -3738,13 +3878,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" = ( @@ -3768,8 +3907,11 @@ dir = 9 }, /obj/machinery/light/directional/west, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /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{ @@ -3787,34 +3929,32 @@ /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 +"xg" = ( +/obj/effect/turf_decal/syndicateemblem/bottom/left{ + dir = 8 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 8 }, -/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/middle/right{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/turf/open/floor/mineral/plastitanium, +/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/tech/grid, /area/ship/engineering/atmospherics) "xj" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -3886,27 +4026,28 @@ /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/pod/dark, /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 + }, +/obj/effect/turf_decal/borderfloorblack, +/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"; @@ -3918,8 +4059,11 @@ /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) +/area/ship/hallway/aft) "xW" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/trimline/opaque/syndiered/warning{ @@ -3940,7 +4084,6 @@ /area/template_noop) "ya" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; req_access = list(150,10); dir = 8 }, @@ -3979,18 +4122,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 @@ -4009,15 +4149,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{ @@ -4030,17 +4174,11 @@ /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 }, /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{ @@ -4061,49 +4199,47 @@ /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/ngr, -/obj/item/clothing/under/syndicate/ngr, -/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 + }, +/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" = ( -/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 @@ -4117,6 +4253,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" = ( @@ -4141,32 +4280,22 @@ /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/pod/dark, /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 }, @@ -4177,49 +4306,59 @@ /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/pod/dark, /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/corner_techfloor_grid/full, +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /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 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "zG" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ 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" = ( @@ -4245,6 +4384,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" = ( @@ -4256,29 +4398,12 @@ /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, +/obj/effect/turf_decal/borderfloorblack, /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 @@ -4305,18 +4430,31 @@ }, /area/ship/medical) "zZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/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/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/item/pipe_dispenser, +/obj/structure/sign/poster/contraband/gec{ + pixel_y = -32 + }, +/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 @@ -4363,6 +4501,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" = ( @@ -4372,20 +4515,34 @@ /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/tech/grid, /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" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "Ax" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -4402,8 +4559,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Ay" = ( /obj/effect/turf_decal/corner/opaque/orange{ dir = 10 @@ -4418,26 +4578,31 @@ /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, +/obj/effect/turf_decal/borderfloorblack, +/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) -"AQ" = ( -/obj/structure/chair{ - dir = 4 +/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/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, @@ -4447,6 +4612,9 @@ /obj/machinery/camera/autoname{ dir = 5 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "AW" = ( @@ -4456,42 +4624,90 @@ /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) +"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 }, /area/ship/security) -"Bq" = ( -/obj/structure/chair/stool/bar{ - dir = 1 +"Bn" = ( +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 5 +/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{ + keyslot = null + }, +/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/machinery/camera/autoname{ - dir = 8 + dir = 6 }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 8 +/obj/item/ammo_box/magazine/sniper_rounds{ + pixel_x = 9; + pixel_y = 4 }, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/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 + }, +/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 @@ -4514,49 +4730,40 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "BG" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, +/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" = ( +/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 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/obj/structure/rack, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) -"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/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/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) -"BL" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 + icon_state = "4-8" }, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, /area/ship/security) "BM" = ( /obj/machinery/atmospherics/pipe/manifold/green/visible{ @@ -4578,14 +4785,29 @@ dir = 4; pixel_x = -28 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /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 }, /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 @@ -4618,8 +4840,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 @@ -4628,6 +4854,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 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" + }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "Cl" = ( @@ -4642,6 +4876,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 @@ -4683,11 +4934,10 @@ /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, +/obj/effect/turf_decal/steeldecal/steel_decals_central4, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/dorm) "CQ" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, @@ -4707,8 +4957,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, @@ -4733,14 +4982,12 @@ /area/ship/medical) "CU" = ( /obj/machinery/light/directional/south, -/obj/structure/chair{ - dir = 1 +/obj/item/chair{ + pixel_x = -12; + pixel_y = -4 }, /obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plating, /area/ship/bridge) "CV" = ( /obj/effect/turf_decal/industrial/warning{ @@ -4766,48 +5013,39 @@ /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/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/structure/closet/secure_closet/medical3{ + req_access = list(150, 5); + icon_state = "tac"; + populate = 0 }, +/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/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/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/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/syndicate{ + keyslot = null + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "Dk" = ( @@ -4841,53 +5079,62 @@ 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 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "Dt" = ( /obj/machinery/air_sensor/atmos/air_tank, /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" = ( +/obj/effect/turf_decal/steeldecal/steel_decals8, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "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, @@ -4923,26 +5170,30 @@ /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, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/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{ @@ -4950,10 +5201,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{ @@ -4963,8 +5216,11 @@ dir = 4; pixel_x = -28 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "En" = ( /obj/effect/turf_decal/industrial/warning, /turf/open/floor/engine, @@ -4975,6 +5231,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 @@ -4992,19 +5254,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{ @@ -5025,25 +5280,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, @@ -5051,14 +5289,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, @@ -5074,11 +5308,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" = ( @@ -5086,12 +5319,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" = ( @@ -5100,32 +5327,38 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "EX" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 8 }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 0 +/obj/effect/turf_decal/steeldecal/steel_decals_central6{ + dir = 4 }, -/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/light/directional/west, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/structure/cable/yellow{ + icon_state = "1-6" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/chair/stool/bar{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/ship/crew/canteen) "Fc" = ( /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 1 }, -/obj/structure/rack, +/obj/structure/fluff/broken_flooring{ + 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" = ( @@ -5169,6 +5402,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 @@ -5177,22 +5417,24 @@ 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" = ( -/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, @@ -5220,18 +5462,29 @@ /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 = -5; + pixel_y = 10; + name = "ammo can (10mm)" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/item/storage/toolbox/ammo/a308{ + pixel_x = 6; + pixel_y = 6; + name = "ammo can (.308)" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/storage/toolbox/ammo/c45{ + pixel_x = -4; + pixel_y = 2; + name = "ammo can (.45)" }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/item/storage/toolbox/ammo/shotgun{ + pixel_x = 4; + pixel_y = -2; + name = "ammo can (Buckshot)" + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "Fs" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -5239,17 +5492,18 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/sign/poster/contraband/space_cola{ - pixel_y = 32 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "Ft" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -5257,13 +5511,23 @@ /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" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "FE" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/surgery{ @@ -5275,27 +5539,38 @@ 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" = ( -/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 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "FV" = ( /obj/machinery/door/poddoor{ @@ -5310,6 +5585,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" = ( @@ -5323,44 +5599,61 @@ /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) -"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{ +/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 = 5 }, -/obj/item/clothing/head/ngrcap, -/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, -/obj/item/clothing/under/syndicate/ngr/officer, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "syndicate"; - name = "lieutenant locker"; - req_access = list(3,150) +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"Gk" = ( +/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_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 + }, +/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" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1; @@ -5370,15 +5663,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" = ( @@ -5415,33 +5711,47 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Gx" = ( -/obj/item/trash/sosjerky, -/turf/open/floor/plating, +/obj/machinery/light/directional/east, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/pod/dark, /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) -"GC" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable/yellow{ - icon_state = "1-8" + 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/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/pod/dark, /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, +/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" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -5458,29 +5768,22 @@ /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" = ( -/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 @@ -5488,31 +5791,25 @@ /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 }, +/obj/machinery/door/firedoor, /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 @@ -5528,6 +5825,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{ @@ -5539,34 +5851,18 @@ /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 }, /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" = ( @@ -5580,16 +5876,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{ @@ -5598,16 +5889,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/tech/grid, /area/ship/engineering/atmospherics) "Ht" = ( /obj/machinery/telecomms/receiver/preset_right{ @@ -5617,18 +5912,27 @@ /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/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) +"Hx" = ( +/obj/machinery/light/directional/west, +/obj/structure/table/reinforced, +/obj/item/binoculars, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "HF" = ( /obj/structure/table, /obj/item/wrench/medical{ @@ -5639,88 +5943,32 @@ /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{ +/obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/plasteel/dark, /area/ship/security) "HH" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - 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/item/reagent_containers/food/drinks/coffee{ - pixel_x = -7; - pixel_y = 6 +/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" = ( /obj/structure/chair/office{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, /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) -"HQ" = ( -/obj/structure/chair{ +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ 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) -"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/machinery/camera/autoname{ - dir = 6 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "Ib" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -5740,6 +5988,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" = ( @@ -5756,6 +6005,17 @@ /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 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Ig" = ( @@ -5777,22 +6037,14 @@ /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/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 4 }, -/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, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, /area/ship/crew/canteen) "Il" = ( /obj/effect/turf_decal/techfloor, @@ -5822,29 +6074,40 @@ 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" = ( -/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/machinery/door/airlock/hatch{ - name = "Security" +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) +"IC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/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 @@ -5877,6 +6140,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" = ( @@ -5884,10 +6148,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" = ( @@ -5912,11 +6173,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 @@ -5952,29 +6222,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{ @@ -5983,28 +6241,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/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{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/door/airlock/external{ - req_access = list(150,10); - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - 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{ @@ -6070,46 +6319,39 @@ /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, +/obj/effect/turf_decal/borderfloorblack, +/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/effect/decal/cleanable/dirt/dust, +/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/pod/dark, /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" +/obj/machinery/light/directional/north, +/obj/machinery/vending/cola/random, +/obj/effect/turf_decal/borderfloorblack/corner{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "Kk" = ( /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 @@ -6144,23 +6386,14 @@ "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" = ( -/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/pod/dark, /area/ship/engineering/atmospherics) "Kw" = ( /obj/machinery/door/poddoor{ @@ -6171,22 +6404,19 @@ /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 + }, +/obj/machinery/door/firedoor/border_only, +/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{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/camera/autoname{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/ship/crew/canteen) "Kz" = ( /obj/structure/cable/yellow{ @@ -6207,35 +6437,19 @@ /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 +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/turf/open/floor/plasteel/dark, +/area/ship/security) "KD" = ( /obj/structure/table, /obj/machinery/button/massdriver{ @@ -6267,74 +6481,76 @@ /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, /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" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/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/tech, -/area/ship/hallway/central) +/obj/machinery/door/airlock/grunge, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security) "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 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "KQ" = ( /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/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/pod/dark, /area/ship/engineering/atmospherics) "La" = ( /obj/structure/chair/stool{ @@ -6348,27 +6564,25 @@ /area/ship/bridge) "Lp" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; req_access = list(150,10); dir = 4 }, /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" = ( +/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 @@ -6376,18 +6590,70 @@ /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/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" = ( /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." }, -/turf/open/floor/plating, +/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/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/tech/grid, /area/ship/engineering/atmospherics) "LX" = ( /obj/machinery/power/shuttle/engine/electric{ @@ -6423,19 +6689,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/pod/dark, /area/ship/engineering/atmospherics) "Mq" = ( /obj/effect/turf_decal/industrial/warning, @@ -6472,6 +6727,10 @@ pixel_x = 9 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/fluff/paper/stack{ + pixel_x = -7; + pixel_y = -15 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "MA" = ( @@ -6479,14 +6738,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" = ( @@ -6496,7 +6755,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{ @@ -6522,16 +6784,17 @@ /turf/open/floor/circuit/red, /area/ship/engineering/communications) "MZ" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; - 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/tech/grid, /area/ship/engineering/atmospherics) "Na" = ( /obj/effect/turf_decal/industrial/warning, @@ -6551,89 +6814,53 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Nh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "4-8" + 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 = "0-4" + icon_state = "2-8" }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/closet/secure_closet/armory1{ - populate = 0; - icon_state = "syndicate" - }, -/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 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/turf/open/floor/plating, +/area/ship/hallway/aft) "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, +/obj/effect/decal/cleanable/dirt/dust, +/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, /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" = ( -/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{ @@ -6767,7 +6994,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) @@ -6781,11 +7007,19 @@ /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 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ON" = ( /obj/structure/cable/yellow{ @@ -6811,67 +7045,63 @@ /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" }, -/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{ +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/techfloor/orange{ dir = 8 }, +/turf/open/floor/plasteel/tech/grid, +/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/tech/grid, /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) @@ -6889,11 +7119,18 @@ /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) +/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, @@ -6915,15 +7152,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{ @@ -6931,18 +7171,16 @@ }, /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, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/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 }, @@ -6952,14 +7190,26 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ 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" = ( -/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/tech/grid, /area/ship/engineering/atmospherics) "PL" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -6981,8 +7231,12 @@ /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "PN" = ( -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/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{ dir = 6 @@ -6993,9 +7247,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 }, @@ -7008,11 +7259,12 @@ /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/structure/table/wood, +/turf/open/floor/wood, /area/ship/crew/canteen) "Qd" = ( /obj/effect/turf_decal/corner/opaque/orange{ @@ -7052,13 +7304,18 @@ /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{ @@ -7091,46 +7348,53 @@ /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 +/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, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/sign/poster/official/moth{ + pixel_x = 32 }, /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 + icon_state = "2-8" }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood, /area/ship/crew/canteen) -"Qx" = ( -/obj/structure/closet/secure_closet/brig/wall{ - pixel_y = 28; - req_access = list(3,150) +"QC" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 + }, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "QD" = ( /obj/machinery/door/window/eastright{ name = "Engine Access" @@ -7160,19 +7424,10 @@ /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 - }, -/obj/item/camera{ - pixel_x = -2 - }, -/obj/machinery/light/directional/south, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/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 @@ -7210,30 +7465,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/pod/dark, /area/ship/engineering/atmospherics) "Rd" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-8" }, -/obj/machinery/light_switch{ - pixel_y = -10; - dir = 8; - pixel_x = 20 +/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" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 1 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Rh" = ( /obj/effect/turf_decal/industrial/warning{ @@ -7250,15 +7504,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/pod/dark, /area/ship/engineering/atmospherics) "Ru" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -7267,16 +7523,39 @@ /obj/machinery/camera/autoname{ dir = 5 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /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, +/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" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -7300,15 +7579,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, @@ -7339,39 +7626,32 @@ /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/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 +/obj/structure/table, +/obj/effect/turf_decal/corner/opaque/syndiered/full, +/obj/item/storage/box/medipens{ + pixel_y = 7; + pixel_x = -4 }, -/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/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/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/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/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 @@ -7382,48 +7662,81 @@ /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{ - dir = 4 +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/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{ +/obj/effect/turf_decal/borderfloorblack, +/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" = ( +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) +"Si" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, /obj/machinery/light_switch{ dir = 4; pixel_x = -20; pixel_y = 12 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) -"Si" = ( -/obj/machinery/vending/security/marine/syndicate, +/obj/structure/rack, +/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_x = -8 + }, /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, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/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 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/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, @@ -7444,35 +7757,23 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "Sv" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; - 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/pod/dark, /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, @@ -7502,79 +7803,57 @@ /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/tech/grid, /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/pod/dark, /area/ship/engineering/atmospherics) "SM" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 }, -/obj/structure/sign/warning/radiation{ - pixel_x = -32 +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 }, -/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 @@ -7588,10 +7867,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" = ( @@ -7603,56 +7887,71 @@ /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/effect/turf_decal/syndicateemblem/top/right{ + dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 }, -/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/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/closet/emcloset/anchored, -/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/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/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, /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" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/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 @@ -7676,21 +7975,34 @@ /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/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter"; + req_access = list(150,10); + dir = 4 }, -/turf/open/floor/plating, -/area/ship/security) -"TR" = ( -/obj/machinery/power/terminal{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/turf/open/floor/engine, +/area/ship/engineering/engine) +"TR" = ( +/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/tech/grid, /area/ship/engineering/atmospherics) "TT" = ( /obj/machinery/vending/wallmed{ @@ -7701,6 +8013,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 @@ -7714,33 +8034,41 @@ /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/tech/grid, /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/effect/turf_decal/techfloor{ - dir = 1 +/obj/item/wallframe/extinguisher_cabinet{ + pixel_y = 17; + pixel_x = -2 }, -/obj/effect/turf_decal/corner/opaque/syndiered/half, -/obj/structure/rack, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plating, /area/ship/bridge) "Ug" = ( /obj/machinery/power/emitter/welded, @@ -7751,15 +8079,31 @@ /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/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "explosives locker" + }, +/obj/item/storage/backpack/duffelbag/syndie/c4{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/gun/ballistic/rocketlauncher{ + pixel_y = 6; + pixel_x = -3 + }, +/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 = -3 + }, +/obj/item/ammo_casing/caseless/rocket{ + pixel_x = -6; + pixel_y = -3 }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) @@ -7769,14 +8113,32 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ux" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/window/reinforced/spawner{ +/obj/machinery/door/airlock/medical/glass{ + req_one_access_txt = "150"; + req_access = list(150); dir = 4 }, -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/turf/open/floor/plasteel, -/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, @@ -7789,10 +8151,12 @@ /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" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) @@ -7821,7 +8185,6 @@ /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 }, @@ -7833,20 +8196,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/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, /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" @@ -7877,9 +8233,8 @@ /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) +/turf/open/floor/wood, +/area/ship/crew/canteen) "Va" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -7895,51 +8250,28 @@ /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 }, /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" = ( @@ -7972,76 +8304,103 @@ /turf/open/floor/plating, /area/ship/cargo) "VG" = ( -/obj/structure/chair/stool/bar{ - dir = 1 +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/turf/open/floor/pod/dark, +/area/ship/cargo) +"VH" = ( +/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/border, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) -"VH" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/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{ - 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" = ( -/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/structure/table/wood, +/obj/machinery/door/firedoor/border_only, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -5; + pixel_y = 10 }, -/obj/machinery/turretid{ - pixel_y = 32; - req_access = null; - req_access_txt = "150" +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 3; + pixel_y = 6 }, -/obj/effect/turf_decal/spline/fancy/opaque/black/corner, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_y = 3; + pixel_x = -3 + }, +/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, @@ -8054,6 +8413,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" = ( @@ -8070,28 +8432,13 @@ }, /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, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "Wm" = ( /obj/structure/table, /obj/item/storage/bag/medical{ @@ -8110,34 +8457,17 @@ pixel_y = -1; pixel_x = -5 }, -/turf/open/floor/plasteel/dark, -/area/ship/medical) -"Wo" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/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" +/turf/open/floor/plasteel/dark, +/area/ship/medical) +"Wo" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/turf/open/floor/pod/dark, +/area/ship/cargo) "Ws" = ( /obj/effect/turf_decal/atmos/plasma{ dir = 8 @@ -8145,12 +8475,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 @@ -8158,24 +8492,31 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "WC" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/atmospherics/pipe/manifold/purple/visible, +/obj/effect/turf_decal/techfloor/orange{ + dir = 10 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) +"WG" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter"; - req_access = list(150,10); +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/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/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/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 @@ -8198,16 +8539,15 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "WL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "WR" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 @@ -8218,73 +8558,76 @@ /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/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter"; + req_access = list(150,10); + dir = 4 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ship/engineering/engine) "WX" = ( -/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/corner/opaque/syndiered{ + dir = 5 }, -/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/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/firecloset/wall{ + pixel_y = 28 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/effect/turf_decal/borderfloorblack, +/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, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/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, +/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" = ( -/obj/structure/rack, -/obj/effect/turf_decal/box/white/corners{ +/obj/structure/table/wood, +/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" = ( +/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/structure/sign/poster/contraband/space_cola{ + pixel_y = 32 }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm/dormtwo) +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/starboard) "Xj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ dir = 8 @@ -8292,14 +8635,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, @@ -8335,42 +8674,27 @@ /obj/machinery/camera/autoname{ dir = 8 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /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 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 10 }, -/obj/machinery/power/terminal{ +/obj/effect/turf_decal/techfloor/orange{ 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 - }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "XU" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -8379,20 +8703,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{ @@ -8405,9 +8720,6 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Yi" = ( -/obj/structure/chair{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, @@ -8420,17 +8732,30 @@ pixel_x = 20; pixel_y = 11 }, +/obj/structure/chair{ + dir = 1 + }, /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, -/turf/open/floor/plating, +/obj/effect/turf_decal/corner/opaque/syndiered/border{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/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{ @@ -8454,20 +8779,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, @@ -8485,39 +8807,45 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark, -/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/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 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/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) -"YB" = ( -/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ - dir = 1 +/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/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/pod/dark, /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 }, @@ -8545,86 +8873,146 @@ /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) +/obj/item/gun/ballistic/automatic/smg/c20r{ + pixel_y = -2; + 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" = ( -/obj/structure/closet/secure_closet/engineering_personal{ - req_access = list(150,10) +/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/effect/turf_decal/corner/opaque/orange{ - dir = 10 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/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) +/turf/open/floor/mineral/plastitanium, +/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{ +/obj/machinery/camera/autoname{ + dir = 6 + }, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 8 + }, +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered/border, /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 + dir = 4 }, -/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 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Zt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/cryopod/syndicate{ + dir = 4 + }, +/obj/effect/turf_decal/techfloor{ + dir = 9 }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) +"Zu" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/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 @@ -8649,13 +9037,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" = ( @@ -8664,33 +9048,26 @@ }, /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/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "ZO" = ( /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 - }, /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" = ( @@ -8719,7 +9096,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) @@ -8836,25 +9212,25 @@ 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 @@ -8867,33 +9243,33 @@ mp mp mp FR -TR xh XN eg OZ cL KU -Vk +zi xw hZ Rc -WX +SK +iL Fm DK IU -DF -pw +si Rj YB gv -KU +tg zi Ke zs Ua SI TR +PE FR mp mp @@ -8902,25 +9278,24 @@ 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 @@ -8929,6 +9304,7 @@ lv eQ Mo GC +iG FR mp mp @@ -9151,7 +9527,7 @@ ZX Qd bM zH -bV +zZ ZX hN IT @@ -9160,7 +9536,7 @@ Zz Zz ZD ZD -WC +WV ZD ZD um @@ -9186,7 +9562,7 @@ ZX fz zK qK -YR +Zc ZX RG BV @@ -9216,12 +9592,12 @@ mp (15,1,1) = {" mp mp -bL +mp ZX WK pB wA -bQ +De ZX Dk NI @@ -9230,7 +9606,7 @@ ZD ZD ZD ZD -AL +TM ZD ZD ZD @@ -9274,10 +9650,10 @@ Et yf qo mX +ia Vy Hu Pb -yn FR mp mp @@ -9293,7 +9669,7 @@ xj xj xj xj -oB +fN ZD Na vJ @@ -9312,7 +9688,7 @@ PL PL PL PL -jA +kT Bj Bj Bj @@ -9320,13 +9696,13 @@ We "} (18,1,1) = {" xj -RB -jx Ii +iu +jo pj qA Fa -nE +fQ xj Kq ZD @@ -9343,27 +9719,27 @@ xo pc TT PL +Gm Si Sg -wR PL -NE +Fu +sd yN nr Bj -Bj "} (19,1,1) = {" xj -xj -Ux +qP +sf Kx -fN -mO +ih +UW Qa -dD +lY xj -Jz +cW ZD ZD ZD @@ -9378,30 +9754,30 @@ ZD ZD ZD PL -Si -si +dm +cD sr Eo -lT -da -vn -Bj +Tt +sd +ET +ET Bj "} (20,1,1) = {" -mp -xj -Sj -VO -wz -VG -qP +ML +dD +sf +VU +ih +UW +Qa ma xj +VH yF -SM -sd -xP +oX +Sk xa Ru Ei @@ -9411,32 +9787,32 @@ xa xP oX PN -PN +ec PL -sG +YO ji wg -gk -Kg -IB -fX +Uc +mO +sd +ET +fK Bj -mp "} (21,1,1) = {" -mp ML -lY -VO -tU -VG -cD +Yo +sf +Xf +ih +UW +UW ml Yl +Jz DW -YT -gW -cq +ea +Nh ag Ax kd @@ -9445,32 +9821,32 @@ jk ag cq ea +BG tY -kl PL -Si Rv +jx TC on -cX -AK +ep +sd +da kH Bj -mp "} (22,1,1) = {" -mp -ML -sf +xj +wb +aG VO ih Ky dU Qv UF -HL -lw -vz +AL +lT +uH vz vz uE @@ -9480,33 +9856,33 @@ gX sO sO sO -VH -oi +AK +Pe PL -Si +Bq +Fr Up -hS PL -Nh -MK -vE +Tt +sd +Bj +Bj Bj -mp "} (23,1,1) = {" -mp xj -dH -lq -Sy -Bq -gZ -zP -dp +xj +xj +xj +xj +xj +xj +xj +xj +Tn WL -ru vz -Wj +eF Cj ON MA @@ -9515,66 +9891,66 @@ Qs Ry PM sO +xz kR -Fr PL PL jH jH PL -BG +BL +EG da -Xf +pN Bj -mp "} (24,1,1) = {" -mp -JM -JM -JM -JM -JM -JM JM +hP +Ed +CJ +Sj +Nr +gZ +GH JM -mG -lw +Sy +lT vz -dm +kl yM ts -Xg +fX vz ID TI Fj sO -KJ -ox -IC +QC +Cq +Bj aD +nt 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 @@ -9585,101 +9961,101 @@ sp sp Ee sp -VY -GH +TU +vE Bj -Ed +pw ow +gk oG -pR -KK -AK -Ey +Tt +EG +ET +ET Bj -mp "} (26,1,1) = {" -mp -Wd -Wd Wd +Zt +Yn +lG Wd -WG +ln Ql -QR +bV JM +IB oi -zO sp cC ir mm Ls -HQ +Ls AQ oJ NC sp +WX Fl -cd -Bj Bj +YR dq Bj Bj -pD -sc -pN +Tt +sd +da +fJ Bj -mp "} (27,1,1) = {" -mp Wd +Sb +Zu gz yO -Wd +DF ps No -aA JM +IC tH -At sp qN im -hE +im kF Xq KF WB wa sp -Gy -oi +wh +Pe +Bj +ET +ET +ET Bj -pL -SV -pE Dp -CJ -da -Eh -wh -mp +sd +Bj +Bj +Bj "} (28,1,1) = {" -mp Wd +KK +cj fn -iG -SR -FI -YO +Wd +SZ +bv Fi JM -Zt -pO +YT +cT sp pm qT @@ -9690,32 +10066,32 @@ Dx gL GG sp +wh Gy -nt -Bj +KJ +sG Gk HH Pa +At +sd +da +pN 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 +BT sp Ee sp @@ -9724,34 +10100,34 @@ CR sp sp Ee -sp -kT -oi -Bj -Bj +Eq +qp +Pe Bj Bj Bj -fJ -AK +Ey +Ey +kf +sd +ET fK -TM -mp +Bj "} (30,1,1) = {" mp lo CV Go +pH +GP +SR Bw -Bw -Bw -Bw +pD Yz hr -Id -BK -Yp +ZO +pR Xs Id UA @@ -9760,18 +10136,18 @@ bH pU Yp ZO -Id +ru +WG lg tn -Yn Bj -GD -mB +KB +dE +HG EG -ia -ia +ET +ET Bj -mp "} (31,1,1) = {" mp @@ -9779,34 +10155,34 @@ VC AW ZC Um -pH -ep +tp +VG Bw -KJ -oi -UW +Wj +IB +nE IN wu If -KM +oB KM yX KM kM XE -sz -KM +IN +SM +ak Pe -oi -Gm +hS Bj -CQ +dH +GD Nj +eN +da +Bn Bj -CQ -SZ -Bj -mp "} (32,1,1) = {" JT @@ -9814,34 +10190,34 @@ VC AW UK EO -fQ EQ +dp +Bs KQ yz ZJ -Zc ex dz -uh -uh -tg +dz +dz uX +Ux uh 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 @@ -9849,12 +10225,12 @@ vQ dg NT Wo -Uc +Vk ng +vn KA Wy oj -eF dz ii XU @@ -9866,30 +10242,30 @@ YJ jM vW dz +JY gI fm -zZ -Bj -WV -xz Bj -BL +wx +ET +DB +gW +Yv qL Bj -mp "} (34,1,1) = {" mp jT Bw Bw +VY gE -Vv Zg Bw +cX dl bR -hP dz Dh st @@ -9901,17 +10277,17 @@ On JE rt dz +Kg ak Pe -cW Bj +QR +BK OY -MK -Bj +cd Bj Bj Bj -mp "} (35,1,1) = {" mp @@ -9922,11 +10298,11 @@ Bw Bw Bw Bw +pE GM -iL -je je je +FI je je Jf @@ -9937,14 +10313,14 @@ uK fl dz dz +Xg Fs -qp Bj Bj Bj Bj Bj -mp +Bj mp mp "} @@ -9953,31 +10329,31 @@ 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 +dk +Qk XL -RW +SV GN -NF -IV +zk mp mp mp @@ -9988,12 +10364,12 @@ mp mp mp ZV -IV +He +yn ql Yj -RW -GW -kf +yP +hd je hb jz @@ -10007,12 +10383,12 @@ Ap Ie FW dz +wR Qk XL RW lO zk -IV xZ mp mp @@ -10024,11 +10400,11 @@ mp mp mp vd -xB -xB -xB -gi -pO +NE +NE +NE +kc +GW je zG hW @@ -10042,8 +10418,8 @@ WR Ie Ks dz -KJ -hd +dk +lx xB xB xB @@ -10061,9 +10437,9 @@ mp mp mp mp -xB -HY -EX +NE +RB +mG je iZ Iw @@ -10077,8 +10453,8 @@ nb VM SS dz +dk ka -lx xB mp mp @@ -10100,17 +10476,17 @@ nb Ym nb nb -Pv -pp +nb +nb nb Xc Kk -KB +mB zp np nb -jv -hj +nb +nb nb nb Fh @@ -10135,17 +10511,17 @@ Hj do wL nb -nb -nb -nb +Pv +jv +jO +ox Xb vL -wb -vL -lG -nb -nb -nb +cI +bL +Hx +Qt +Lw nb MP Oj @@ -10170,17 +10546,17 @@ bo Gv RA nb -Qt +lq +br dL zy xg pI Zk bd -PA +Bi kE wr -Yo nb BU et @@ -10205,17 +10581,17 @@ eL Fq QT en +jA +oD oD -Bc Bc ie VJ aX vO hU -dk -dk -dk +hU +hU vA yg Ir @@ -10240,17 +10616,17 @@ nb PB nb nb +YW Tl -vL +PA OK FS kV mx WZ +Tv +HL tZ -vL -OK -Fu nb nb hR @@ -10277,13 +10653,13 @@ Fc nb VB nb -VU -cj +bQ +YF +YF EJ -UI +YF YF Sd -Jw nb FV nb @@ -10308,17 +10684,17 @@ mp nb iK jG -Fc +nw nb mp QE uo -pr +sc +Sa +EX Sa -Gj tS tr -YW QE mp nb @@ -10353,7 +10729,7 @@ jh zf oP Ao -RT +aA QE mp nb diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index ac66aa4f6f26..7ee4a5ce668c 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/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 0b2bb80505d6..62f46fb38848 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -77,16 +77,15 @@ /datum/outfit/job/syndicate/assistant/twink name = "Syndicate - Deck Assistant (Twinkleshine)" - uniform = /obj/item/clothing/under/syndicate/intern + 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 = /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 + gloves = null + ears = null implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -181,7 +180,6 @@ backpack_contents = list(/obj/item/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup - /datum/outfit/job/syndicate/bartender/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -190,18 +188,19 @@ 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 = "Syndicate - Bartender (Twinkleshine)" + name = "Syndicate - 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 = /obj/item/clothing/shoes/laceup + gloves = null + ears = null + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -241,7 +240,7 @@ duffelbag = /obj/item/storage/backpack/duffelbag courierbag = /obj/item/storage/backpack/messenger -//Capitan +//Captain /datum/outfit/job/syndicate/captain name = "Syndicate - Captain" @@ -265,22 +264,21 @@ box = /obj/item/storage/box/survival/syndie /datum/outfit/job/syndicate/captain/aclf - name = "Syndicate - Captain (ACLF)" + name = "Captain (ACLF)" + /datum/outfit/job/syndicate/captain/twink - name = "Syndicate - Captain (Twinkleshine)" + name = "Flotilla Admiral (Twinkleshine, ACLF)" uniform = /obj/item/clothing/under/syndicate/ngr/officer - gloves = /obj/item/clothing/gloves/combat + head = 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/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 + backpack_contents = null implants = list(/obj/item/implant/weapons_auth) @@ -526,22 +524,25 @@ 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/ngr/officer - head = /obj/item/clothing/head/HoS/beret/syndicate - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/chameleon + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + id = /obj/item/card/id/syndicate_command/lieutenant + head = null + ears = null 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 + l_pocket = null + r_pocket = null + belt = null shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/armor/vest - alt_suit = /obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain - id = /obj/item/card/id/syndicate_command/lieutenant + suit = null + suit_store = null + alt_suit = null 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 @@ -554,7 +555,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 @@ -575,6 +576,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 (Twinkleshine, 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 @@ -657,22 +672,25 @@ 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 + id = /obj/item/card/id/syndicate_command/crew_id/med + belt = null + head = null 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 = null + alt_suit = null suit_store = null - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon - id = /obj/item/card/id/syndicate_command/crew_id/med + ears = null + l_pocket = null + r_pocket = null implants = list(/obj/item/implant/weapons_auth) + backpack_contents = null + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med @@ -809,19 +827,22 @@ /datum/outfit/job/syndicate/security/twink name = "Syndicate - Operative (Twinkleshine)" + 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 = /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) - 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 @@ -876,18 +897,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/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 - implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id/engi + 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/jackboots/suns + glasses = null + gloves = null + ears = null + r_pocket = null + l_pocket = null + belt = null backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -962,23 +983,23 @@ 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 + 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 + glasses = null + head = null + gloves = /obj/item/clothing/gloves/tackler/combat + belt = null shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/hazardvest - alt_suit = /obj/item/clothing/suit/toggle/hazard + 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 2bd5c2fd4667..f46d7768b1f7 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))