From c63fdc1e9863f9333098d0f31127acae1fa96f83 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 2 Sep 2024 16:06:08 +0200 Subject: [PATCH 01/49] queue spy music --- .../configs/syndicate_cybersun_kansatsu.json | 16 +- .../syndicate/syndicate_cybersun_kansatsu.dmm | 3583 ++++++++++------- .../shuttles/syndicate_cybersun_kansatsu.dm | 190 + code/game/objects/items/storage/firstaid.dm | 8 + .../clothing/outfits/factions/syndicate.dm | 22 + shiptest.dme | 1 + 6 files changed, 2327 insertions(+), 1493 deletions(-) create mode 100644 code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index a9c9fcb94349..072737ff432e 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -7,32 +7,28 @@ "NATURAL_AGGRESSIVE" ], "map_name": "Kansatsu-class Scout Courier", - "description": "The Kansatsu-class is a Cybersun remodel of the old Type-S SolGov Courier, rebuilt for rapid package ferrying and light surveillance operations in the Frontier. While fairly cramped, it excels at its design goals, with rapid surveys, scouting, and espionage flowing from its presence. Syndicate deployments typically include a deployment of 5, with a recommended max of 7. This is broken down into 1 captain, an intelligence officer for coordinating the field agents, an engineer, and 2 field agents. The simplicity of the hull has led to the ship becoming a widespread indicator of Syndicate interest in locations, and some models have found their way into private purchasers' hands.", + "description": "This aged poorly. Gotta make a new desc. Now, allow me to reach the minimum amount of symbols. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "tags": [ "Specialist" ], + "starting_funds": 4000, "map_short_name": "Kansatsu-class", "map_path": "_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm", "map_id": "cybersun_kansatsu", "job_slots": { - "Commander": { + "Intelligence Director": { "outfit": "/datum/outfit/job/syndicate/captain/cybersun", "officer": true, "slots": 1 }, - "Intelligence Officer": { - "outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun", - "officer": true, - "slots": 1 + "Field Agent": { + "outfit": "/datum/outfit/job/syndicate/miner/cybersun", + "slots": 2 }, "Engineer": { "outfit": "/datum/outfit/job/syndicate/engineer/cybersun", "slots": 1 }, - "Field Agent": { - "outfit": "/datum/outfit/job/syndicate/miner/cybersun", - "slots": 2 - }, "Junior Agent": { "outfit": "/datum/outfit/job/syndicate/assistant/cybersun", "slots": 2 diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index ffc2472b5dec..b8997ce86a4e 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1,102 +1,144 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_bridge" }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/bridge) +"ah" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 2; + color = "#FFFFFF" }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 + dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"ah" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 1 +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) +"aj" = ( +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = 10 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10; + color = "#E6D2BA" + }, +/obj/item/stamp/cybersun{ + pixel_x = -4 }, +/obj/item/pen/fourcolor, +/obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/white, -/area/ship/engineering) +/area/ship/bridge) "aQ" = ( -/obj/effect/decal/cleanable/glass, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/security/armory) +"aT" = ( +/obj/effect/turf_decal/siding/wood/end{ + dir = 8; + color = "#E6D2BA" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/engineering) -"aT" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -5 + }, +/obj/structure/extinguisher_cabinet/directional/south{ + pixel_x = 7 }, -/obj/machinery/holopad/emergency/command, /turf/open/floor/plasteel/white, /area/ship/bridge) "aZ" = ( -/obj/structure/rack, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/effect/turf_decal/box, -/obj/machinery/firealarm/directional/west, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) +/obj/structure/table/chem, +/obj/machinery/light/directional/east, +/obj/machinery/cell_charger, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "bn" = ( -/obj/structure/sign/poster/retro/we_watch, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 4 + }, +/obj/structure/railing, +/obj/machinery/camera{ + dir = 8; + c_tag = "Engineering" + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie{ + name = "black engineering space helmet" + }, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/shoes/magboots/syndie, +/turf/open/floor/plasteel/white, +/area/ship/engineering) "bI" = ( -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/glass, -/obj/machinery/autolathe, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1 +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/industrial/warning{ + dir = 9; + color = "#FFFFFF" }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "bO" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/bridge) -"co" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ +"cd" = ( +/obj/effect/turf_decal/industrial/stand_clear/red{ dir = 1 }, -/obj/item/storage/firstaid/medical, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular, -/obj/structure/closet/wall/white/directional/south{ - name = "Medical Supplies" +/obj/machinery/door/poddoor{ + dir = 2; + id = "kansatsu_cargo" + }, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "kansatsu_holo" }, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) +"co" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1; + color = "#FFFFFF" + }, +/obj/structure/extinguisher_cabinet/directional/west{ + pixel_y = -8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/firealarm/directional/west{ + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, /area/ship/crew) "cu" = ( -/obj/machinery/door/airlock/external, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 1 - }, /obj/docking_port/mobile{ callTime = 250; dir = 2; @@ -105,430 +147,524 @@ port_direction = 8; preferred_direction = 4 }, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/plasteel/white, +/turf/closed/wall/mineral/plastitanium, /area/ship/engineering) "cw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 }, -/turf/open/floor/plasteel/tech/techmaint, +/obj/structure/chair/handrail, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "cL" = ( +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_y = 22 - }, /turf/open/floor/plasteel/white, /area/ship/engineering) "cZ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) "df" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/cable/orange{ + icon_state = "1-8" }, -/obj/effect/turf_decal/trimline/opaque/bar/filled/warning, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, /turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/area/ship/crew) "dj" = ( -/obj/item/toy/cards/deck, -/obj/machinery/light/small/broken/directional/north, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer2{ +/obj/machinery/camera{ + dir = 6; + c_tag = "Airlock - Internal" + }, +/obj/machinery/advanced_airlock_controller{ + pixel_y = 24 + }, +/obj/item/radio/intercom/directional/east, +/obj/structure/chair/handrail{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/tech, /area/ship/engineering) "dq" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/effect/turf_decal/box, -/obj/structure/closet/crate{ - name = "communications gear" +/obj/machinery/door/airlock/maintenance/external/glass{ + name = "Cargo Bay" }, -/obj/item/modular_computer/tablet/preset/advanced, -/obj/item/modular_computer/tablet/preset/advanced, -/obj/item/modular_computer/tablet/preset/advanced, -/obj/item/modular_computer/tablet/preset/advanced, -/obj/item/paper{ - default_raw_text = "Congratulations on your purchase of Cybersun G-1010 Long Range Communication Tables (Chat client installed seperately)" +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/plasteel/tech/grid, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "dx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/table/glass, +/obj/item/reagent_containers/food/drinks/sillycup/smallcarton{ + pixel_x = -7; + list_reagents = list(/datum/reagent/consumable/tomatojuice = 15) }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ +/turf/open/floor/plasteel/tech, +/area/ship/crew) +"dA" = ( +/obj/effect/turf_decal/corner/opaque/white/half{ dir = 4 }, -/obj/structure/sign/poster/contraband/robustmore_drinkfoods{ - pixel_y = -32 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 }, -/turf/open/floor/plasteel/dark, +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = 8 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 1 + }, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" + }, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/white, /area/ship/crew) -"dA" = ( -/obj/machinery/door/airlock/command{ - dir = 4; - name = "Bridge" +"dZ" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/machinery/door/poddoor/shutters/preopen{ +/obj/structure/curtain/cloth/grey, +/turf/open/floor/plasteel/stairs/left{ dir = 4; - id = "intelfucky" + color = "#555555" }, +/area/ship/bridge) +"ej" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/structure/chair/handrail{ + dir = 1 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/turf/open/floor/plasteel/white, +/area/ship/crew) +"eu" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/box/bodybags, +/obj/item/clothing/gloves/color/latex/nitrile/evil, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular, +/obj/item/roller, +/obj/item/reagent_containers/hypospray/medipen/morphine, +/obj/item/reagent_containers/hypospray/medipen/salbutamol, +/obj/item/reagent_containers/hypospray/medipen/salbutamol, +/obj/item/reagent_containers/hypospray/medipen/survival, +/obj/item/reagent_containers/hypospray/medipen/survival, +/obj/item/reagent_containers/hypospray/medipen/survival, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"dZ" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "intelwindow" +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/ship/crew/office) -"ej" = ( +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) +"ev" = ( +/obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ - dir = 8 +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/spline/fancy/transparent/grey{ - dir = 4 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -19; + pixel_y = 5 }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) -"eu" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/structure/cable{ - icon_state = "2-8" +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"eL" = ( +/obj/machinery/door/poddoor{ + dir = 2; + id = "kansatsu_cargo" }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/cargo) -"ev" = ( -/obj/machinery/door/window{ - dir = 1 +/obj/machinery/door/firedoor/heavy, +/obj/structure/cable/orange{ + icon_state = "1-4" }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/cable/orange{ + icon_state = "1-8" }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/industrial/stand_clear/red{ dir = 1 }, -/turf/open/floor/plasteel/stairs, +/turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/machinery/computer/cargo{ - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#E6D2BA" }, -/obj/machinery/button/door{ - dir = 1; - id = "intelfucky"; - name = "Privacy Lock"; - pixel_x = -7; - pixel_y = -23 +/obj/item/radio/intercom/directional/west{ + pixel_y = -2 }, -/obj/effect/turf_decal/industrial/outline/red, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/bed/dogbed{ + anchored = 1; + desc = "A comfy-looking snake bed. There's bits of shed scales stuck in the bedding."; + name = "snake bed" + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "gj" = ( -/obj/item/toy/plush/spider, -/obj/structure/closet/emcloset/anchored, -/obj/item/clothing/head/papersack, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 4 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"gP" = ( -/obj/machinery/door/poddoor{ - id = "scbay" +/obj/machinery/light/directional/north, +/obj/item/ammo_box/c10mm{ + pixel_y = 7; + pixel_x = -3 }, -/obj/structure/cable, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 4; - id = "scholo" +/obj/item/ammo_box/c10mm/rubbershot{ + pixel_x = 1; + pixel_y = 2 }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) +"gP" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 2; + color = "#FFFFFF" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/obj/structure/closet/crate/internals, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "hr" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#555555" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/binary/valve/digital/on/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/closet/firecloset/wall/directional/east, +/turf/open/floor/plasteel/mono/white, /area/ship/engineering) "hT" = ( -/obj/structure/curtain/cloth, /obj/machinery/shower{ pixel_y = 16 }, -/obj/structure/mirror{ - pixel_x = -28 +/obj/structure/catwalk/over/plated_catwalk/white, +/obj/structure/curtain, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"if" = ( +/obj/effect/turf_decal/box/white, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/black, +/obj/item/clothing/head/helmet/space/syndicate/black, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/tank/jetpack/oxygen/harness, +/obj/machinery/button/shieldwallgen{ + dir = 1; + id = "kansatsu_holo"; + pixel_x = -10; + pixel_y = -19 }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew/dorm) +/obj/structure/sign/poster/contraband/cybersun_borg{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) "ii" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/autolathe, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 }, -/obj/effect/decal/cleanable/oil, -/obj/effect/turf_decal/spline/fancy/transparent/grey{ - dir = 6 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 19; + pixel_y = -12 }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/white, /area/ship/engineering) "im" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable/orange{ + icon_state = "1-8" }, -/turf/open/floor/plating, +/obj/structure/cable/orange{ + icon_state = "6-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "in" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 8 +/obj/structure/table/chem{ + name = "kitchen counter" }, -/obj/machinery/camera/autoname{ - dir = 8 +/obj/machinery/microwave{ + pixel_y = 6 }, -/obj/machinery/light_switch{ - pixel_y = 23; - pixel_x = -12 +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = 32 }, /turf/open/floor/plasteel/dark, /area/ship/crew) "iL" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/isf_small{ + color = "#000000"; + dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/ship/engineering) "iN" = ( -/obj/effect/turf_decal/industrial/stand_clear{ - dir = 1 +/obj/structure/closet/crate/science, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/turf_decal/industrial/warning, -/obj/structure/cable{ - icon_state = "2-8" +/obj/item/modular_computer/tablet/preset/advanced{ + device_theme = "syndicate" }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/item/modular_computer/tablet/preset/advanced{ + device_theme = "syndicate" + }, +/obj/item/modular_computer/tablet/preset/advanced{ + device_theme = "syndicate" + }, +/obj/item/modular_computer/tablet/preset/advanced{ + device_theme = "syndicate" + }, +/obj/item/modular_computer/tablet/preset/advanced{ + device_theme = "syndicate" }, -/turf/open/floor/plasteel/tech/techmaint, +/obj/item/modular_computer/tablet/preset/advanced{ + device_theme = "syndicate" + }, +/obj/item/disk/holodisk/kansatsu/gear/tablets, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "iY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/rack, +/obj/structure/cable/orange{ + icon_state = "0-8" }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/item/stack/sheet/plastic/five, +/obj/item/stack/sheet/glass/twenty, +/obj/item/stack/sheet/metal/twenty, +/obj/structure/railing{ + dir = 8; + layer = 2.91 }, -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/spline/fancy/transparent/grey, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/ship/engineering) "jj" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/cargo) +/obj/machinery/blackbox_recorder, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "jH" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/structure/cable/orange{ + icon_state = "0-4" }, -/obj/item/storage/secure/safe/intel/stechkin{ - pixel_x = -30; - dir = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/office) +/turf/open/floor/plasteel/white, +/area/ship/engineering) "jW" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/bar/filled/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/area/ship/crew) "kb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/structure/table/wood, -/turf/open/floor/carpet/red, +/turf/open/floor/plasteel/dark, /area/ship/crew) "km" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/table, -/obj/item/chair/plastic, -/obj/item/chair/plastic{ - pixel_y = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#FFFFFF" }, -/obj/item/chair/plastic{ - pixel_y = 16 +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable/white{ + icon_state = "0-2" }, -/obj/item/stack/sheet/mineral/wood{ - amount = 3 +/obj/structure/closet/secure_closet/wall/directional/west{ + icon_state = "cargo_wall"; + name = "fuel storage"; + req_access_txt = "11" }, -/obj/item/stack/sheet/metal/ten, -/obj/item/stack/sheet/metal/ten, -/obj/item/stack/sheet/glass/five, -/obj/item/stack/sheet/glass/five, -/turf/open/floor/plating, +/obj/item/stack/sheet/mineral/diamond/five, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "kL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass{ - name = "Crew Quarters" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, +/obj/structure/chair/bench/red/directional/west, +/obj/structure/railing, /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/tech, /area/ship/crew) "kM" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/crew) -"lJ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 4 +"lh" = ( +/obj/machinery/computer/cryopod/directional/east, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/dark, -/area/ship/crew) +/area/ship/crew/dorm) +"lJ" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#E6D2BA" + }, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/drinks/bottle/wine{ + pixel_y = 7; + pixel_x = 9 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "lP" = ( -/obj/effect/turf_decal/box, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8; - piping_layer = 2 +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1; + color = "#FFFFFF" }, -/obj/effect/turf_decal/spline/fancy/transparent/grey{ +/obj/structure/chair/office/light{ dir = 4 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "lZ" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/office) +/obj/machinery/computer/helm/viewscreen/directional/south, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) "mD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 8 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "thefunny" +/obj/machinery/light_switch{ + pixel_y = -19; + dir = 1; + pixel_x = -8 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/door/airlock/grunge{ - name = "Office" +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/open/floor/plasteel/white, -/area/ship/crew/office) +/area/ship/crew) "ni" = ( /obj/machinery/power/shuttle/engine/electric{ dir = 4 @@ -538,1512 +674,1942 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"nq" = ( +/obj/machinery/camera{ + dir = 10; + c_tag = "Airlock - External" + }, +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) "nu" = ( -/obj/structure/sign/departments/engineering, -/turf/closed/wall/mineral/plastitanium, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/isf_small/right{ + color = "#000000"; + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/ship/engineering) "nA" = ( -/obj/item/paper_bin, -/obj/structure/table/glass, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 +/obj/structure/cable/orange{ + icon_state = "1-8" }, -/obj/item/storage/box/rxglasses/spyglasskit, -/obj/item/kitchen/knife/letter_opener, -/turf/open/floor/plasteel/dark, -/area/ship/crew/office) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "nF" = ( +/obj/docking_port/stationary{ + dwidth = 7; + width = 30; + height = 15; + dir = 2 + }, +/turf/template_noop, +/area/template_noop) +"nO" = ( +/obj/machinery/camera{ + dir = 5; + c_tag = "Exterior - Aft-Starboard" + }, +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 6; + pixel_y = 12; + pixel_x = -8; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + }, +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/ship/bridge) +"oC" = ( +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/crew) +"oN" = ( +/obj/structure/railing, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/holopad/secure, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 }, -/obj/machinery/light_switch{ - pixel_y = 22 +/obj/effect/turf_decal/trimline/opaque/syndiered, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew) +"oW" = ( +/obj/machinery/computer/cargo{ + dir = 8; + icon_keyboard = "syndie_key"; + icon_state = "computer-right" }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) -"nO" = ( -/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ - dir = 1 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 }, -/obj/effect/turf_decal/box/red, -/obj/machinery/camera, -/turf/open/floor/plating, -/area/ship/external) -"oN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock{ - name = "Cryopod Room" +/obj/structure/railing{ + dir = 6 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 1 +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/bridge) +"pa" = ( +/obj/structure/closet/wall/directional/south{ + name = "Agent Wardrobe" + }, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/head/soft/cybersun, +/obj/item/clothing/head/soft/cybersun, +/obj/machinery/camera{ + dir = 8; + c_tag = "Dormitory" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/firealarm/directional/east{ + pixel_y = 5 }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = -7 }, -/turf/open/floor/plasteel/tech, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) -"pa" = ( -/obj/machinery/fax/syndicate, -/obj/item/toy/figure/detective{ - name = "Intel Buddy"; - pixel_x = 5; - pixel_y = 10; - toysay = "Let's see what Command thinks of this..." +"pE" = ( +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 5 }, -/obj/structure/table/glass, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 6; + pixel_y = 12; + pixel_x = -8; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/office) +/obj/machinery/camera{ + dir = 5; + c_tag = "Exterior - Starboard" + }, +/turf/open/floor/plating/airless, +/area/ship/bridge) "pM" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/office) +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/extinguisher_cabinet/directional/south{ + pixel_x = 7 + }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) "qa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/structure/closet/secure_closet/wall/directional/south{ + name = "Engineer's Locker"; + icon_state = "sec_wall"; + req_access_txt = "11" }, -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/spline/fancy/transparent/grey{ - dir = 6 +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/turf/open/floor/plating, +/obj/item/clothing/under/syndicate/gec, +/obj/item/clothing/under/syndicate/cybersun/research, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/head/soft/cybersun, +/obj/item/clothing/glasses/meson/engine, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 + }, +/obj/item/clothing/glasses/welding, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "qf" = ( -/obj/machinery/door/poddoor{ - id = "scbay" +/obj/effect/turf_decal/industrial/warning{ + dir = 2; + color = "#FFFFFF" }, -/obj/structure/cable, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 8; - id = "scholo" +/obj/structure/closet/crate{ + name = "mining equipment crate" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/turf/open/floor/plating, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "ql" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/sign/warning/securearea{ - pixel_y = 32 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/structure/closet/emcloset/wall/directional/north{ + populate = 0 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/obj/machinery/light/small/directional/south, +/obj/item/storage/toolbox/emergency, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/area/ship/crew) "qo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/sign/poster/official/here_for_your_safety{ - pixel_x = 28 - }, -/turf/open/floor/plasteel/white, -/area/ship/crew/office) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm) "qv" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ - dir = 4 - }, -/obj/structure/window/reinforced, /obj/structure/cable{ icon_state = "0-8" }, -/obj/item/clothing/mask/fakemoustache, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "scengine" +/obj/machinery/door/poddoor{ + dir = 8; + id = "kansatsu_engine" }, -/turf/open/floor/plating, +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "qz" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/syndicate/black/red, -/obj/item/clothing/head/helmet/space/syndicate/black/red, -/obj/item/tank/jetpack/oxygen/harness, -/obj/machinery/light/small/directional/north, -/obj/item/clothing/mask/gas/syndicate, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/central) +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/structure/chair/handrail, +/turf/open/floor/plasteel/white, +/area/ship/crew) "qA" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/dorm) +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"qJ" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) "qR" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/airlock/hatch{ + name = "Dormitory" }, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/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/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm) +"qS" = ( +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/window{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_y = 22; - pixel_x = -11 +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/office) -"qS" = ( -/obj/effect/turf_decal/trimline/opaque/bar/filled/warning, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/area/ship/crew) "re" = ( -/obj/docking_port/stationary{ - dwidth = 3; - width = 7; - height = 15; - dir = 2 +/obj/machinery/door/poddoor{ + dir = 2; + id = "kansatsu_cargo" }, -/turf/template_noop, -/area/template_noop) +/obj/machinery/door/firedoor/heavy, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/industrial/stand_clear/red{ + dir = 1 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "rh" = ( -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/catwalk/over/plated_catwalk/white, /turf/open/floor/plating, /area/ship/engineering) "rj" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/area/ship/crew) "ru" = ( -/turf/closed/wall/mineral/plastitanium, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/ship/engineering) "rF" = ( -/obj/machinery/button/door{ - dir = 8; - id = "scengine"; - name = "Engine Blast Shutters"; - pixel_x = -8 +/obj/effect/turf_decal/isf_small/left{ + color = "#000000"; + dir = 4 }, -/turf/closed/wall/mineral/plastitanium, +/turf/open/floor/plasteel/white, /area/ship/engineering) "rR" = ( -/obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/item/stack/sheet/mineral/plasma/twenty{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/wrench, -/turf/open/floor/plating, -/area/ship/engineering) +/turf/open/floor/plasteel/dark, +/area/ship/crew) "so" = ( -/obj/effect/decal/cleanable/oil/streak, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/spline/fancy/transparent/grey{ - dir = 5 +/obj/effect/turf_decal/industrial/warning{ + dir = 9; + color = "#FFFFFF" }, -/obj/structure/sign/poster/contraband/smoke{ - pixel_x = 32 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 }, -/turf/open/floor/plating, +/obj/structure/sink/kitchen{ + pixel_y = 16; + layer = 3.09; + name = "large sink" + }, +/mob/living/simple_animal/bot/cleanbot, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "sR" = ( -/obj/structure/chair/office{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/firealarm/directional/east, -/obj/structure/sign/poster/contraband/stechkin{ - pixel_y = -32 +/obj/structure/curtain/cloth{ + color = "#730622"; + icon_state = "bathroom-closed"; + open = 0; + opacity = 1; + layer = 4.25 }, -/turf/open/floor/plasteel/white, -/area/ship/crew/office) -"tk" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-2" +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 }, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/item/kirbyplants/fullysynthetic, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) -"tv" = ( -/obj/structure/sign/warning/securearea, -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) -"ty" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/rack, -/obj/effect/turf_decal/box, -/obj/structure/railing{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance/five, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/item/stack/marker_beacon/thirty, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"tD" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) +"sZ" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#FFFFFF" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/ship/engineering) -"tJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/airalarm/directional/east, +/obj/structure/sign/poster/contraband/stechkin{ + pixel_y = 32 + }, +/obj/structure/table/reinforced, +/obj/item/attachment/silencer{ + pixel_x = -13; + pixel_y = 2 + }, +/obj/item/storage/box/zipties{ + pixel_y = 11; + pixel_x = 6 + }, +/obj/item/attachment/silencer{ + pixel_x = -11; + pixel_y = 9 + }, +/obj/item/kitchen/knife/switchblade{ + pixel_x = 9 + }, +/obj/item/kitchen/knife/switchblade{ + pixel_x = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) +"tk" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/corner/opaque/white/half{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 }, -/obj/machinery/camera/autoname, -/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ - dir = 1 +/obj/item/kirbyplants/fullysynthetic{ + pixel_y = 20; + pixel_x = 6 }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/landmark/observer_start, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) -"tV" = ( -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 4; - pixel_x = 8 +/obj/structure/sign/warning/electricshock{ + pixel_y = 24; + pixel_x = -8 }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) -"uq" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/turf/open/floor/plasteel/white, +/area/ship/crew) +"tv" = ( +/obj/structure/table/reinforced, +/obj/structure/closet/secure_closet/wall/directional/west{ + icon_state = "sec_wall"; + name = "firearm locker"; + req_access_txt = "48" }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"uR" = ( -/obj/machinery/porta_turret/ship/syndicate/weak{ +/obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) -"vk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = 6; + pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag, +/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{ + pixel_y = 5 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) +"ty" = ( +/obj/structure/toilet{ + dir = 8; + pixel_x = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/camera{ + dir = 1; + c_tag = "Bathroom" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/structure/sink{ + pixel_y = 17; + pixel_x = -6 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) -"vL" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/mirror{ + pixel_y = 25; + layer = 2.89; + pixel_x = -7 }, -/obj/structure/cable{ +/obj/machinery/light/dim/directional/east, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew) +"tD" = ( +/obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, +/obj/structure/catwalk/over/plated_catwalk/white, /turf/open/floor/plating, /area/ship/engineering) -"vN" = ( -/obj/structure/table/reinforced, -/obj/item/binoculars, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable{ - icon_state = "0-2" +"tE" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1; + color = "#FFFFFF" }, -/obj/machinery/button/door{ - desc = "A remote control switch."; - id = "scbay"; - name = "Cargo Bay Doors"; - pixel_x = -7; - pixel_y = 9 +/obj/structure/table/chem, +/obj/item/storage/toolbox/syndicate{ + name = "syndicate toolbox"; + pixel_x = -1; + pixel_y = 6 }, -/obj/machinery/button/door{ - id = "scbridge"; - name = "Bridge Blast Shutters"; +/obj/item/reagent_containers/glass/beaker/plastic{ pixel_x = 5; - pixel_y = 9 + pixel_y = -10 }, -/obj/machinery/button/shieldwallgen{ - id = "scholo"; - name = "Holofield Controls"; - pixel_x = -9; - pixel_y = -3 +/obj/machinery/airalarm/directional/east, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) +"tJ" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 }, -/obj/machinery/light_switch{ - pixel_x = -20; - pixel_y = 12; +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"tV" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew) +"uq" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1; + color = "#E6D2BA" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plasteel/mono/dark, +/obj/structure/cable/orange{ + icon_state = "6-8" + }, +/mob/living/simple_animal/hostile/retaliate/poison/snake{ + icon = 'icons/mob/pets.dmi'; + icon_dead = "bookworm_dead"; + icon_living = "bookworm"; + icon_state = "bookworm"; + name = "Agent Berry"; + desc = "A red, slithery snake. This one is trained in corporate espionage. Allegedly, at least." + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) -"xf" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/industrial/warning/corner, -/obj/machinery/button/shieldwallgen{ - dir = 1; - id = "scholo"; - name = "Holofield Controls"; - pixel_x = -6; - pixel_y = -33 +"uR" = ( +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 9; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/obj/machinery/button/door{ - desc = "A remote control switch."; - dir = 1; - id = "scbay"; - name = "Cargo Bay Doors"; - pixel_x = 3; - pixel_y = -35 +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"vk" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable/orange{ + icon_state = "0-2" }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/cargo) -"yl" = ( -/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ - dir = 8 +/turf/open/floor/plasteel/white, +/area/ship/crew) +"vK" = ( +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) +"vL" = ( +/obj/structure/cable/orange{ + icon_state = "2-9" + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/catwalk/over/plated_catwalk/white, +/turf/open/floor/plating, +/area/ship/engineering) +"vN" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kansatsu_bridge" }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) -"yn" = ( -/obj/structure/rack, -/obj/item/clothing/glasses/heat, -/obj/item/clothing/glasses/heat, -/obj/item/clothing/glasses/cold, -/obj/item/clothing/glasses/cold, -/obj/effect/turf_decal/box, -/obj/item/clothing/under/color/black, -/obj/item/clothing/under/color/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/head/beanie/black, -/obj/item/clothing/head/beanie/black, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/bridge) +"xf" = ( +/obj/effect/turf_decal/box/white, /obj/machinery/light/directional/west, -/obj/item/clothing/mask/fakemoustache/italian, -/obj/item/clothing/mask/fakemoustache/italian, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/crate_shelf, +/turf/open/floor/plasteel/tech, /area/ship/cargo) -"yw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +"yl" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" }, /turf/open/floor/plasteel/white, /area/ship/engineering) -"yF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"yn" = ( +/obj/structure/chair/plastic{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/engineering{ - dir = 4; +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"yw" = ( +/obj/structure/chair/bench/red/directional/east, +/obj/structure/railing, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/tech, +/area/ship/crew) +"yF" = ( +/obj/machinery/door/airlock/hatch{ + dir = 8; name = "Engineering" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"yG" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"yG" = ( +/obj/effect/turf_decal/corner_techfloor_grid{ dir = 6 }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/turf/open/floor/plating/airless, +/area/ship/external/dark) "yH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/chair/handrail, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "zH" = ( -/obj/machinery/atmospherics/components/binary/pump/on/layer4{ - dir = 4 +/obj/structure/cable/orange{ + icon_state = "0-9" }, -/obj/machinery/camera/autoname{ - dir = 1 +/obj/machinery/power/ship_gravity, +/obj/structure/sign/poster/contraband/gec{ + pixel_y = -32 }, -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "zO" = ( -/obj/effect/turf_decal/arrows{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 }, -/obj/effect/turf_decal/industrial/warning/corner{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light_switch{ - pixel_y = -20; - dir = 1; - pixel_x = 6 - }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "zY" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/closet/crate/secure/science{ + req_access_txt = "20" }, -/turf/open/floor/plasteel/tech/techmaint, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/chameleon, +/obj/item/chameleon, +/obj/item/clothing/accessory/holster/chameleon, +/obj/item/clothing/accessory/holster/chameleon, +/obj/item/disk/holodisk/kansatsu/gear/chameleon, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 6 - }, -/turf/closed/wall/mineral/plastitanium, +/obj/effect/turf_decal/siding/wood{ + dir = 6; + color = "#E6D2BA" + }, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "tac"; + name = "Intelligence Director's Locker"; + req_access_txt = "20" + }, +/obj/item/storage/backpack/messenger/sec, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/armor/vest/capcarapace/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/gloves/combat, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/gun/ballistic/revolver/syndicate/no_mag, +/turf/open/floor/plasteel/white, /area/ship/bridge) -"AM" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 1 +"Ap" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + color = "#FFFFFF" + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) +"AM" = ( /obj/machinery/door/airlock/grunge{ name = "Bathroom" }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/dorm) -"Bt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"Bt" = ( +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "BS" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel/dark, +/obj/structure/chair/bench/red/directional/east, +/turf/open/floor/plasteel/tech, /area/ship/crew) "Cr" = ( -/obj/machinery/door/poddoor{ - id = "scbay" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/effect/turf_decal/industrial/warning{ + dir = 2; + color = "#FFFFFF" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "CP" = ( -/obj/machinery/cryopod{ - dir = 8 +/obj/item/kirbyplants/fullysynthetic{ + pixel_y = 20 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/hatch/red, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/item/radio/intercom/directional/north, -/obj/machinery/light_switch{ - pixel_y = 23; - pixel_x = -12 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm) +/turf/open/floor/plasteel/mono/white, +/area/ship/crew) "CR" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 10 + dir = 10; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) "CU" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ - dir = 4 +/obj/effect/turf_decal/industrial/stand_clear/red{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/door/poddoor{ + dir = 2; + id = "kansatsu_cargo" }, -/obj/machinery/door/poddoor/shutters{ +/obj/machinery/door/firedoor/heavy, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 4; - id = "scengine" + id = "kansatsu_holo" }, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "DB" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#E6D2BA" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8; + color = "#E6D2BA" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/open/floor/plasteel/white, /area/ship/bridge) "DL" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "DU" = ( -/obj/structure/chair/office{ - dir = 4; - name = "Intel Officer's Chair" +/obj/machinery/camera{ + dir = 5; + c_tag = "Exterior - Fore-Starboard" }, -/obj/item/radio/intercom/wideband/directional/south{ - reach = 2 +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 6; + pixel_y = 12; + pixel_x = -8; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/obj/effect/turf_decal/trimline/opaque/bar, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 5 + }, +/turf/open/floor/plating/airless, /area/ship/bridge) "EX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/chair/comfy/grey/directional/west, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 1 - }, -/obj/machinery/light/directional/east, /turf/open/floor/plasteel/dark, /area/ship/crew) "Fw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/item/toy/cards/deck, -/obj/structure/table/wood, -/turf/open/floor/carpet/red, +/turf/open/floor/plasteel/dark, /area/ship/crew) "FH" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ +/obj/effect/turf_decal/siding/wood{ dir = 4; - id = "scbridge" + color = "#E6D2BA" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/ship/bridge) "FJ" = ( -/obj/structure/chair{ - dir = 4 +/obj/structure/chair/office/light{ + dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/white, /area/ship/bridge) "FT" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/structure/cable/orange{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/chair/handrail{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/catwalk/over/plated_catwalk/white, /turf/open/floor/plating, /area/ship/engineering) +"Gn" = ( +/obj/machinery/vending/cigarette{ + shut_up = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew) "GG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/computer/security{ +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Bridge"; + req_access_txt = "20" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/effect/turf_decal/industrial/outline/red, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "GV" = ( -/obj/machinery/porta_turret/ship/syndicate/weak{ +/obj/structure/table/glass, +/obj/machinery/camera{ dir = 4; - pixel_x = 8; - pixel_y = 4 + c_tag = "Cryogenics" }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/effect/turf_decal/industrial/hatch{ + color = "#730622"; + alpha = 255 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/dorm) "Hd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/chair/office/dark{ dir = 8 }, -/obj/item/bedsheet/blue, -/obj/structure/bed/pod, -/obj/structure/curtain, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm) +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew) "Hz" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/effect/turf_decal/box, -/obj/structure/closet/crate{ - name = "recreation package" +/obj/machinery/door/airlock/maintenance/external/glass{ + name = "Cargo Bay" }, -/obj/structure/railing{ - dir = 4 +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/item/circuitboard/machine/microwave, -/obj/item/vending_refill/boozeomat, -/obj/item/circuitboard/machine/vendor, -/turf/open/floor/plasteel/tech/grid, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ig" = ( -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/spline/fancy/transparent/grey{ - dir = 4 +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/power/smes/engineering, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"IJ" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Fore-Port" }, -/obj/structure/window/reinforced{ - dir = 4 +/turf/open/floor/plating/airless, +/area/ship/bridge) +"ID" = ( +/obj/machinery/button/door{ + id = "kansatsu_cargo"; + name = "External Access"; + pixel_y = -20; + dir = 1; + pixel_x = 9 }, -/obj/structure/rack, -/obj/item/chameleon, -/obj/item/chameleon, -/obj/machinery/door/window/brigdoor{ - name = "Gear Stowage"; - req_access_txt = "1" +/obj/effect/turf_decal/box/white, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/black, +/obj/item/clothing/head/helmet/space/syndicate/black, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/tank/jetpack/oxygen/harness, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"IJ" = ( +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 }, -/obj/structure/sign/poster/contraband/masked_men{ - pixel_y = 32 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 }, -/obj/item/storage/box/syndie_kit/chameleon, -/obj/item/storage/box/syndie_kit/chameleon, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/central) +/turf/open/floor/plasteel/white, +/area/ship/crew) "Jp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp{ + pixel_x = -5; + pixel_y = 13 }, -/obj/structure/closet/wall/directional/north, -/obj/machinery/computer/cryopod/directional/west, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/item/radio/intercom/table{ + dir = 8; + pixel_x = -6; + pixel_y = -9 }, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/structure/cable{ - icon_state = "2-4" +/obj/item/reagent_containers/food/drinks/mug{ + pixel_y = 10; + pixel_x = 11; + list_reagents = list(/datum/reagent/consumable/icecoffee = 30) }, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew) +"Js" = ( +/obj/machinery/cryopod/syndicate{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/hatch{ + color = "#730622"; + alpha = 255 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" + }, +/turf/open/floor/plasteel/mono/white, /area/ship/crew/dorm) "JI" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 +/obj/effect/turf_decal/siding/wood{ + dir = 9; + color = "#E6D2BA" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/computer/crew/syndie{ + icon_state = "computer-left" + }, +/obj/machinery/camera{ + dir = 2; + c_tag = "Bridge" + }, +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "KA" = ( -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5 +/obj/structure/filingcabinet/double/grey{ + dir = 1 }, -/turf/closed/wall/mineral/plastitanium, +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#E6D2BA" + }, +/obj/item/folder/syndicate, +/obj/item/folder/documents/syndicate/red, +/obj/item/folder/red, +/obj/item/folder/white, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/orange{ + icon_state = "0-1" + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "KP" = ( -/obj/structure/closet/wall/directional/north{ - name = "emergency rum cabinet" +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#FFFFFF" }, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 8 +/mob/living/simple_animal/bot/cleanbot, +/obj/machinery/button/door{ + id = "kansatsu_armory"; + name = "Armory Access"; + pixel_y = 20; + dir = 2; + pixel_x = -7; + req_access_txt = "48" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/item/kirbyplants/fullysynthetic{ + pixel_y = 20; + pixel_x = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/bottle/rum, /turf/open/floor/plasteel/dark, /area/ship/crew) "Ld" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Lr" = ( -/obj/structure/toilet{ - pixel_y = 12 +/obj/machinery/light_switch{ + pixel_x = 10; + pixel_y = 19 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 +/obj/structure/closet/wall/directional/north{ + pixel_x = -4 }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew/dorm) +/obj/item/towel{ + pixel_x = 5 + }, +/obj/item/towel{ + pixel_x = -2 + }, +/obj/item/soap/syndie{ + cleanspeed = 20 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew) "Mb" = ( -/obj/structure/chair/office{ - dir = 4; - name = "Captain's Chair" +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 }, -/obj/machinery/turretid{ - pixel_y = 28 +/obj/structure/bed{ + dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/bar, -/turf/open/floor/plasteel/dark, +/obj/structure/curtain/cloth{ + color = "#730622" + }, +/obj/item/bedsheet/syndie{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/bridge) +"Mn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "2-9" + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "MH" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm/directional/north, -/obj/item/kirbyplants/fullysynthetic, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"Nu" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) -"NR" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/turf_decal/industrial/stand_clear/red{ + dir = 4 }, -/obj/machinery/light/small/directional/north, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/head/helmet/space/syndicate/black/red, -/obj/item/clothing/suit/space/syndicate/black/red, -/obj/item/tank/jetpack/oxygen/harness, -/obj/item/clothing/mask/gas/syndicate, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/central) -"NU" = ( -/obj/machinery/power/smes/shuttle/precharged{ +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_armory"; dir = 4 }, -/obj/structure/window/reinforced{ +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/effect/turf_decal/industrial/warning/corner, -/obj/structure/cable{ - icon_state = "0-8" +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) +"No" = ( +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 8 }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "scengine" +/obj/machinery/door/airlock/external{ + dir = 4 }, -/turf/open/floor/plating, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) -"NW" = ( -/obj/structure/table, -/obj/machinery/airalarm/directional/west, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 8 +"Nu" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering) +"NR" = ( +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 }, -/obj/item/storage/toolbox/electrical, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 }, -/obj/effect/turf_decal/industrial/warning/corner{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) +"NU" = ( +/obj/structure/chair/office/light, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"NW" = ( +/obj/machinery/button/door{ + id = "kansatsu_engine"; + name = "Engine Access"; + dir = 4; + pixel_x = -20; + pixel_y = -6 + }, +/obj/machinery/firealarm/directional/west{ + pixel_y = 7 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" + }, +/turf/open/floor/plasteel/white, /area/ship/engineering) "Od" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) -"Oi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Aft-Port" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/cargo) -"Or" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/corner_techfloor_grid{ dir = 10 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating/airless, +/area/ship/bridge) +"Oi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 1 +/obj/structure/cable/orange{ + icon_state = "1-4" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) +"Or" = ( +/obj/structure/chair/bench/red/directional/west, +/turf/open/floor/plasteel/tech, /area/ship/crew) "Ox" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/computer/helm{ + dir = 8; + icon_state = "computer-left" }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/obj/structure/railing/corner, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/bridge) "OD" = ( -/obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer2{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/light/dim/directional/east, +/obj/structure/chair/handrail{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/tech, /area/ship/engineering) "OP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/area/ship/crew) "OW" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/railing{ - dir = 8 +/obj/structure/table/glass, +/obj/structure/railing, +/obj/machinery/door/firedoor/border_only, +/obj/item/folder/red{ + pixel_x = -5; + pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/cargo) -"Pk" = ( -/obj/machinery/mineral/ore_redemption{ - dir = 8; - input_dir = 8; - output_dir = null +/obj/item/pen{ + pixel_x = -5; + pixel_y = 5 }, -/obj/effect/turf_decal/box, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/tech/techmaint, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 8; + pixel_y = 14 + }, +/turf/open/floor/plasteel/tech, +/area/ship/crew) +"Pk" = ( +/obj/effect/turf_decal/box/white, +/obj/structure/crate_shelf, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/tech, /area/ship/cargo) "Qa" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 + dir = 10 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered/corner{ - dir = 8 +/obj/structure/railing, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -10 }, -/turf/open/floor/plasteel/white, +/obj/item/storage/secure/safe{ + dir = 8; + pixel_x = -31; + pixel_y = 5 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "Ql" = ( -/obj/effect/turf_decal/atmos/air, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/engineering) "Qx" = ( -/obj/machinery/door/window{ - dir = 1 +/obj/structure/sign/warning/docking{ + pixel_y = -8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/stairs, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) "Qy" = ( -/obj/structure/sign/poster/official/wtf_is_co2, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) -"QN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/white, -/area/ship/crew/dorm) -"QO" = ( +/obj/structure/curtain/cloth/grey, +/obj/machinery/button/door{ + id = "kansatsu_bridge"; + name = "Bridge Blast Doors"; + pixel_y = 20; + dir = 2 + }, +/turf/open/floor/plasteel/stairs/right{ + dir = 4; + color = "#555555" + }, +/area/ship/bridge) +"QN" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/effect/spawner/lootdrop/kansatsu_missions{ + pixel_y = 6 }, -/obj/machinery/airalarm/directional/west, -/obj/item/paper_bin{ - pixel_x = -4 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 }, -/obj/item/pen/fountain, -/obj/item/folder/syndicate{ - icon_state = "folder_sred"; - pixel_x = 8; - pixel_y = -2 +/turf/open/floor/plasteel/mono/white, +/area/ship/crew) +"QO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5; + color = "#E6D2BA" }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/mono/dark, +/obj/machinery/modular_computer/console/preset/command, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Ri" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) +/obj/machinery/door/airlock/hatch{ + dir = 8; + name = "Engineering" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) "Rj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/effect/turf_decal/box/white, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/orange{ + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/light_switch{ + pixel_x = -12; + pixel_y = 19 }, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/tech/techmaint, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/camera{ + dir = 6; + c_tag = "Cargo Bay" + }, +/turf/open/floor/plasteel/tech, /area/ship/cargo) "Rr" = ( -/obj/effect/turf_decal/trimline/opaque/bar/filled/corner, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/structure/cable/orange{ + icon_state = "2-8" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, -/area/ship/hallway/central) +/area/ship/crew) "Rv" = ( -/obj/machinery/power/terminal, -/obj/effect/turf_decal/box, -/obj/structure/sign/poster/contraband/energy_swords{ - pixel_x = 31 +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "syndicate"; + name = "equipment storage"; + req_access_txt = "48" }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 }, -/obj/machinery/power/port_gen/pacman, -/turf/open/floor/plating, -/area/ship/engineering) -"Rz" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - id = "scbridge" +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/orange{ + icon_state = "0-4" }, -/turf/open/floor/plating, +/obj/item/camera, +/obj/item/camera, +/obj/item/taperecorder, +/obj/item/taperecorder, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night, +/obj/item/storage/pill_bottle/cyanide, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) +"Rz" = ( +/turf/open/floor/plasteel/white, /area/ship/bridge) +"RO" = ( +/obj/machinery/camera{ + dir = 8; + c_tag = "Exterior - Aft" + }, +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) "RX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/industrial/stand_clear/red{ dir = 4 }, -/obj/structure/chair/comfy/grey/directional/east, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_armory"; dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"RY" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/structure/chair/office{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/item/stack/tile/plasteel/dark{ - pixel_x = -11; - pixel_y = -16 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/item/clothing/neck/stethoscope{ - pixel_x = 9; - pixel_y = -15 +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/item/crowbar{ - pixel_x = -8; - pixel_y = -11 +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) +"RY" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/orange{ + icon_state = "0-4" }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/office) +/obj/machinery/light/small/directional/north, +/obj/machinery/light_switch{ + pixel_x = 8; + pixel_y = 19 + }, +/obj/structure/dresser{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/plushie/moth{ + pixel_y = 11 + }, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "Sx" = ( -/obj/structure/cable{ - icon_state = "0-4" +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" }, /obj/machinery/power/terminal{ dir = 8 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/structure/cable/orange{ + icon_state = "0-4" }, -/turf/open/floor/plating, +/obj/structure/railing, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/white, /area/ship/engineering) "SH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1; + piping_layer = 2 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) +"SK" = ( +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + }, +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 + }, +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Port" + }, +/turf/open/floor/plating/airless, +/area/ship/bridge) +"SL" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#E6D2BA" + }, +/obj/machinery/light/directional/north, +/obj/machinery/computer/security{ + icon_state = "computer-right"; + icon_keyboard = "syndie_key" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Tv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"Ue" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/light/small/directional/south, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/glasses/welding, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/clothing/gloves/color/yellow, -/obj/item/clothing/gloves/color/yellow, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/industrial/stand_clear/red, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"Ul" = ( +/obj/machinery/power/port_gen/pacman/mrs{ + anchored = 1 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#FFFFFF" + }, +/obj/structure/cable/white, +/turf/open/floor/plasteel/dark, /area/ship/engineering) -"SL" = ( -/obj/structure/table/reinforced, +"Ur" = ( +/obj/structure/table/rolling, /obj/item/binoculars{ - pixel_x = 4 + pixel_y = 5 }, -/obj/item/clipboard, -/obj/item/pen, -/obj/item/clothing/glasses/night{ - pixel_x = -3; - pixel_y = 9 +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"UE" = ( +/obj/structure/table/glass, +/obj/machinery/fax/syndicate{ + pixel_y = 6 }, -/obj/item/camera{ - pixel_x = -1; - pixel_y = -6 +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#E6D2BA" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/obj/structure/sign/poster/contraband/cybersun_med{ + pixel_y = -32 }, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/plasteel/white, /area/ship/bridge) -"Ue" = ( -/obj/structure/sign/warning/vacuum/external, -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) -"Ul" = ( -/obj/effect/decal/cleanable/oil, -/obj/machinery/power/ship_gravity, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering) "UZ" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/box/white, +/obj/machinery/airalarm/directional/west, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/firealarm/directional/north{ + pixel_x = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/cargo) "Va" = ( -/obj/structure/cable{ - icon_state = "0-4" +/obj/effect/turf_decal/industrial/warning{ + dir = 9; + color = "#555555" }, /obj/machinery/power/terminal{ dir = 8 }, -/obj/machinery/camera/autoname, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/structure/cable/orange{ + icon_state = "0-6" }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/ship/engineering) +"Vg" = ( +/obj/structure/railing, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 19; + pixel_y = 5 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew) "Vo" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/button/door{ - dir = 4; - id = "thefunny"; - pixel_x = -23; - pixel_y = 9 +/obj/structure/sign/poster/contraband/cybersun_med{ + pixel_x = -32 }, -/obj/machinery/button/door{ - dir = 4; - id = "intelwindow"; - name = "Window Shutters"; - pixel_x = -23; - pixel_y = -6 +/obj/machinery/airalarm/directional/south, +/obj/item/bedsheet/black{ + dir = 4 }, -/obj/structure/safe/floor{ - number_of_tumblers = 3 - }, -/obj/item/implanter/stealth, -/obj/item/implanter/stealth, -/obj/item/modular_computer/laptop/preset/civilian, -/obj/item/clothing/mask/chameleon, -/obj/item/kitchen/knife/combat, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/paper/crumpled{ - default_raw_text = "Hand this stuff out to the field agents. They'll have a blast." - }, -/obj/item/clothing/mask/chameleon, -/obj/item/card/id/syndicate/anyone, -/obj/item/card/id/syndicate/anyone, -/obj/effect/turf_decal/box, -/turf/open/floor/plating, -/area/ship/crew/office) -"Vw" = ( -/obj/structure/chair/comfy/grey/directional/south, -/obj/machinery/light/small/directional/north, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = 32 +/obj/structure/curtain/cloth/grey, +/obj/structure/bed{ + dir = 4 }, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) +"Vw" = ( +/obj/structure/closet/secure_closet/freezer{ + anchored = 1; + locked = 0; + name = "fridge" + }, +/obj/machinery/camera{ + dir = 6; + c_tag = "Briefing Room" + }, +/obj/machinery/light/directional/north, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/item/reagent_containers/food/drinks/dry_ramen, +/obj/item/reagent_containers/food/drinks/dry_ramen, +/obj/item/reagent_containers/food/drinks/dry_ramen, /turf/open/floor/plasteel/dark, /area/ship/crew) "VJ" = ( -/obj/structure/chair/comfy/grey/directional/south, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, -/obj/structure/closet/wall/directional/north, +/obj/structure/table/chem{ + name = "kitchen counter" + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/sink/chem{ + name = "kitchen sink" + }, /turf/open/floor/plasteel/dark, /area/ship/crew) -"Xa" = ( -/obj/structure/cable{ - icon_state = "1-4" +"VM" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light_switch{ + pixel_x = 8; + pixel_y = 19 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/item/kirbyplants/fullysynthetic{ + pixel_y = 20 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) +"Xa" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, +/obj/structure/catwalk/over/plated_catwalk/white, /turf/open/floor/plating, /area/ship/engineering) "Xc" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "intelfucky" +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#E6D2BA" }, -/turf/open/floor/plasteel/stairs{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/holopad/secure, +/obj/effect/turf_decal/trimline/opaque/syndiered, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Xw" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) "XJ" = ( -/obj/effect/decal/cleanable/glass, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -27 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ dir = 8 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/closet/emcloset/wall/directional/north{ + populate = 0 + }, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"XX" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/industrial/stand_clear/red, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "YE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#FFFFFF" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "2-8" }, -/obj/structure/table/wood, -/turf/open/floor/carpet/red, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/crew) "YG" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ dir = 8 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, /area/ship/engineering) "YQ" = ( /turf/template_noop, /area/template_noop) "YU" = ( -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/cable/orange{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/catwalk/over/plated_catwalk/white, /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/railing{ - dir = 8; - layer = 2.91 - }, -/obj/effect/turf_decal/box, -/obj/item/kitchen/knife/combat/survival, -/obj/item/kitchen/knife/combat/survival, -/obj/item/kitchen/knife/combat/survival, -/obj/item/kitchen/knife/combat/survival, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/structure/closet/crate/wooden{ - name = "survival kit" - }, -/obj/item/survivalcapsule, -/obj/item/survivalcapsule, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, /area/ship/cargo) "Zv" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/spline/fancy/transparent/grey{ - dir = 1 - }, -/obj/machinery/space_heater, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/ship/engineering) "ZI" = ( -/obj/machinery/computer/helm{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 }, -/obj/effect/turf_decal/industrial/outline/red, -/obj/machinery/firealarm/directional/north, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/tech/grid, +/obj/item/radio/intercom/wideband/directional/north{ + pixel_x = 10 + }, +/obj/machinery/turretid{ + pixel_y = 23; + pixel_x = -11 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "ZQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/machinery/camera{ + dir = 1; + c_tag = "Armory" + }, +/obj/machinery/light_switch{ + pixel_y = -19; + dir = 1; + pixel_x = 11 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + color = "#FFFFFF" + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) (1,1,1) = {" uR -YQ -YQ -ru +qJ +nq +Nu ni ni ni -ru +Nu ni ni ni -ru -YQ -YQ +Nu +RO +yG CR "} (2,1,1) = {" -ru -ru -ru -ru -NU -CU -CU -ru -CU -CU +Nu +No +No +Nu +qv +qv qv Nu -ru -ru -ru +qv +qv +qv +Nu +Nu +Nu +Nu "} (3,1,1) = {" -ru +Nu XJ YG -ru +XX Va -Sx -Sx +yl +jH NW -Sx -Sx +yl +yl Sx bI km Ul -ru +Nu "} (4,1,1) = {" -ru +Nu dj OD Ue @@ -2057,15 +2623,15 @@ tD im Bt SH -ru +Nu "} (5,1,1) = {" cu -yw aQ -ah -ZQ -rR +aQ +aQ +aQ +aQ iY nu iL @@ -2073,102 +2639,102 @@ rF Zv Ql zH -Qy -ru +Nu +Nu "} (6,1,1) = {" -ru -ru +YQ +aQ gj tv Rv -Ig +aQ ii ru cL -ru +bn so lP qa -Od +Nu nO "} (7,1,1) = {" YQ -KA -kM -kM -kM -kM -kM +aQ +sZ +Ap +ZQ +aQ +Nu Ri yF -cZ -jj -jj +Nu +tE +aZ jj -Ah +Nu YQ "} (8,1,1) = {" YQ -YQ -kM +aQ +aQ MH RX -lJ -kM +aQ +tV tk jW -ty -yn -aZ -jj -YQ +Nu +Nu +Nu +Nu +Nu YQ "} (9,1,1) = {" YQ -YQ -kM +Od +tV KP YE co -kM +ev NR df -ev +cZ UZ xf -jj -YQ +ID +Qx YQ "} (10,1,1) = {" YQ YQ -kM +tV Vw Fw BS -kM +yw IJ -yl +qS Zs cw zY gP -YQ +CU YQ "} (11,1,1) = {" YQ YQ -kM +tV VJ kb dx -kM +OW qz OP dq @@ -2181,7 +2747,7 @@ YQ (12,1,1) = {" YQ YQ -kM +tV in EX Or @@ -2192,91 +2758,91 @@ Hz Oi eu qf -YQ -YQ +eL +nF "} (13,1,1) = {" YQ YQ -kM -qA -qA -qA +tV +Gn +Tv +rR qA -tJ +IJ qS -Qx +Zs yH zO -jj -YQ +ah +cd YQ "} (14,1,1) = {" YQ YQ -YQ -qA +kM +tV Jp QN oN -Ox +IJ ej -OW +cZ Rj Pk -jj -YQ +if +Qx YQ "} (15,1,1) = {" YQ YQ YQ -qA +tV CP Hd -qA -nF +Vg +IJ lZ -pM -pM -pM -pM -YQ +qo +qo +qo +qo +qo YQ "} (16,1,1) = {" YQ YQ YQ -qA -qA -qA -qA +tV +tV +tV +tV vk pM -jH +qo RY Vo -dZ -YQ +qo +pE YQ "} (17,1,1) = {" YQ YQ YQ -YQ -qA +SK +tV hT -qA +tV ql -pM +vK qR nA pa -dZ +qo YQ YQ "} @@ -2285,15 +2851,15 @@ YQ YQ YQ YQ -qA +tV Lr AM -yG +IJ mD qo sR -lZ -pM +qo +qo YQ YQ "} @@ -2303,14 +2869,14 @@ YQ YQ YQ tV -bO -bO +ty +tV dA -bO -bO -bO +oC +qo +VM GV -YQ +qo YQ YQ "} @@ -2319,15 +2885,15 @@ YQ YQ YQ YQ -YQ -bn -vN -aa -GG -QO bO -YQ -YQ +Xw +Xw +Xw +GG +Xw +lh +Js +qo YQ YQ "} @@ -2337,14 +2903,14 @@ YQ YQ YQ YQ -bO +Xw Mb Qa aT -DU -bO -YQ -YQ +Xw +Xw +Xw +qo YQ YQ "} @@ -2354,14 +2920,14 @@ YQ YQ YQ YQ -bO +Xw ZI DL DB fk -bO -YQ -YQ +aj +Xw +DU YQ YQ "} @@ -2371,13 +2937,13 @@ YQ YQ YQ YQ -bO Xw +Ox +oW Xc -Xc +NU +lJ Xw -bO -YQ YQ YQ YQ @@ -2388,13 +2954,13 @@ YQ YQ YQ YQ -YQ -Rz +Xw +Xw JI uq Rz -YQ -YQ +UE +Xw YQ YQ YQ @@ -2405,13 +2971,13 @@ YQ YQ YQ YQ -YQ -Rz +Ig +Xw SL FJ -Rz -YQ -YQ +Mn +KA +Xw YQ YQ YQ @@ -2423,21 +2989,68 @@ YQ YQ YQ YQ -Rz +Xw +QO FH FH -Rz +Ah +Xw +YQ +YQ +YQ +"} +(27,1,1) = {" +YQ +YQ +YQ +YQ +YQ +YQ +bO +Xw +Qy +dZ +Xw +bO +YQ +YQ +YQ +"} +(28,1,1) = {" +YQ +YQ YQ YQ YQ YQ YQ +aa +tJ +tJ +aa +YQ +YQ +YQ +YQ "} -(27,1,1) = {" +(29,1,1) = {" +YQ +YQ +YQ +YQ +YQ +YQ +YQ +aa +yn +Ur +aa YQ YQ YQ YQ +"} +(30,1,1) = {" YQ YQ YQ @@ -2445,6 +3058,10 @@ YQ YQ YQ YQ +aa +vN +vN +aa YQ YQ YQ diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm new file mode 100644 index 000000000000..2f0f9985656e --- /dev/null +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -0,0 +1,190 @@ +/datum/preset_holoimage/cybersun_intel_officer + species_type = /datum/species/ipc + outfit_type = /datum/outfit/job/syndicate/head_of_personnel/cybersun/hologram + +/obj/item/disk/holodisk/kansatsu/mission + desc = "A classified holodisk containing a mission for the Cybersun Industries Intelligence Division." + preset_image_type = /datum/preset_holoimage/cybersun_intel_officer + +/obj/item/disk/holodisk/kansatsu/mission/New(obj/L) + ..() + pixel_x = base_pixel_x + rand(-5, 5) + pixel_y = base_pixel_y + rand(-3, 2) + +/obj/item/disk/holodisk/kansatsu/mission/safety + name = "\improper IG-I-296" // Information Gathering - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Officer Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You must gather information about the safety measures on board. You are to look for any potential flaws and exploits. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Your director must prepare an official report on this. + DELAY 40 + SAY This mission will be considered completed with at least three reports. Do not disappoint us. + DELAY 40 + "} + +/obj/item/disk/holodisk/kansatsu/mission/crew + name = "\improper IG-I-138" // Information Gathering - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Officer Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You must profile five members of the crew. Their profile must include credentials, habits and skills. Any further information is optional, but advised. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Your director must then prepare an official report on this. + DELAY 40 + SAY This mission will be considered completed with at least five reports. Do not disappoint us. + DELAY 40 + "} + +/obj/item/disk/holodisk/kansatsu/mission/valueables + name = "\improper IG-I-271" // Information Gathering - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Officer Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY On board, you must locate and catalogue all the objects of value. You may not seize them, unless you are tasked to by another mission. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Your director must then prepare an official report on this. + DELAY 40 + SAY This mission will be considered completed with at least three reports. Do not disappoint us. + DELAY 40 + "} + +/obj/item/disk/holodisk/kansatsu/mission/ruins + name = "\improper IG-S-290" // Information Gathering - Scouting - Random Number + preset_record_text = {" + NAME Intelligence Officer Torch-3 + SAY Agents. Your vessel has been assigned a mission based around scouting. + DELAY 40 + SAY You are to locate war-era derelicts in your sector. You must explore them and take note of all the relevant details. + DELAY 40 + SAY Your director must then prepare an official report on this. + DELAY 40 + SAY This mission will be considered completed with at least five reports. Do not disappoint us. + DELAY 40 + "} + +/obj/item/disk/holodisk/kansatsu/mission/documents + name = "\improper E-019" // Extraction - Random Number + preset_record_text = {" + NAME Intelligence Officer Torch-3 + SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us. + DELAY 40 + SAY To be precise, you are after a bundle of classified documents. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/disk/holodisk/kansatsu/mission/pet + name = "\improper E-271" // Extraction - Random Number + preset_record_text = {" + NAME Intelligence Officer Torch-3 + SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us. + DELAY 40 + SAY To be precise, you are after a domesticated animal. The cutest you can possibly find. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/disk/holodisk/kansatsu/mission/training + name = "\improper TO-23" // Training Operation - Random Number + preset_record_text = {" + NAME Intelligence Officer Torch-3 + SAY Agents. Your vessel has been assigned a mission to perform a training operation. + DELAY 40 + SAY You are to organize a training mission for the junior agents assigned to your crew. + DELAY 40 + SAY The exercise must be under oversight of at least one trained agent. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/disk/holodisk/kansatsu/mission/anomalies + name = "\improper RD-166" // Research Division - Random Number + preset_record_text = {" + NAME Intelligence Officer Torch-3 + SAY Agents. Your vessel has been assigned a mission to assist our research department. + DELAY 40 + SAY You are to collect at least four anomaly cores. + DELAY 40 + SAY They are scattered around the planetoids in your sector. You are also permitted to retrieve them from other vessels. + DELAY 40 + SAY The anomaly cores must be stored in your cargo bay, in the company-issued secure crate. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + + +/obj/effect/spawner/lootdrop/kansatsu_missions + name = "Kansatsu Missions" + lootdoubles = FALSE + loot = list( + /obj/item/disk/holodisk/kansatsu/mission/safety = 3, + /obj/item/disk/holodisk/kansatsu/mission/crew = 5, + /obj/item/disk/holodisk/kansatsu/mission/valueables = 4, + /obj/item/disk/holodisk/kansatsu/mission/ruins = 5, + /obj/item/disk/holodisk/kansatsu/mission/documents = 4, + /obj/item/disk/holodisk/kansatsu/mission/pet = 3, + /obj/item/disk/holodisk/kansatsu/mission/training = 1, + /obj/item/disk/holodisk/kansatsu/mission/anomalies = 2 + ) + + lootcount = 2 + +/datum/preset_holoimage/cybersun_researcher + outfit_type = /datum/outfit/job/syndicate/science/cybersun + species_type = /datum/species/elzuose + +/obj/item/disk/holodisk/kansatsu/gear + preset_image_type = /datum/preset_holoimage/cybersun_researcher + +/obj/item/disk/holodisk/kansatsu/gear/tablets + name = "\improper IR-241" // Introductory Recording - Random Number + desc = "A classified holodisk containing an introduction to the Syndix tablets." + preset_record_text = {" + NAME Researcher Meenus-Seeba + SAY You have been issued a set of Cybersun Virtual Solutions Syndix Tablets. + DELAY 40 + SAY They will allow you to maintain communications over a long range, via the Chatting feature. + DELAY 40 + SAY We advise you to create a private channel where you maintain contact with personnel on missions. + DELAY 40 + SAY Good luck. + DELAY 20 + "} + +/obj/item/disk/holodisk/kansatsu/gear/chameleon + name = "\improper IR-174" // Introductory Recording - Random Number + desc = "A classified holodisk containing an introduction to the Chameleon gear." + preset_record_text = {" + NAME Researcher Meenus-Seeba + SAY You have been issued a Cybersun Industries Chameleon Gear Kit. + DELAY 40 + SAY It contains two sets of three pieces of advanced gear used for espionage. + DELAY 40 + SAY First gadget inside is the Chameleon kit - a holographically amplified set of clothing that can swiftly and quitely allow to blend in. + DELAY 40 + SAY Second piece of gear is the Chameleon holster. It allows you to smuggle a firearm past any security checkpoint, which will prove vital for self-defense and assassination missions. + DELAY 40 + SAY Third, and the most exciting, gadget is the Chameleon projector. It is a personal cloaking device that is excellent for getting in and out unnoticed. + DELAY 40 + SAY Good luck. + DELAY 20 + "} diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index bac896c0b8d5..4b05a12e85b8 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -472,3 +472,11 @@ /obj/item/storage/pill_bottle/trophazole/PopulateContents() for(var/i in 1 to 4) new /obj/item/reagent_containers/pill/trophazole(src) + +/obj/item/storage/pill_bottle/cyanide + name = "bottle of cyanide pills" + desc = "Contains pills used to quickly and quietly kill people. Consume at your own risk." + +/obj/item/storage/pill_bottle/trophazole/PopulateContents() + for(var/i in 1 to 5) + new /obj/item/reagent_containers/pill/cyanide(src) diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 639839d1b65a..6ee10528c973 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -535,6 +535,11 @@ r_pocket = /obj/item/kitchen/knife/combat/survival glasses = /obj/item/clothing/glasses/sunglasses +/datum/outfit/job/syndicate/head_of_personnel/cybersun/hologram + name = "Syndicate - Intelligence Officer (Cybersun, Hologram)" // Used for the holodisks on the Kansatsu. + + mask = /obj/item/clothing/mask/gas/syndicate // Secrecy is Kansatsu's gimmick. + /datum/outfit/job/syndicate/head_of_personnel/suns name = "Syndicate - Academic Staff (SUNS)" id_assignment = "Academic Staff" @@ -874,6 +879,17 @@ suit = /obj/item/clothing/suit/toggle/labcoat/science dcoat = /obj/item/clothing/suit/hooded/wintercoat/science + +/datum/outfit/job/syndicate/science/cybersun + name = "Syndicate - Researcher (Cybersun)" + + uniform = /obj/item/clothing/under/syndicate/cybersun/research + suit = /obj/item/clothing/suit/toggle/labcoat/raincoat + shoes = /obj/item/clothing/shoes/jackboots + glasses = /obj/item/clothing/glasses/science + accessory = /obj/item/clothing/accessory/armband/science + gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil + /datum/outfit/job/syndicate/science/suns name = "Syndicate - Scientist (SUNS)" //more futureproofing than anything, the Aegis currently uses /datum/outfit/job/syndicate/botanist/suns for a similar role @@ -1081,9 +1097,15 @@ ears = /obj/item/radio/headset uniform = /obj/item/clothing/under/syndicate/cybersun accessory = /obj/item/clothing/accessory/armband/cargo + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/soft/cybersun + l_pocket = null r_pocket = /obj/item/radio + box = /obj/item/storage/box/survival/security + backpack_contents = null + /datum/outfit/job/syndicate/miner/gec name = "Syndicate - Shaft Miner (GEC)" diff --git a/shiptest.dme b/shiptest.dme index 55ad11a800d5..15e9febb3417 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1029,6 +1029,7 @@ #include "code\game\MapData\shuttles\nanotrasen_ranger.dm" #include "code\game\MapData\shuttles\pgf_crying_sun.dm" #include "code\game\MapData\shuttles\srm_elder.dm" +#include "code\game\MapData\shuttles\syndicate_cybersun_kansatsu.dm" #include "code\game\mecha\mech_bay.dm" #include "code\game\mecha\mech_fabricator.dm" #include "code\game\mecha\mecha.dm" From 4baca0bd598aa47aa05a836490e20d528ebeb577 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 2 Sep 2024 16:32:55 +0200 Subject: [PATCH 02/49] wording --- code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 2f0f9985656e..2c99bb198e26 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -63,7 +63,7 @@ name = "\improper IG-S-290" // Information Gathering - Scouting - Random Number preset_record_text = {" NAME Intelligence Officer Torch-3 - SAY Agents. Your vessel has been assigned a mission based around scouting. + SAY Agents. Your vessel has been assigned a mission to scout your assigned region. DELAY 40 SAY You are to locate war-era derelicts in your sector. You must explore them and take note of all the relevant details. DELAY 40 From 7ef040922fe705844ca59c53877bfee2c5d0539e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:52:39 +0200 Subject: [PATCH 03/49] first officer is back --- .../configs/syndicate_cybersun_kansatsu.json | 7 ++- .../syndicate/syndicate_cybersun_kansatsu.dmm | 55 ++++++++++--------- code/game/objects/items/storage/secure.dm | 13 +++++ 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index 072737ff432e..7b9b07be1876 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -16,11 +16,16 @@ "map_path": "_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm", "map_id": "cybersun_kansatsu", "job_slots": { - "Intelligence Director": { + "Captain": { "outfit": "/datum/outfit/job/syndicate/captain/cybersun", "officer": true, "slots": 1 }, + "Intelligence Officer": { + "outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun", + "officer": true, + "slots": 1 + }, "Field Agent": { "outfit": "/datum/outfit/job/syndicate/miner/cybersun", "slots": 2 diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index b8997ce86a4e..062cecb57ae5 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -343,11 +343,6 @@ /obj/item/radio/intercom/directional/west{ pixel_y = -2 }, -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "A comfy-looking snake bed. There's bits of shed scales stuck in the bedding."; - name = "snake bed" - }, /turf/open/floor/plasteel/white, /area/ship/bridge) "gj" = ( @@ -466,7 +461,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "iL" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -477,6 +471,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/ship/engineering) "iN" = ( @@ -506,7 +503,9 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "iY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/rack, /obj/structure/cable/orange{ @@ -580,7 +579,7 @@ /obj/structure/closet/secure_closet/wall/directional/west{ icon_state = "cargo_wall"; name = "fuel storage"; - req_access_txt = "11" + req_one_access = list(11, 19) }, /obj/item/stack/sheet/mineral/diamond/five, /turf/open/floor/plasteel/dark, @@ -685,7 +684,6 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "nu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/isf_small/right{ color = "#000000"; dir = 4 @@ -775,7 +773,7 @@ name = "Agent Wardrobe" }, /obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel/sec, /obj/item/clothing/shoes/jackboots{ pixel_y = -7 }, @@ -846,6 +844,7 @@ req_access_txt = "11" }, /obj/item/storage/backpack/security, +/obj/item/storage/backpack/messenger/sec, /obj/item/clothing/shoes/jackboots{ pixel_y = -7 }, @@ -1384,7 +1383,7 @@ dir = 4 }, /obj/structure/closet/crate/secure/science{ - req_access_txt = "20" + req_access_txt = "19" }, /obj/item/storage/box/syndie_kit/chameleon, /obj/item/storage/box/syndie_kit/chameleon, @@ -1403,22 +1402,26 @@ /obj/structure/closet/secure_closet{ anchored = 1; icon_state = "tac"; - name = "Intelligence Director's Locker"; - req_access_txt = "20" + name = "Command Wardrobe"; + req_access_txt = "19" }, /obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, /obj/item/clothing/shoes/jackboots{ pixel_y = -7 }, /obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/armor/vest/capcarapace/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, /obj/item/clothing/gloves/combat, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/gun/ballistic/revolver/syndicate/no_mag, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, /turf/open/floor/plasteel/white, /area/ship/bridge) "Ap" = ( @@ -1576,7 +1579,9 @@ /obj/structure/chair/handrail{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /obj/structure/catwalk/over/plated_catwalk/white, /turf/open/floor/plating, /area/ship/engineering) @@ -1590,7 +1595,7 @@ /obj/machinery/door/airlock/hatch{ dir = 4; name = "Bridge"; - req_access_txt = "20" + req_access_txt = "19" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1789,7 +1794,7 @@ pixel_y = 20; dir = 2; pixel_x = -7; - req_access_txt = "48" + req_one_access = list(48, 19) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -2023,10 +2028,10 @@ pixel_x = -20; pixel_y = -10 }, -/obj/item/storage/secure/safe{ +/obj/item/storage/secure/safe/cybersun{ dir = 8; pixel_x = -31; - pixel_y = 5 + pixel_y = 6 }, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 238e39ce9318..0a7b826a3932 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -211,3 +211,16 @@ /obj/item/storage/secure/safe/suns/PopulateContents() . = ..() new /obj/item/storage/belt/sabre/suns(src) + +/obj/item/storage/secure/safe/suns + name = "Captain's Secure Safe" + desc = "The most important part of a SUNS vessel is the spare dueling sword." + +/obj/item/storage/secure/safe/cybersun + name = "Captain's secure safe" + +/obj/item/storage/secure/safe/cybersun/PopulateContents() + new /obj/item/gun/ballistic/revolver/syndicate/no_mag(src) + new /obj/item/ammo_box/a357 (src) + new /obj/item/ammo_box/a357 (src) + new /obj/item/ammo_box/a357 (src) From 2c93f9f8d17c296889715ae0f07d62e14ffeead6 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:12:45 +0200 Subject: [PATCH 04/49] took his bed by accident + cooler blade --- _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm | 5 +++++ code/modules/clothing/outfits/factions/syndicate.dm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 062cecb57ae5..35adbc197ea0 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -343,6 +343,11 @@ /obj/item/radio/intercom/directional/west{ pixel_y = -2 }, +/obj/structure/bed/dogbed{ + anchored = 1; + desc = "A comfy-looking snake bed. There's bits of shed scales stuck in the bedding."; + name = "snake bed" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "gj" = ( diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 6ee10528c973..bd7be315d805 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -532,7 +532,7 @@ head = /obj/item/clothing/head/HoS/cybersun gloves = /obj/item/clothing/gloves/combat id = /obj/item/card/id/syndicate_command/crew_id - r_pocket = /obj/item/kitchen/knife/combat/survival + r_pocket = /obj/item/kitchen/knife/switchblade glasses = /obj/item/clothing/glasses/sunglasses /datum/outfit/job/syndicate/head_of_personnel/cybersun/hologram From 6609ce3d380ace4540e9ed59ec1cf99125e085da Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:18:09 +0200 Subject: [PATCH 05/49] here too --- .../MapData/shuttles/syndicate_cybersun_kansatsu.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 2c99bb198e26..88e76bcbfc73 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -21,7 +21,7 @@ DELAY 40 SAY You must avoid recognition while performing this mission. DELAY 40 - SAY Your director must prepare an official report on this. + SAY Your officers must then prepare an official report on this. DELAY 40 SAY This mission will be considered completed with at least three reports. Do not disappoint us. DELAY 40 @@ -37,7 +37,7 @@ DELAY 40 SAY You must avoid recognition while performing this mission. DELAY 40 - SAY Your director must then prepare an official report on this. + SAY Your officers must then prepare an official report on this. DELAY 40 SAY This mission will be considered completed with at least five reports. Do not disappoint us. DELAY 40 @@ -53,7 +53,7 @@ DELAY 40 SAY You must avoid recognition while performing this mission. DELAY 40 - SAY Your director must then prepare an official report on this. + SAY Your officers must then prepare an official report on this. DELAY 40 SAY This mission will be considered completed with at least three reports. Do not disappoint us. DELAY 40 @@ -63,11 +63,11 @@ name = "\improper IG-S-290" // Information Gathering - Scouting - Random Number preset_record_text = {" NAME Intelligence Officer Torch-3 - SAY Agents. Your vessel has been assigned a mission to scout your assigned region. + SAY Agents. Your vessel has been assigned a mission to scout your current sector. DELAY 40 - SAY You are to locate war-era derelicts in your sector. You must explore them and take note of all the relevant details. + SAY You are to locate war-era derelicts. You must explore them and take note of all the relevant details. DELAY 40 - SAY Your director must then prepare an official report on this. + SAY Your officers must then prepare an official report on this. DELAY 40 SAY This mission will be considered completed with at least five reports. Do not disappoint us. DELAY 40 From edb7b253f5d9d1bbd2937eebc7243c82ef57840c Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:53:55 +0200 Subject: [PATCH 06/49] I am like. Dumb. --- code/game/objects/items/storage/secure.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 0a7b826a3932..016e48dc8352 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -212,10 +212,6 @@ . = ..() new /obj/item/storage/belt/sabre/suns(src) -/obj/item/storage/secure/safe/suns - name = "Captain's Secure Safe" - desc = "The most important part of a SUNS vessel is the spare dueling sword." - /obj/item/storage/secure/safe/cybersun name = "Captain's secure safe" From fa3ae9f9a606d18d2c4626fbe28b8d9a5235c483 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 16:45:16 +0200 Subject: [PATCH 07/49] aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 1533 +++++++++-------- code/game/objects/items/documents.dm | 5 + code/game/objects/items/storage/secure.dm | 10 +- code/modules/paperwork/folders_premade.dm | 4 + 4 files changed, 848 insertions(+), 704 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 35adbc197ea0..1b7ab95641fb 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1,12 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - id = "kansatsu_bridge" +/obj/structure/chair/office/light{ + dir = 4 }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, +/turf/open/floor/plasteel/tech, /area/ship/bridge) "ah" = ( /obj/effect/turf_decal/industrial/warning{ @@ -20,25 +17,26 @@ /area/ship/cargo) "aj" = ( /obj/structure/table/glass, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 12 +/obj/item/radio{ + pixel_y = 6 }, -/obj/item/paper_bin{ - pixel_y = 4; - pixel_x = 10 +/obj/item/radio{ + pixel_y = 6 }, -/obj/effect/turf_decal/siding/wood{ - dir = 10; - color = "#E6D2BA" +/obj/item/radio{ + pixel_y = 6 }, -/obj/item/stamp/cybersun{ - pixel_x = -4 +/obj/item/radio{ + pixel_y = 6 }, -/obj/item/pen/fourcolor, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/plasteel/white, -/area/ship/bridge) +/obj/item/radio{ + pixel_y = 6 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) "aQ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/security/armory) @@ -56,19 +54,26 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/firealarm/directional/south{ - pixel_x = -5 +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Bridge"; + req_access_txt = "19" }, -/obj/structure/extinguisher_cabinet/directional/south{ - pixel_x = 7 +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "aZ" = ( /obj/structure/table/chem, /obj/machinery/light/directional/east, /obj/machinery/cell_charger, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "bn" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ @@ -97,15 +102,14 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "bO" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/bridge) "cd" = ( -/obj/effect/turf_decal/industrial/stand_clear/red{ - dir = 1 - }, /obj/machinery/door/poddoor{ dir = 2; id = "kansatsu_cargo" @@ -121,10 +125,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "co" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1; - color = "#FFFFFF" - }, /obj/structure/extinguisher_cabinet/directional/west{ pixel_y = -8 }, @@ -136,6 +136,9 @@ pixel_y = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/crew) "cu" = ( @@ -154,6 +157,15 @@ dir = 8 }, /obj/structure/chair/handrail, +/obj/machinery/firealarm/directional/north{ + pixel_x = 6 + }, +/obj/structure/extinguisher_cabinet/directional/north{ + pixel_x = -6 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 4 + }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "cL" = ( @@ -186,8 +198,8 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, -/obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, /area/ship/crew) "dj" = ( @@ -214,18 +226,18 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "dq" = ( -/obj/machinery/door/airlock/maintenance/external/glass{ - name = "Cargo Bay" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/mono/white, +/obj/machinery/door/airlock/hatch{ + name = "Cargo Bay" + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "dx" = ( -/obj/structure/table/glass, +/obj/structure/table, /obj/item/reagent_containers/food/drinks/sillycup/smallcarton{ pixel_x = -7; list_reagents = list(/datum/reagent/consumable/tomatojuice = 15) @@ -233,37 +245,25 @@ /turf/open/floor/plasteel/tech, /area/ship/crew) "dA" = ( -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 4 +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 4 }, /obj/item/kirbyplants/fullysynthetic{ - pixel_x = 8 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ - dir = 1 - }, -/obj/machinery/camera{ - dir = 8; - c_tag = "Hallway" + pixel_y = 20 }, -/obj/machinery/light/directional/east, /turf/open/floor/plasteel/white, /area/ship/crew) "dZ" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/curtain/cloth/grey, -/turf/open/floor/plasteel/stairs/left{ - dir = 4; - color = "#555555" +/obj/structure/table/glass, +/obj/item/reagent_containers/food/drinks/bottle/wine{ + pixel_y = 7; + pixel_x = -4 }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plasteel/white, /area/ship/bridge) "ej" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -283,17 +283,28 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) +"en" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Command Dormitory"; + req_access_txt = "19" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm/dormtwo) "eu" = ( /obj/structure/closet/crate/medical, /obj/item/storage/box/bodybags, /obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/storage/firstaid/toxin, +/obj/item/storage/pill_bottle/charcoal, /obj/item/storage/firstaid/regular, /obj/item/roller, /obj/item/reagent_containers/hypospray/medipen/morphine, -/obj/item/reagent_containers/hypospray/medipen/salbutamol, -/obj/item/reagent_containers/hypospray/medipen/salbutamol, -/obj/item/reagent_containers/hypospray/medipen/survival, /obj/item/reagent_containers/hypospray/medipen/survival, /obj/item/reagent_containers/hypospray/medipen/survival, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -330,41 +341,37 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, -/obj/effect/turf_decal/industrial/stand_clear/red{ - dir = 1 - }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#E6D2BA" - }, -/obj/item/radio/intercom/directional/west{ - pixel_y = -2 - }, -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "A comfy-looking snake bed. There's bits of shed scales stuck in the bedding."; - name = "snake bed" +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + color = "#555555" }, /turf/open/floor/plasteel/white, /area/ship/bridge) "gj" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ +/obj/machinery/light/directional/north, +/obj/structure/closet/crate/secure/science{ + req_access_txt = "19"; + anchored = 1 + }, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/chameleon, +/obj/item/chameleon, +/obj/item/clothing/accessory/holster/chameleon, +/obj/item/clothing/accessory/holster/chameleon, +/obj/item/disk/holodisk/kansatsu/gear/chameleon, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 4 }, -/obj/machinery/light/directional/north, -/obj/item/ammo_box/c10mm{ - pixel_y = 7; - pixel_x = -3 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/item/ammo_box/c10mm/rubbershot{ - pixel_x = 1; - pixel_y = 2 +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" }, -/turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "gP" = ( /obj/effect/turf_decal/industrial/warning{ @@ -381,6 +388,7 @@ /obj/item/tank/internals/oxygen/red, /obj/item/tank/internals/oxygen/red, /obj/item/tank/internals/oxygen/red, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "hr" = ( @@ -388,11 +396,14 @@ dir = 1; color = "#555555" }, -/obj/machinery/atmospherics/components/binary/valve/digital/on/layer4, +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/closet/firecloset/wall/directional/east, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/engineering) "hT" = ( @@ -401,8 +412,26 @@ }, /obj/structure/catwalk/over/plated_catwalk/white, /obj/structure/curtain, +/obj/item/soap/syndie{ + cleanspeed = 20 + }, +/obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/crew) +"hW" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 6 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#555555" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "if" = ( /obj/effect/turf_decal/box/white, /obj/machinery/suit_storage_unit/inherit, @@ -451,7 +480,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "in" = ( /obj/structure/table/chem{ @@ -465,6 +496,24 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew) +"iz" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Observation Deck"; + req_access_txt = "19" + }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_lockdown"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) "iL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -505,8 +554,22 @@ device_theme = "syndicate" }, /obj/item/disk/holodisk/kansatsu/gear/tablets, +/obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"iT" = ( +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "iY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -526,8 +589,13 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "jj" = ( -/obj/machinery/blackbox_recorder, -/turf/open/floor/plasteel/dark, +/obj/machinery/power/ship_gravity, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "jH" = ( /obj/machinery/power/terminal{ @@ -540,6 +608,7 @@ dir = 8; color = "#555555" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ship/engineering) "jW" = ( @@ -558,7 +627,6 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, /area/ship/crew) "kb" = ( @@ -587,7 +655,9 @@ req_one_access = list(11, 19) }, /obj/item/stack/sheet/mineral/diamond/five, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "kL" = ( /obj/structure/chair/bench/red/directional/west, @@ -598,33 +668,69 @@ "kM" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/crew) +"la" = ( +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" + }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) "lh" = ( -/obj/machinery/computer/cryopod/directional/east, /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 }, -/obj/item/radio/intercom/directional/north, +/obj/machinery/computer/cryopod/directional/north, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) -"lJ" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/siding/wood{ - dir = 2; - color = "#E6D2BA" +"lp" = ( +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ - pixel_x = -4; - pixel_y = 7 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/item/reagent_containers/food/drinks/bottle/wine{ - pixel_y = 7; - pixel_x = 9 +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/machinery/airalarm/directional/south, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/white, -/area/ship/bridge) -"lP" = ( -/obj/effect/turf_decal/industrial/warning/corner{ +/area/ship/crew) +"lJ" = ( +/obj/structure/bed/dogbed{ + anchored = 1; + desc = "A comfy-looking snake bed. There's bits of shed scales stuck in the bedding."; + name = "snake bed" + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 10 + }, +/mob/living/simple_animal/hostile/retaliate/poison/snake{ + icon = 'icons/mob/pets.dmi'; + icon_dead = "bookworm_dead"; + icon_living = "bookworm"; + icon_state = "bookworm"; + name = "Agent Berry"; + desc = "A red, slithery snake. This one is trained in corporate espionage. Allegedly, at least." + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/orange, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/bridge) +"lP" = ( +/obj/effect/turf_decal/industrial/warning/corner{ dir = 1; color = "#FFFFFF" }, @@ -634,10 +740,11 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "lZ" = ( -/obj/machinery/computer/helm/viewscreen/directional/south, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -702,7 +809,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) "nF" = ( @@ -731,12 +840,6 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "oC" = ( -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -760,52 +863,58 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "oW" = ( -/obj/machinery/computer/cargo{ - dir = 8; - icon_keyboard = "syndie_key"; - icon_state = "computer-right" - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 - }, -/obj/structure/railing{ - dir = 6 +/obj/structure/chair/office{ + dir = 1 }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/white, /area/ship/bridge) "pa" = ( -/obj/structure/closet/wall/directional/south{ - name = "Agent Wardrobe" +/obj/structure/dresser{ + dir = 1 }, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel/sec, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 +/obj/effect/spawner/lootdrop/plushie/moth{ + pixel_y = 11 }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) +"pv" = ( +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Command Wardrobe"; + icon_state = "sec_wall"; + req_access_txt = "19" + }, +/obj/machinery/newscaster/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -10 }, -/obj/item/clothing/under/syndicate/cybersun, -/obj/item/clothing/under/syndicate/cybersun, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/head/soft/cybersun, -/obj/item/clothing/head/soft/cybersun, /obj/machinery/camera{ - dir = 8; - c_tag = "Dormitory" + dir = 4; + c_tag = "Dormitory - Command" }, -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 +/obj/structure/cable/orange{ + icon_state = "2-4" }, -/obj/structure/extinguisher_cabinet/directional/east{ +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ pixel_y = -7 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/turf/open/floor/carpet/nanoweave, -/area/ship/crew/dorm) +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm/dormtwo) "pE" = ( /obj/effect/turf_decal/corner_techfloor_grid{ dir = 5 @@ -862,28 +971,28 @@ dir = 8 }, /obj/item/clothing/glasses/welding, -/turf/open/floor/plasteel/dark, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "qf" = ( /obj/effect/turf_decal/industrial/warning{ dir = 2; color = "#FFFFFF" }, -/obj/structure/closet/crate{ - name = "mining equipment crate" - }, /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, +/obj/structure/closet/crate{ + name = "custodial crate" + }, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/pushbroom, +/obj/item/storage/bag/trash, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "ql" = ( @@ -978,9 +1087,6 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/effect/turf_decal/industrial/stand_clear/red{ - dir = 1 - }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "rh" = ( @@ -1011,6 +1117,7 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 4 }, +/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, /area/ship/engineering) "rF" = ( @@ -1036,63 +1143,50 @@ layer = 3.09; name = "large sink" }, -/mob/living/simple_animal/bot/cleanbot, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "sR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/curtain/cloth{ - color = "#730622"; - icon_state = "bathroom-closed"; - open = 0; - opacity = 1; - layer = 4.25 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 +/obj/structure/closet/wall/directional/north{ + name = "Agent Wardrobe" }, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/turf/open/floor/plasteel/dark, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/head/soft/cybersun, +/obj/item/clothing/head/soft/cybersun, +/turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) "sZ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 2; - color = "#FFFFFF" +/obj/structure/filingcabinet/double{ + pixel_y = 17; + density = 0 }, /obj/machinery/airalarm/directional/east, -/obj/structure/sign/poster/contraband/stechkin{ - pixel_y = 32 - }, -/obj/structure/table/reinforced, -/obj/item/attachment/silencer{ - pixel_x = -13; - pixel_y = 2 - }, -/obj/item/storage/box/zipties{ - pixel_y = 11; - pixel_x = 6 - }, -/obj/item/attachment/silencer{ - pixel_x = -11; - pixel_y = 9 - }, -/obj/item/kitchen/knife/switchblade{ - pixel_x = 9 +/obj/item/folder/syndicate, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/item/kitchen/knife/switchblade{ - pixel_x = 1 +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" }, -/turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "tk" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ @@ -1115,61 +1209,54 @@ /turf/open/floor/plasteel/white, /area/ship/crew) "tv" = ( -/obj/structure/table/reinforced, -/obj/structure/closet/secure_closet/wall/directional/west{ - icon_state = "sec_wall"; - name = "firearm locker"; - req_access_txt = "48" +/obj/item/storage/pistolcase/stechkin, +/obj/item/storage/pistolcase/stechkin, +/obj/item/ammo_box/c10mm{ + pixel_y = 7; + pixel_x = -3 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/obj/item/ammo_box/c10mm{ + pixel_y = 5 }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = 6; - pixel_y = 4 +/obj/item/ammo_box/c10mm/rubbershot{ + pixel_x = 3; + pixel_y = 3 }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = 2; - pixel_y = 4 +/obj/item/attachment/silencer{ + pixel_x = -3 }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = -2; +/obj/item/attachment/silencer{ + pixel_x = 3; pixel_y = 4 }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = -6; - pixel_y = 4 +/obj/item/kitchen/knife/switchblade{ + pixel_x = -3 }, -/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag, -/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{ - pixel_y = 5 +/obj/item/kitchen/knife/switchblade{ + pixel_x = 7 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) -"ty" = ( -/obj/structure/toilet{ - dir = 8; - pixel_x = 4 +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "syndicate"; + name = "firearm storage"; + req_access_txt = "19" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 8 +/obj/structure/sign/poster/contraband/stechkin{ + pixel_x = -32 }, -/obj/machinery/camera{ - dir = 1; - c_tag = "Bathroom" +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 }, -/obj/structure/sink{ - pixel_y = 17; - pixel_x = -6 +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" }, -/obj/structure/mirror{ - pixel_y = 25; - layer = 2.89; - pixel_x = -7 +/area/ship/security/armory) +"ty" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 }, -/obj/machinery/light/dim/directional/east, -/turf/open/floor/plasteel/mono/white, -/area/ship/crew) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm/dormtwo) "tD" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -1200,35 +1287,25 @@ }, /obj/machinery/airalarm/directional/east, /obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "tJ" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) "uq" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1; - color = "#E6D2BA" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "6-8" - }, -/mob/living/simple_animal/hostile/retaliate/poison/snake{ - icon = 'icons/mob/pets.dmi'; - icon_dead = "bookworm_dead"; - icon_living = "bookworm"; - icon_state = "bookworm"; - name = "Agent Berry"; - desc = "A red, slithery snake. This one is trained in corporate espionage. Allegedly, at least." +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, /turf/open/floor/plasteel/white, /area/ship/bridge) @@ -1283,14 +1360,23 @@ /turf/open/floor/plating, /area/ship/engineering) "vN" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kansatsu_bridge" - }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"wD" = ( +/obj/structure/filingcabinet/double/grey, +/obj/item/folder/syndicate, +/obj/item/folder/red, +/obj/item/folder, +/obj/item/folder/white, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "xf" = ( /obj/effect/turf_decal/box/white, @@ -1312,9 +1398,15 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "yn" = ( -/obj/structure/chair/plastic{ - dir = 4 +/obj/structure/filingcabinet{ + dir = 4; + pixel_x = -10 }, +/obj/item/clipboard, +/obj/item/taperecorder, +/obj/item/binoculars, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/tech, /area/ship/bridge) "yw" = ( @@ -1356,20 +1448,29 @@ dir = 4 }, /obj/structure/cable/orange{ - icon_state = "4-8" + icon_state = "0-8" + }, +/obj/machinery/light_switch{ + pixel_x = -13; + pixel_y = 19 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/decal/cleanable/oil/streak, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 1 }, -/obj/structure/chair/handrail, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "zH" = ( -/obj/structure/cable/orange{ - icon_state = "0-9" - }, -/obj/machinery/power/ship_gravity, /obj/structure/sign/poster/contraband/gec{ pixel_y = -32 }, -/turf/open/floor/plasteel/dark, +/obj/structure/cable/orange{ + icon_state = "4-9" + }, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "zO" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ @@ -1387,57 +1488,25 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/closet/crate/secure/science{ - req_access_txt = "19" - }, -/obj/item/storage/box/syndie_kit/chameleon, -/obj/item/storage/box/syndie_kit/chameleon, -/obj/item/chameleon, -/obj/item/chameleon, -/obj/item/clothing/accessory/holster/chameleon, -/obj/item/clothing/accessory/holster/chameleon, -/obj/item/disk/holodisk/kansatsu/gear/chameleon, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6; - color = "#E6D2BA" - }, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "tac"; - name = "Command Wardrobe"; - req_access_txt = "19" - }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 - }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_observation" }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/turf/open/floor/plasteel/white, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, /area/ship/bridge) "Ap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4; - color = "#FFFFFF" +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" }, -/turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "AM" = ( /obj/machinery/door/airlock/grunge{ @@ -1453,7 +1522,10 @@ /obj/machinery/atmospherics/components/binary/pump/on/layer2{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "BS" = ( /obj/structure/chair/bench/red/directional/east, @@ -1464,12 +1536,31 @@ dir = 2; color = "#FFFFFF" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"CM" = ( +/obj/machinery/button/door{ + id = "kansatsu_observation"; + name = "Bridge Blast Doors"; + dir = 2; + pixel_y = 20; + pixel_x = 6 + }, +/obj/machinery/button/door{ + id = "kansatsu_lockdown"; + name = "Observation Lockdown"; + dir = 2; + pixel_y = 20; + pixel_x = -6 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "CP" = ( /obj/item/kirbyplants/fullysynthetic{ pixel_y = 20 }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew) "CR" = ( @@ -1480,9 +1571,6 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) "CU" = ( -/obj/effect/turf_decal/industrial/stand_clear/red{ - dir = 1 - }, /obj/machinery/door/poddoor{ dir = 2; id = "kansatsu_cargo" @@ -1497,14 +1585,27 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"Dt" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "DB" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/light_switch{ + pixel_y = -19; dir = 1; - color = "#E6D2BA" + pixel_x = -8 }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8; - color = "#E6D2BA" +/obj/machinery/firealarm/directional/south{ + pixel_x = 5 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1512,14 +1613,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 }, /turf/open/floor/plasteel/white, /area/ship/bridge) "DL" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/turf/open/floor/plasteel/patterned/brushed, +/obj/machinery/modular_computer/console/preset/command{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/white, /area/ship/bridge) "DU" = ( /obj/machinery/camera{ @@ -1553,19 +1661,19 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "FH" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#E6D2BA" +/obj/structure/chair/office, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, /turf/open/floor/plasteel/white, /area/ship/bridge) "FJ" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, +/obj/machinery/holopad/secure, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 4 }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, /turf/open/floor/plasteel/white, /area/ship/bridge) "FT" = ( @@ -1597,17 +1705,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "GG" = ( -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Bridge"; - req_access_txt = "19" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -1617,29 +1714,18 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"GV" = ( -/obj/structure/table/glass, -/obj/machinery/camera{ - dir = 4; - c_tag = "Cryogenics" - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 4 }, -/obj/item/radio{ - pixel_y = 6 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 }, -/obj/item/radio{ - pixel_y = 6 +/obj/structure/cable/orange{ + icon_state = "1-8" }, +/turf/open/floor/plasteel/white, +/area/ship/crew) +"GV" = ( /obj/effect/turf_decal/industrial/hatch{ color = "#730622"; alpha = 255 @@ -1648,8 +1734,7 @@ dir = 1; color = "#FFFFFF" }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel/mono/white, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/dorm) "Hd" = ( /obj/structure/chair/office/dark{ @@ -1659,9 +1744,6 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Hz" = ( -/obj/machinery/door/airlock/maintenance/external/glass{ - name = "Cargo Bay" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -1670,23 +1752,20 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/turf/open/floor/plasteel/mono/white, +/obj/machinery/door/airlock/hatch{ + name = "Cargo Bay" + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Ig" = ( -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5; - pixel_y = -4; - pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 - }, -/obj/machinery/camera{ +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ dir = 4; - c_tag = "Exterior - Fore-Port" + id = "kansatsu_observation" }, -/turf/open/floor/plating/airless, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, /area/ship/bridge) "ID" = ( /obj/machinery/button/door{ @@ -1746,61 +1825,32 @@ dir = 1; color = "#FFFFFF" }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 10 + }, +/obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew/dorm) "JI" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9; - color = "#E6D2BA" - }, -/obj/machinery/computer/crew/syndie{ - icon_state = "computer-left" - }, -/obj/machinery/camera{ - dir = 2; - c_tag = "Bridge" - }, -/obj/structure/sign/poster/contraband/cybersun{ - pixel_y = 32 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/white, /area/ship/bridge) "KA" = ( -/obj/structure/filingcabinet/double/grey{ - dir = 1 +/obj/machinery/computer/helm{ + dir = 8; + icon_state = "computer-right" }, -/obj/effect/turf_decal/siding/wood{ - dir = 2; - color = "#E6D2BA" +/obj/structure/railing/corner{ + dir = 4 }, -/obj/item/folder/syndicate, -/obj/item/folder/documents/syndicate/red, -/obj/item/folder/red, -/obj/item/folder/white, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/orange{ - icon_state = "0-1" +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "KP" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#FFFFFF" - }, -/mob/living/simple_animal/bot/cleanbot, -/obj/machinery/button/door{ - id = "kansatsu_armory"; - name = "Armory Access"; - pixel_y = 20; - dir = 2; - pixel_x = -7; - req_one_access = list(48, 19) - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -1808,64 +1858,75 @@ pixel_y = 20; pixel_x = 12 }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/crew) "Ld" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Lr" = ( -/obj/machinery/light_switch{ - pixel_x = 10; - pixel_y = 19 +/obj/structure/toilet{ + pixel_y = 15; + pixel_x = -5 }, -/obj/structure/closet/wall/directional/north{ - pixel_x = -4 +/obj/structure/sink{ + dir = 8; + pixel_y = 4; + pixel_x = 12 }, -/obj/item/towel{ - pixel_x = 5 +/obj/structure/mirror{ + pixel_x = 22; + pixel_y = 5; + layer = 2.89 }, -/obj/item/towel{ - pixel_x = -2 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 }, -/obj/item/soap/syndie{ - cleanspeed = 20 +/obj/machinery/camera{ + dir = 6; + c_tag = "Bathroom"; + pixel_x = -4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -10 }, /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Mb" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 - }, -/obj/structure/bed{ - dir = 4 - }, -/obj/structure/curtain/cloth{ - color = "#730622" - }, -/obj/item/bedsheet/syndie{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = 8 }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/tech, /area/ship/bridge) "Mn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/computer/cargo{ + dir = 8; + icon_keyboard = "syndie_key"; + icon_state = "computer-left" }, -/obj/structure/cable/orange{ - icon_state = "2-9" +/obj/structure/railing{ + dir = 5; + layer = 2.89 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "MH" = ( -/obj/effect/turf_decal/industrial/stand_clear/red{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - id = "kansatsu_armory"; - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -1875,6 +1936,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Armory"; + req_access_txt = "19" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "No" = ( @@ -1905,11 +1971,22 @@ /turf/open/floor/plasteel/white, /area/ship/crew) "NU" = ( -/obj/structure/chair/office/light, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/structure/railing{ + dir = 1; + layer = 2.89 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/obj/item/storage/secure/safe/cybersun{ + dir = 8; + pixel_x = -31; + pixel_y = -4 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "NW" = ( /obj/machinery/button/door{ @@ -1926,6 +2003,7 @@ dir = 8; color = "#555555" }, +/obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/white, /area/ship/engineering) "Od" = ( @@ -1952,6 +2030,12 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Or" = ( @@ -1959,15 +2043,13 @@ /turf/open/floor/plasteel/tech, /area/ship/crew) "Ox" = ( -/obj/machinery/computer/helm{ - dir = 8; +/obj/machinery/computer/crew/syndie{ icon_state = "computer-left" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ +/obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, -/obj/structure/railing/corner, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/white, /area/ship/bridge) "OD" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ @@ -1983,6 +2065,7 @@ /obj/structure/chair/handrail{ dir = 8 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering) "OP" = ( @@ -2000,7 +2083,7 @@ /turf/open/floor/plasteel/white, /area/ship/crew) "OW" = ( -/obj/structure/table/glass, +/obj/structure/table, /obj/structure/railing, /obj/machinery/door/firedoor/border_only, /obj/item/folder/red{ @@ -2024,28 +2107,21 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Qa" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 - }, -/obj/structure/railing, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -10 - }, -/obj/item/storage/secure/safe/cybersun{ - dir = 8; - pixel_x = -31; - pixel_y = 6 +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Ql" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; color = "#FFFFFF" }, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "Qx" = ( /obj/structure/sign/warning/docking{ @@ -2054,23 +2130,31 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) "Qy" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/curtain/cloth/grey, /obj/machinery/button/door{ - id = "kansatsu_bridge"; - name = "Bridge Blast Doors"; - pixel_y = 20; - dir = 2 + id = "kansatsu_lockdown"; + name = "Observation Lockdown"; + dir = 8; + pixel_x = 20; + pixel_y = 6 }, -/turf/open/floor/plasteel/stairs/right{ +/obj/effect/turf_decal/industrial/warning/corner{ dir = 4; color = "#555555" }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = 6 + }, +/obj/item/stamp/cybersun{ + pixel_x = -6 + }, +/obj/item/pen/fourcolor, +/obj/machinery/newscaster/directional/east{ + pixel_y = -7 + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "QN" = ( /obj/structure/table/reinforced, @@ -2083,11 +2167,10 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "QO" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5; - color = "#E6D2BA" - }, -/obj/machinery/modular_computer/console/preset/command, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/white, /area/ship/bridge) "Ri" = ( @@ -2105,14 +2188,6 @@ /area/ship/engineering) "Rj" = ( /obj/effect/turf_decal/box/white, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/obj/machinery/light_switch{ - pixel_x = -12; - pixel_y = 19 - }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/camera{ dir = 6; @@ -2140,15 +2215,13 @@ anchored = 1; icon_state = "syndicate"; name = "equipment storage"; - req_access_txt = "48" - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 + req_access_txt = "19" }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/orange{ icon_state = "0-4" }, +/obj/item/storage/box/zipties, /obj/item/camera, /obj/item/camera, /obj/item/taperecorder, @@ -2158,11 +2231,32 @@ /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, /obj/item/storage/pill_bottle/cyanide, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/security/armory) "Rz" = ( /turf/open/floor/plasteel/white, /area/ship/bridge) +"RK" = ( +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 + }, +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Fore-Port" + }, +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + }, +/turf/open/floor/plating/airless, +/area/ship/bridge) "RO" = ( /obj/machinery/camera{ dir = 8; @@ -2174,25 +2268,25 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "RX" = ( -/obj/effect/turf_decal/industrial/stand_clear/red{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - id = "kansatsu_armory"; - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/brigdoor/westleft{ + req_access_txt = "19" + }, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = -2 + }, +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "RY" = ( @@ -2205,11 +2299,12 @@ pixel_x = 8; pixel_y = 19 }, -/obj/structure/dresser{ - dir = 4 +/obj/machinery/camera{ + dir = 5; + c_tag = "Dormitory" }, -/obj/effect/spawner/lootdrop/plushie/moth{ - pixel_y = 11 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) @@ -2233,7 +2328,9 @@ dir = 1; piping_layer = 2 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "SK" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ @@ -2252,15 +2349,13 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "SL" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#E6D2BA" - }, -/obj/machinery/light/directional/north, /obj/machinery/computer/security{ icon_state = "computer-right"; icon_keyboard = "syndie_key" }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "Tv" = ( @@ -2276,7 +2371,6 @@ }, /obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/heavy, -/obj/effect/turf_decal/industrial/stand_clear/red, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Ul" = ( @@ -2288,36 +2382,41 @@ color = "#FFFFFF" }, /obj/structure/cable/white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/engineering) "Ur" = ( -/obj/structure/table/rolling, -/obj/item/binoculars{ +/obj/machinery/firealarm/directional/east{ pixel_y = 5 }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = -7 + }, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "UE" = ( -/obj/structure/table/glass, -/obj/machinery/fax/syndicate{ - pixel_y = 6 +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/obj/effect/turf_decal/siding/wood{ - dir = 2; - color = "#E6D2BA" +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/item/radio/intercom/wideband/directional/south{ + pixel_x = 7 }, -/obj/structure/sign/poster/contraband/cybersun_med{ - pixel_y = -32 +/obj/machinery/turretid{ + pixel_y = -22; + pixel_x = -13 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "UZ" = ( /obj/effect/turf_decal/box/white, /obj/machinery/airalarm/directional/west, /obj/structure/reagent_dispensers/watertank, -/obj/machinery/firealarm/directional/north{ - pixel_x = 8 - }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Va" = ( @@ -2331,6 +2430,7 @@ /obj/structure/cable/orange{ icon_state = "0-6" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ship/engineering) "Vg" = ( @@ -2358,16 +2458,23 @@ /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) "Vw" = ( -/obj/structure/closet/secure_closet/freezer{ - anchored = 1; - locked = 0; - name = "fridge" - }, /obj/machinery/camera{ dir = 6; c_tag = "Briefing Room" }, /obj/machinery/light/directional/north, +/obj/structure/table/chem{ + name = "kitchen counter" + }, +/obj/structure/sink/chem{ + name = "kitchen sink" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"VJ" = ( +/obj/structure/table/chem{ + name = "kitchen counter" + }, /obj/item/reagent_containers/food/drinks/waterbottle, /obj/item/reagent_containers/food/drinks/waterbottle, /obj/item/reagent_containers/food/drinks/waterbottle, @@ -2381,15 +2488,8 @@ /obj/item/reagent_containers/food/drinks/dry_ramen, /obj/item/reagent_containers/food/drinks/dry_ramen, /obj/item/reagent_containers/food/drinks/dry_ramen, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"VJ" = ( -/obj/structure/table/chem{ - name = "kitchen counter" - }, -/obj/machinery/airalarm/directional/north, -/obj/structure/sink/chem{ - name = "kitchen sink" +/obj/structure/closet/wall/white/directional/north{ + name = "Freezer" }, /turf/open/floor/plasteel/dark, /area/ship/crew) @@ -2397,14 +2497,20 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 }, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 19 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/item/kirbyplants/fullysynthetic{ - pixel_y = 20 +/obj/structure/curtain/cloth{ + color = "#730622"; + icon_state = "bathroom-closed"; + open = 0; + opacity = 1; + layer = 4.25 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ dir = 8 }, /turf/open/floor/plasteel/dark, @@ -2429,21 +2535,15 @@ /turf/open/floor/plating, /area/ship/engineering) "Xc" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#E6D2BA" +/obj/structure/cable/orange{ + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" + dir = 8 }, -/obj/machinery/holopad/secure, -/obj/effect/turf_decal/trimline/opaque/syndiered, /turf/open/floor/plasteel/white, /area/ship/bridge) "Xw" = ( @@ -2462,23 +2562,35 @@ /obj/structure/closet/emcloset/wall/directional/north{ populate = 0 }, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"XV" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/white, +/area/ship/engineering) "XX" = ( /obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/heavy, -/obj/effect/turf_decal/industrial/stand_clear/red, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "YE" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#FFFFFF" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -2488,6 +2600,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/crew) "YG" = ( @@ -2497,6 +2612,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering) "YQ" = ( @@ -2516,33 +2632,25 @@ /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/cargo) +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm/dormtwo) "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, /area/ship/engineering) "ZI" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/obj/item/radio/intercom/wideband/directional/north{ - pixel_x = 10 - }, -/obj/machinery/turretid{ - pixel_y = 23; - pixel_x = -11 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/open/floor/plasteel/patterned/brushed, -/area/ship/bridge) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm/dormtwo) "ZQ" = ( /obj/machinery/camera{ dir = 1; @@ -2559,12 +2667,13 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4; - color = "#FFFFFF" +/obj/structure/chair/office/light{ + dir = 4 }, /obj/machinery/firealarm/directional/south, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/security/armory) (1,1,1) = {" @@ -2607,7 +2716,7 @@ XJ YG XX Va -yl +XV jH NW yl @@ -2696,11 +2805,11 @@ aQ tV tk jW -Nu -Nu -Nu -Nu -Nu +cZ +cZ +cZ +cZ +cZ YQ "} (9,1,1) = {" @@ -2729,8 +2838,8 @@ Fw BS yw IJ -qS -Zs +lp +cZ cw zY gP @@ -2781,7 +2890,7 @@ rR qA IJ qS -Zs +cZ yH zO ah @@ -2815,11 +2924,11 @@ Hd Vg IJ lZ -qo -qo -qo -qo -qo +cZ +cZ +cZ +cZ +cZ YQ "} (16,1,1) = {" @@ -2868,7 +2977,7 @@ IJ mD qo sR -qo +Ur qo YQ YQ @@ -2878,9 +2987,9 @@ YQ YQ YQ YQ -tV +ZI ty -tV +ZI dA oC qo @@ -2895,12 +3004,12 @@ YQ YQ YQ YQ -bO -Xw -Xw -Xw +ZI +pv +en +la GG -Xw +qo lh Js qo @@ -2912,14 +3021,14 @@ YQ YQ YQ YQ -YQ +ZI +Zs +ZI Xw -Mb -Qa aT Xw -Xw -Xw +aj +qo qo YQ YQ @@ -2929,13 +3038,13 @@ YQ YQ YQ YQ -YQ -Xw +ZI +ZI ZI DL DB -fk -aj +Xw +Xw Xw DU YQ @@ -2946,7 +3055,7 @@ YQ YQ YQ YQ -YQ +Xw Xw Ox oW @@ -2963,12 +3072,12 @@ YQ YQ YQ YQ -YQ -Xw +RK Xw +SL JI uq -Rz +tJ UE Xw YQ @@ -2981,9 +3090,9 @@ YQ YQ YQ YQ -Ig Xw -SL +Qa +Rz FJ Mn KA @@ -2998,13 +3107,13 @@ YQ YQ YQ YQ -YQ Xw +wD QO FH -FH -Ah +iT Xw +bO YQ YQ YQ @@ -3015,13 +3124,13 @@ YQ YQ YQ YQ -YQ -bO Xw +hW +fk Qy dZ Xw -bO +YQ YQ YQ YQ @@ -3032,12 +3141,12 @@ YQ YQ YQ YQ -YQ -YQ -aa -tJ -tJ -aa +bO +Xw +iz +Xw +Xw +Xw YQ YQ YQ @@ -3050,11 +3159,11 @@ YQ YQ YQ YQ -YQ -aa +Xw +CM yn -Ur -aa +Xw +bO YQ YQ YQ @@ -3067,11 +3176,45 @@ YQ YQ YQ YQ -YQ +Ah aa vN -vN -aa +Ah +YQ +YQ +YQ +YQ +YQ +"} +(31,1,1) = {" +YQ +YQ +YQ +YQ +YQ +YQ +Ah +Mb +Dt +Ah +YQ +YQ +YQ +YQ +YQ +"} +(32,1,1) = {" +YQ +YQ +YQ +YQ +YQ +YQ +Ah +Ig +Ig +Ah +YQ YQ YQ YQ diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index 51c17ff4290d..e1353f8ac9bf 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -32,6 +32,11 @@ desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence. These documents are verified with a red wax seal." icon_state = "docs_red" +/obj/item/documents/syndicate/cybersun + name = "Cybersun classified documents" + desc = "\"Top Secret\" documents detailing sensitive Cybersun operational intelligence. These documents are verified with a red wax seal." + icon_state = "docs_red" + /obj/item/documents/syndicate/blue name = "blue secret documents" desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence. These documents are verified with a blue wax seal." diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 016e48dc8352..f5c5fe638f26 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -195,15 +195,6 @@ . = ..() new /obj/item/documents/syndicate(src) -/obj/item/storage/secure/safe/intel/stechkin - name = "Sensitive Data Safe" - -/obj/item/storage/secure/safe/intel/stechkin/PopulateContents() - . = ..() - new /obj/item/gun/ballistic/automatic/pistol/syndicate(src) - new /obj/item/ammo_box/magazine/m10mm(src) - new /obj/item/ammo_box/magazine/m10mm(src) - /obj/item/storage/secure/safe/suns name = "Captain's Secure Safe" desc = "The most important part of a SUNS vessel is the spare dueling sword." @@ -220,3 +211,4 @@ new /obj/item/ammo_box/a357 (src) new /obj/item/ammo_box/a357 (src) new /obj/item/ammo_box/a357 (src) + new /obj/item/folder/documents/syndicate/cybersun (src) diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm index 3c9dbb89feae..5699d1b6c3fd 100644 --- a/code/modules/paperwork/folders_premade.dm +++ b/code/modules/paperwork/folders_premade.dm @@ -41,6 +41,10 @@ name = "folder- 'TOP SECRET'" desc = "A folder stamped \"Top Secret - Property of The Syndicate.\"" +/obj/item/folder/documents/syndicate/cybersun + document = /obj/item/documents/syndicate/cybersun + icon_state = "folder_sred" + /obj/item/folder/documents/syndicate/red document = /obj/item/documents/syndicate/red icon_state = "folder_sred" From 263bd8455bc8557644fedf941fcd371c26ed16d2 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 16:49:17 +0200 Subject: [PATCH 08/49] oopsie! --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 613 +++++++++--------- 1 file changed, 305 insertions(+), 308 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 1b7ab95641fb..4005055ac318 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1,7 +1,18 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/chair/office/light{ - dir = 4 +/obj/machinery/button/door{ + id = "kansatsu_observation"; + name = "Bridge Blast Doors"; + dir = 2; + pixel_y = 20; + pixel_x = 6 + }, +/obj/machinery/button/door{ + id = "kansatsu_lockdown"; + name = "Observation Lockdown"; + dir = 2; + pixel_y = 20; + pixel_x = -6 }, /turf/open/floor/plasteel/tech, /area/ship/bridge) @@ -16,27 +27,19 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "aj" = ( -/obj/structure/table/glass, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/item/radio{ - pixel_y = 6 +/obj/machinery/door/airlock/hatch{ + name = "Command Dormitory"; + req_access_txt = "19" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm/dormtwo) "aQ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/security/armory) @@ -283,20 +286,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) -"en" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch{ - name = "Command Dormitory"; - req_access_txt = "19" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm/dormtwo) "eu" = ( /obj/structure/closet/crate/medical, /obj/item/storage/box/bodybags, @@ -344,12 +333,43 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/effect/turf_decal/industrial/warning{ +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Command Wardrobe"; + icon_state = "sec_wall"; + req_access_txt = "19" + }, +/obj/machinery/newscaster/directional/west, +/obj/machinery/light_switch{ dir = 4; - color = "#555555" + pixel_x = -20; + pixel_y = -10 }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) +/obj/machinery/camera{ + dir = 4; + c_tag = "Dormitory - Command" + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm/dormtwo) "gj" = ( /obj/machinery/light/directional/north, /obj/structure/closet/crate/secure/science{ @@ -418,20 +438,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/crew) -"hW" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax/syndicate{ - pixel_y = 6 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 2; - color = "#555555" - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "if" = ( /obj/effect/turf_decal/box/white, /obj/machinery/suit_storage_unit/inherit, @@ -496,23 +502,20 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew) -"iz" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Observation Deck"; - req_access_txt = "19" - }, -/obj/machinery/door/poddoor/shutters{ - id = "kansatsu_lockdown"; - dir = 4 +"iJ" = ( +/obj/structure/filingcabinet/double/grey, +/obj/item/folder/syndicate, +/obj/item/folder/red, +/obj/item/folder, +/obj/item/folder/white, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plasteel/white, /area/ship/bridge) "iL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -557,19 +560,6 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"iT" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "iY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -668,24 +658,6 @@ "kM" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/crew) -"la" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - dir = 8; - c_tag = "Hallway" - }, -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/crew) "lh" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 @@ -693,21 +665,6 @@ /obj/machinery/computer/cryopod/directional/north, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) -"lp" = ( -/obj/effect/turf_decal/corner/opaque/white/half, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/crew) "lJ" = ( /obj/structure/bed/dogbed{ anchored = 1; @@ -877,44 +834,6 @@ }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) -"pv" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - name = "Command Wardrobe"; - icon_state = "sec_wall"; - req_access_txt = "19" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -10 - }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Dormitory - Command" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 - }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 - }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew/dorm/dormtwo) "pE" = ( /obj/effect/turf_decal/corner_techfloor_grid{ dir = 5 @@ -931,6 +850,16 @@ }, /turf/open/floor/plating/airless, /area/ship/bridge) +"pK" = ( +/obj/machinery/computer/security{ + icon_state = "computer-right"; + icon_keyboard = "syndie_key" + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "pM" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner, /obj/structure/extinguisher_cabinet/directional/south{ @@ -1292,10 +1221,22 @@ }, /area/ship/engineering) "tJ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/turf/open/floor/plasteel/patterned/brushed, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Observation Deck"; + req_access_txt = "19" + }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_lockdown"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1360,23 +1301,13 @@ /turf/open/floor/plating, /area/ship/engineering) "vN" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"wD" = ( -/obj/structure/filingcabinet/double/grey, -/obj/item/folder/syndicate, -/obj/item/folder/red, -/obj/item/folder, -/obj/item/folder/white, -/obj/item/clipboard, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_observation" }, -/turf/open/floor/plasteel/white, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, /area/ship/bridge) "xf" = ( /obj/effect/turf_decal/box/white, @@ -1384,6 +1315,34 @@ /obj/structure/crate_shelf, /turf/open/floor/plasteel/tech, /area/ship/cargo) +"xr" = ( +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"xT" = ( +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/crew) "yl" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8; @@ -1461,6 +1420,19 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"zv" = ( +/obj/machinery/firealarm/directional/east{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = -7 + }, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "zH" = ( /obj/structure/sign/poster/contraband/gec{ pixel_y = -32 @@ -1492,13 +1464,18 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - id = "kansatsu_observation" +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 6 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#555555" + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Ap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -1508,6 +1485,20 @@ color = "#777777" }, /area/ship/security/armory) +"Aq" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"AF" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "AM" = ( /obj/machinery/door/airlock/grunge{ name = "Bathroom" @@ -1539,23 +1530,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"CM" = ( -/obj/machinery/button/door{ - id = "kansatsu_observation"; - name = "Bridge Blast Doors"; - dir = 2; - pixel_y = 20; - pixel_x = 6 - }, -/obj/machinery/button/door{ - id = "kansatsu_lockdown"; - name = "Observation Lockdown"; - dir = 2; - pixel_y = 20; - pixel_x = -6 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) "CP" = ( /obj/item/kirbyplants/fullysynthetic{ pixel_y = 20 @@ -1585,16 +1559,28 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) -"Dt" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_x = 6; - pixel_y = 1 +"Dc" = ( +/obj/structure/table/glass, +/obj/item/radio{ + pixel_y = 6 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) "DB" = ( /obj/machinery/light_switch{ pixel_y = -19; @@ -1743,6 +1729,13 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew) +"Hq" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + color = "#555555" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "Hz" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1758,15 +1751,23 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Ig" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kansatsu_observation" +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/bridge) +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) "ID" = ( /obj/machinery/button/door{ id = "kansatsu_cargo"; @@ -1904,13 +1905,15 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Mb" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 7; - pixel_x = 8 +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/orange{ + icon_state = "0-8" }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm/dormtwo) "Mn" = ( /obj/machinery/computer/cargo{ dir = 8; @@ -2106,12 +2109,35 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"Qa" = ( -/obj/machinery/blackbox_recorder, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +"Ps" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" }, +/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, +/area/ship/engineering) +"Qa" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/bridge) +"Qk" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "Ql" = ( /obj/effect/turf_decal/industrial/warning{ @@ -2168,9 +2194,6 @@ /area/ship/crew) "QO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/white, /area/ship/bridge) "Ri" = ( @@ -2241,22 +2264,6 @@ "Rz" = ( /turf/open/floor/plasteel/white, /area/ship/bridge) -"RK" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 - }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Exterior - Fore-Port" - }, -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5; - pixel_y = -4; - pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." - }, -/turf/open/floor/plating/airless, -/area/ship/bridge) "RO" = ( /obj/machinery/camera{ dir = 8; @@ -2349,14 +2356,20 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "SL" = ( -/obj/machinery/computer/security{ - icon_state = "computer-right"; - icon_keyboard = "syndie_key" +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Fore-Port" }, -/turf/open/floor/plasteel/white, +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + }, +/turf/open/floor/plating/airless, /area/ship/bridge) "Tv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -2387,18 +2400,12 @@ }, /area/ship/engineering) "Ur" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = -7 +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/grey, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave, -/area/ship/crew/dorm) +/turf/open/floor/plasteel/white, +/area/ship/bridge) "UE" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -2570,20 +2577,6 @@ /obj/item/clothing/mask/breath, /turf/open/floor/plasteel/tech, /area/ship/engineering) -"XV" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#555555" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/plasteel/white, -/area/ship/engineering) "XX" = ( /obj/machinery/door/airlock/external, /obj/machinery/door/firedoor/heavy, @@ -2632,15 +2625,15 @@ /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-8" +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew/dorm/dormtwo) +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -2648,6 +2641,10 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, /area/ship/engineering) +"Zx" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "ZI" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/dorm/dormtwo) @@ -2716,7 +2713,7 @@ XJ YG XX Va -XV +Ps jH NW yl @@ -2838,7 +2835,7 @@ Fw BS yw IJ -lp +xT cZ cw zY @@ -2977,7 +2974,7 @@ IJ mD qo sR -Ur +zv qo YQ YQ @@ -3005,9 +3002,9 @@ YQ YQ YQ ZI -pv -en -la +fk +aj +Ig GG qo lh @@ -3022,12 +3019,12 @@ YQ YQ YQ ZI -Zs +Mb ZI Xw aT Xw -aj +Dc qo qo YQ @@ -3072,12 +3069,12 @@ YQ YQ YQ YQ -RK -Xw SL +Xw +pK JI uq -tJ +Qk UE Xw YQ @@ -3091,7 +3088,7 @@ YQ YQ YQ Xw -Qa +Ur Rz FJ Mn @@ -3108,10 +3105,10 @@ YQ YQ YQ Xw -wD +iJ QO FH -iT +xr Xw bO YQ @@ -3125,8 +3122,8 @@ YQ YQ YQ Xw -hW -fk +Ah +Hq Qy dZ Xw @@ -3143,7 +3140,7 @@ YQ YQ bO Xw -iz +tJ Xw Xw Xw @@ -3160,7 +3157,7 @@ YQ YQ YQ Xw -CM +aa yn Xw bO @@ -3176,10 +3173,10 @@ YQ YQ YQ YQ -Ah -aa vN -Ah +AF +Zx +vN YQ YQ YQ @@ -3193,10 +3190,10 @@ YQ YQ YQ YQ -Ah -Mb -Dt -Ah +vN +Aq +Zs +vN YQ YQ YQ @@ -3210,10 +3207,10 @@ YQ YQ YQ YQ -Ah -Ig -Ig -Ah +vN +Qa +Qa +vN YQ YQ YQ From e4828c898734900e16a5668be5edb97adc7c9df5 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 16:52:12 +0200 Subject: [PATCH 09/49] cameras and stuff --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 556 +++++++++--------- 1 file changed, 280 insertions(+), 276 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 4005055ac318..6b1641e3e888 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -27,19 +27,15 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "aj" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch{ - name = "Command Dormitory"; - req_access_txt = "19" +/obj/machinery/computer/security{ + icon_state = "computer-right"; + icon_keyboard = "syndie_key" }, -/obj/structure/cable/orange{ - icon_state = "1-2" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm/dormtwo) +/turf/open/floor/plasteel/white, +/area/ship/bridge) "aQ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/security/armory) @@ -155,6 +151,16 @@ }, /turf/closed/wall/mineral/plastitanium, /area/ship/engineering) +"cv" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/bridge) "cw" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 @@ -257,6 +263,10 @@ /obj/item/kirbyplants/fullysynthetic{ pixel_y = 20 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, /turf/open/floor/plasteel/white, /area/ship/crew) "dZ" = ( @@ -333,43 +343,18 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - name = "Command Wardrobe"; - icon_state = "sec_wall"; - req_access_txt = "19" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -10 - }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Dormitory - Command" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 +/obj/machinery/firealarm/directional/east{ + pixel_y = 5 }, -/obj/item/clothing/shoes/jackboots{ +/obj/structure/extinguisher_cabinet/directional/east{ pixel_y = -7 }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew/dorm/dormtwo) +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "gj" = ( /obj/machinery/light/directional/north, /obj/structure/closet/crate/secure/science{ @@ -426,6 +411,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/engineering) +"hy" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "hT" = ( /obj/machinery/shower{ pixel_y = 16 @@ -502,21 +495,24 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew) -"iJ" = ( -/obj/structure/filingcabinet/double/grey, -/obj/item/folder/syndicate, -/obj/item/folder/red, -/obj/item/folder, -/obj/item/folder/white, -/obj/item/clipboard, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +"iq" = ( +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" + }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/cable/orange{ + icon_state = "1-2" }, /turf/open/floor/plasteel/white, -/area/ship/bridge) +/area/ship/crew) "iL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -701,6 +697,16 @@ color = "#777777" }, /area/ship/engineering) +"lY" = ( +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm/dormtwo) "lZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -713,6 +719,24 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) +"mo" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Observation Deck"; + req_access_txt = "19" + }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_lockdown"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) "mD" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 8 @@ -796,6 +820,19 @@ }, /turf/open/floor/plating/airless, /area/ship/bridge) +"nP" = ( +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "oC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -807,6 +844,9 @@ icon_state = "4-8" }, /obj/item/radio/intercom/directional/south, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/white, /area/ship/crew) "oN" = ( @@ -850,16 +890,6 @@ }, /turf/open/floor/plating/airless, /area/ship/bridge) -"pK" = ( -/obj/machinery/computer/security{ - icon_state = "computer-right"; - icon_keyboard = "syndie_key" - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "pM" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner, /obj/structure/extinguisher_cabinet/directional/south{ @@ -875,9 +905,6 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, /turf/open/floor/plasteel/white, /area/ship/crew) "qa" = ( @@ -1221,23 +1248,43 @@ }, /area/ship/engineering) "tJ" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Command Wardrobe"; + icon_state = "sec_wall"; + req_access_txt = "19" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/machinery/newscaster/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -10 }, -/obj/machinery/door/airlock/hatch{ +/obj/machinery/camera{ dir = 4; - name = "Observation Deck"; - req_access_txt = "19" + c_tag = "Command Quarters" }, -/obj/machinery/door/poddoor/shutters{ - id = "kansatsu_lockdown"; - dir = 4 +/obj/structure/cable/orange{ + icon_state = "2-4" }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm/dormtwo) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) @@ -1261,11 +1308,7 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/cable/orange{ - icon_state = "0-2" - }, /turf/open/floor/plasteel/white, /area/ship/crew) "vK" = ( @@ -1315,34 +1358,22 @@ /obj/structure/crate_shelf, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"xr" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"xT" = ( -/obj/effect/turf_decal/corner/opaque/white/half, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +"xv" = ( +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Fore-Port" }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/crew) +/turf/open/floor/plating/airless, +/area/ship/bridge) "yl" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8; @@ -1420,19 +1451,21 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"zv" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = -7 +"zD" = ( +/obj/structure/filingcabinet/double/grey, +/obj/item/folder/syndicate, +/obj/item/folder/red, +/obj/item/folder, +/obj/item/folder/white, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/grey, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave, -/area/ship/crew/dorm) +/turf/open/floor/plasteel/white, +/area/ship/bridge) "zH" = ( /obj/structure/sign/poster/contraband/gec{ pixel_y = -32 @@ -1464,15 +1497,8 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax/syndicate{ - pixel_y = 6 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 2; +/obj/effect/turf_decal/industrial/warning{ + dir = 4; color = "#555555" }, /turf/open/floor/plasteel/white, @@ -1485,20 +1511,6 @@ color = "#777777" }, /area/ship/security/armory) -"Aq" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 7; - pixel_x = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"AF" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) "AM" = ( /obj/machinery/door/airlock/grunge{ name = "Bathroom" @@ -1559,28 +1571,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) -"Dc" = ( -/obj/structure/table/glass, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) "DB" = ( /obj/machinery/light_switch{ pixel_y = -19; @@ -1729,13 +1719,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew) -"Hq" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4; - color = "#555555" - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "Hz" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1751,23 +1734,31 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Ig" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - dir = 8; - c_tag = "Hallway" +/obj/structure/table/glass, +/obj/item/radio{ + pixel_y = 6 }, -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 1 +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 }, /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/structure/cable/orange{ - icon_state = "1-2" +/obj/machinery/camera{ + dir = 2; + c_tag = "Cryogenics" }, -/turf/open/floor/plasteel/white, -/area/ship/crew) +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) "ID" = ( /obj/machinery/button/door{ id = "kansatsu_cargo"; @@ -1905,14 +1896,7 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Mb" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave/beige, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/dorm/dormtwo) "Mn" = ( /obj/machinery/computer/cargo{ @@ -2109,35 +2093,15 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"Ps" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#555555" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/plasteel/white, -/area/ship/engineering) "Qa" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ dir = 4; - id = "kansatsu_observation" - }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/bridge) -"Qk" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 + pixel_x = 6; + pixel_y = 1 }, -/turf/open/floor/plasteel/patterned/brushed, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, /area/ship/bridge) "Ql" = ( /obj/effect/turf_decal/industrial/warning{ @@ -2356,20 +2320,8 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "SL" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 - }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Exterior - Fore-Port" - }, -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5; - pixel_y = -4; - pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." - }, -/turf/open/floor/plating/airless, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, /area/ship/bridge) "Tv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -2400,10 +2352,17 @@ }, /area/ship/engineering) "Ur" = ( -/obj/machinery/blackbox_recorder, +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 6 + }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#555555" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "UE" = ( @@ -2522,6 +2481,27 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) +"Wf" = ( +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/crew) +"Wr" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/bridge) "Xa" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -2583,6 +2563,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) +"YA" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "YE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -2608,6 +2594,20 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"YN" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/white, +/area/ship/engineering) "YQ" = ( /turf/template_noop, /area/template_noop) @@ -2625,14 +2625,11 @@ /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_x = 6; - pixel_y = 1 +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -2641,12 +2638,19 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, /area/ship/engineering) -"Zx" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) "ZI" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Command Quarters"; + req_access_txt = "19" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/crew/dorm/dormtwo) "ZQ" = ( /obj/machinery/camera{ @@ -2713,7 +2717,7 @@ XJ YG XX Va -Ps +YN jH NW yl @@ -2835,7 +2839,7 @@ Fw BS yw IJ -xT +Wf cZ cw zY @@ -2974,7 +2978,7 @@ IJ mD qo sR -zv +fk qo YQ YQ @@ -2984,9 +2988,9 @@ YQ YQ YQ YQ -ZI +Mb ty -ZI +Mb dA oC qo @@ -3001,10 +3005,10 @@ YQ YQ YQ YQ +Mb +tJ ZI -fk -aj -Ig +iq GG qo lh @@ -3018,13 +3022,13 @@ YQ YQ YQ YQ -ZI Mb -ZI +lY +Mb Xw aT Xw -Dc +Ig qo qo YQ @@ -3035,9 +3039,9 @@ YQ YQ YQ YQ -ZI -ZI -ZI +Mb +Mb +Mb DL DB Xw @@ -3069,12 +3073,12 @@ YQ YQ YQ YQ -SL +xv Xw -pK +aj JI uq -Qk +Wr UE Xw YQ @@ -3088,7 +3092,7 @@ YQ YQ YQ Xw -Ur +Zs Rz FJ Mn @@ -3105,10 +3109,10 @@ YQ YQ YQ Xw -iJ +zD QO FH -xr +nP Xw bO YQ @@ -3122,8 +3126,8 @@ YQ YQ YQ Xw +Ur Ah -Hq Qy dZ Xw @@ -3140,7 +3144,7 @@ YQ YQ bO Xw -tJ +mo Xw Xw Xw @@ -3174,8 +3178,8 @@ YQ YQ YQ vN -AF -Zx +YA +SL vN YQ YQ @@ -3191,8 +3195,8 @@ YQ YQ YQ vN -Aq -Zs +hy +Qa vN YQ YQ @@ -3208,8 +3212,8 @@ YQ YQ YQ vN -Qa -Qa +cv +cv vN YQ YQ From f3510f9aeaaa4c89ac0f19e870495c8a24cf2915 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:39:09 +0200 Subject: [PATCH 10/49] airlock --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 593 +++++++++--------- 1 file changed, 295 insertions(+), 298 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 6b1641e3e888..1f804156edf8 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -27,14 +27,22 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "aj" = ( -/obj/machinery/computer/security{ - icon_state = "computer-right"; - icon_keyboard = "syndie_key" +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Observation Deck"; + req_access_txt = "19" + }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_lockdown"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "aQ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -151,16 +159,6 @@ }, /turf/closed/wall/mineral/plastitanium, /area/ship/engineering) -"cv" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kansatsu_observation" - }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/bridge) "cw" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 @@ -225,10 +223,10 @@ dir = 6; c_tag = "Airlock - Internal" }, +/obj/machinery/light/dim/directional/east, /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, -/obj/item/radio/intercom/directional/east, /obj/structure/chair/handrail{ dir = 8 }, @@ -343,18 +341,11 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = -7 +/obj/structure/chair/office/light{ + dir = 4 }, -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/grey, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave, -/area/ship/crew/dorm) +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "gj" = ( /obj/machinery/light/directional/north, /obj/structure/closet/crate/secure/science{ @@ -411,14 +402,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/engineering) -"hy" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 7; - pixel_x = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) "hT" = ( /obj/machinery/shower{ pixel_y = 16 @@ -495,24 +478,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew) -"iq" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - dir = 8; - c_tag = "Hallway" - }, -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/crew) "iL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -682,6 +647,16 @@ /obj/structure/cable/orange, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) +"lK" = ( +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm/dormtwo) "lP" = ( /obj/effect/turf_decal/industrial/warning/corner{ dir = 1; @@ -697,16 +672,6 @@ color = "#777777" }, /area/ship/engineering) -"lY" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew/dorm/dormtwo) "lZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -719,24 +684,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) -"mo" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Observation Deck"; - req_access_txt = "19" - }, -/obj/machinery/door/poddoor/shutters{ - id = "kansatsu_lockdown"; - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) "mD" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 8 @@ -766,6 +713,16 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"nl" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "nq" = ( /obj/machinery/camera{ dir = 10; @@ -820,19 +777,6 @@ }, /turf/open/floor/plating/airless, /area/ship/bridge) -"nP" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "oC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -966,6 +910,13 @@ "qo" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/dorm) +"qu" = ( +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "qv" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -1248,43 +1199,21 @@ }, /area/ship/engineering) "tJ" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - name = "Command Wardrobe"; - icon_state = "sec_wall"; - req_access_txt = "19" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -10 +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 }, /obj/machinery/camera{ dir = 4; - c_tag = "Command Quarters" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 + c_tag = "Exterior - Fore-Port" }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew/dorm/dormtwo) +/turf/open/floor/plating/airless, +/area/ship/bridge) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) @@ -1344,36 +1273,28 @@ /turf/open/floor/plating, /area/ship/engineering) "vN" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - id = "kansatsu_observation" - }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, /area/ship/bridge) +"wy" = ( +/obj/machinery/firealarm/directional/east{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = -7 + }, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "xf" = ( /obj/effect/turf_decal/box/white, /obj/machinery/light/directional/west, /obj/structure/crate_shelf, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"xv" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 - }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Exterior - Fore-Port" - }, -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5; - pixel_y = -4; - pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." - }, -/turf/open/floor/plating/airless, -/area/ship/bridge) "yl" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8; @@ -1451,21 +1372,6 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"zD" = ( -/obj/structure/filingcabinet/double/grey, -/obj/item/folder/syndicate, -/obj/item/folder/red, -/obj/item/folder, -/obj/item/folder/white, -/obj/item/clipboard, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "zH" = ( /obj/structure/sign/poster/contraband/gec{ pixel_y = -32 @@ -1497,12 +1403,19 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4; - color = "#555555" +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) +/obj/machinery/door/airlock/hatch{ + name = "Command Quarters"; + req_access_txt = "19" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm/dormtwo) "Ap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -1621,6 +1534,16 @@ }, /turf/open/floor/plating/airless, /area/ship/bridge) +"ER" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/bridge) "EX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -1637,11 +1560,16 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "FH" = ( -/obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 2 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, /area/ship/bridge) "FJ" = ( @@ -1719,6 +1647,14 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew) +"Hp" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "Hz" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1733,7 +1669,7 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) -"Ig" = ( +"Ic" = ( /obj/structure/table/glass, /obj/item/radio{ pixel_y = 6 @@ -1759,6 +1695,52 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) +"Ig" = ( +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Command Wardrobe"; + icon_state = "sec_wall"; + req_access_txt = "19" + }, +/obj/machinery/newscaster/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -10 + }, +/obj/machinery/camera{ + dir = 4; + c_tag = "Command Quarters" + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm/dormtwo) +"Iy" = ( +/obj/structure/chair/office, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "ID" = ( /obj/machinery/button/door{ id = "kansatsu_cargo"; @@ -1825,6 +1807,19 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew/dorm) +"Jx" = ( +/obj/machinery/computer/security{ + icon_state = "computer-right"; + icon_keyboard = "syndie_key" + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "JI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/white, @@ -1938,6 +1933,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Nu" = ( @@ -2042,17 +2038,14 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/light/dim/directional/east, /obj/structure/chair/handrail{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/tech, /area/ship/engineering) "OP" = ( @@ -2093,15 +2086,32 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/tech, /area/ship/cargo) +"PO" = ( +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" + }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) "Qa" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_x = 6; - pixel_y = 1 +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_observation" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, /area/ship/bridge) "Ql" = ( /obj/effect/turf_decal/industrial/warning{ @@ -2320,8 +2330,11 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "SL" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + color = "#555555" + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Tv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -2352,19 +2365,19 @@ }, /area/ship/engineering) "Ur" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax/syndicate{ - pixel_y = 6 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 2; - color = "#555555" +/obj/structure/cable/orange{ + icon_state = "0-4" }, +/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, -/area/ship/bridge) +/area/ship/engineering) "UE" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -2397,6 +2410,9 @@ icon_state = "0-6" }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 + }, /turf/open/floor/plasteel/white, /area/ship/engineering) "Vg" = ( @@ -2481,27 +2497,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) -"Wf" = ( -/obj/effect/turf_decal/corner/opaque/white/half, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/crew) -"Wr" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/turf/open/floor/plasteel/patterned/brushed, -/area/ship/bridge) "Xa" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -2546,28 +2541,29 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/closet/emcloset/wall/directional/north{ - populate = 0 - }, -/obj/item/clothing/suit/space/eva, -/obj/item/clothing/head/helmet/space/eva, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/tech, /area/ship/engineering) "XX" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/door/firedoor/heavy, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"YA" = ( -/obj/structure/chair/office/light{ - dir = 4 +/obj/structure/filingcabinet/double/grey, +/obj/item/folder/syndicate, +/obj/item/folder/red, +/obj/item/folder, +/obj/item/folder/white, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Yt" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "YE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -2585,28 +2581,21 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "YG" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/engineering) -"YN" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#555555" - }, -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2{ + dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "0-4" +/obj/structure/sign/poster/contraband/cybersun{ + pixel_x = -32 }, -/obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/plasteel/white, +/obj/structure/closet/emcloset/wall/directional/south, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/plasteel/tech, /area/ship/engineering) "YQ" = ( /turf/template_noop, @@ -2625,12 +2614,20 @@ /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/machinery/blackbox_recorder, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/white, -/area/ship/bridge) +/area/ship/crew) "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -2639,19 +2636,19 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "ZI" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 6 }, -/obj/machinery/door/airlock/hatch{ - name = "Command Quarters"; - req_access_txt = "19" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/cable/orange{ - icon_state = "1-2" +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#555555" }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm/dormtwo) +/turf/open/floor/plasteel/white, +/area/ship/bridge) "ZQ" = ( /obj/machinery/camera{ dir = 1; @@ -2697,7 +2694,7 @@ CR (2,1,1) = {" Nu No -No +Nu Nu qv qv @@ -2715,9 +2712,9 @@ Nu Nu XJ YG -XX +Nu Va -YN +Ur jH NW yl @@ -2839,7 +2836,7 @@ Fw BS yw IJ -Wf +Zs cZ cw zY @@ -2978,7 +2975,7 @@ IJ mD qo sR -fk +wy qo YQ YQ @@ -3006,9 +3003,9 @@ YQ YQ YQ Mb -tJ -ZI -iq +Ig +Ah +PO GG qo lh @@ -3023,12 +3020,12 @@ YQ YQ YQ Mb -lY +lK Mb Xw aT Xw -Ig +Ic qo qo YQ @@ -3073,12 +3070,12 @@ YQ YQ YQ YQ -xv +tJ Xw -aj +Jx JI uq -Wr +Yt UE Xw YQ @@ -3092,7 +3089,7 @@ YQ YQ YQ Xw -Zs +qu Rz FJ Mn @@ -3109,10 +3106,10 @@ YQ YQ YQ Xw -zD +XX QO +Iy FH -nP Xw bO YQ @@ -3126,8 +3123,8 @@ YQ YQ YQ Xw -Ur -Ah +ZI +SL Qy dZ Xw @@ -3144,7 +3141,7 @@ YQ YQ bO Xw -mo +aj Xw Xw Xw @@ -3177,10 +3174,10 @@ YQ YQ YQ YQ +Qa +fk vN -YA -SL -vN +Qa YQ YQ YQ @@ -3194,10 +3191,10 @@ YQ YQ YQ YQ -vN -hy Qa -vN +Hp +nl +Qa YQ YQ YQ @@ -3211,10 +3208,10 @@ YQ YQ YQ YQ -vN -cv -cv -vN +Qa +ER +ER +Qa YQ YQ YQ From a85b07eff25e0f70d0722b38e9616a2ca0afe277 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:44:02 +0200 Subject: [PATCH 11/49] oopsie --- code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 88e76bcbfc73..6f67f9d5f110 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -125,7 +125,7 @@ DELAY 40 SAY They are scattered around the planetoids in your sector. You are also permitted to retrieve them from other vessels. DELAY 40 - SAY The anomaly cores must be stored in your cargo bay, in the company-issued secure crate. + SAY The anomaly cores must be stored in your armory, in the company-issued secure crate. DELAY 40 SAY Do not disappoint us. DELAY 20 From 011bc26abb9da49dc28ee48f1bd43e25c1c972e2 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:47:08 +0200 Subject: [PATCH 12/49] red carpet --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 668 +++++++++--------- 1 file changed, 334 insertions(+), 334 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 1f804156edf8..b21f964d1665 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1,18 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/machinery/button/door{ - id = "kansatsu_observation"; - name = "Bridge Blast Doors"; - dir = 2; - pixel_y = 20; - pixel_x = 6 - }, -/obj/machinery/button/door{ - id = "kansatsu_lockdown"; - name = "Observation Lockdown"; - dir = 2; - pixel_y = 20; - pixel_x = -6 +/obj/structure/chair/office/light{ + dir = 4 }, /turf/open/floor/plasteel/tech, /area/ship/bridge) @@ -27,22 +16,21 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "aj" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Observation Deck"; - req_access_txt = "19" +/obj/machinery/button/door{ + id = "kansatsu_observation"; + name = "Bridge Blast Doors"; + dir = 2; + pixel_y = 20; + pixel_x = 6 }, -/obj/machinery/door/poddoor/shutters{ +/obj/machinery/button/door{ id = "kansatsu_lockdown"; - dir = 4 + name = "Observation Lockdown"; + dir = 2; + pixel_y = 20; + pixel_x = -6 }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plasteel/tech, /area/ship/bridge) "aQ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -175,6 +163,19 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"cE" = ( +/obj/machinery/firealarm/directional/east{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = -7 + }, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "cL" = ( /obj/effect/turf_decal/corner/opaque/white/half{ dir = 4 @@ -341,11 +342,33 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/structure/chair/office/light{ - dir = 4 +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) +"fO" = ( +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "gj" = ( /obj/machinery/light/directional/north, /obj/structure/closet/crate/secure/science{ @@ -647,16 +670,6 @@ /obj/structure/cable/orange, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) -"lK" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew/dorm/dormtwo) "lP" = ( /obj/effect/turf_decal/industrial/warning/corner{ dir = 1; @@ -713,16 +726,6 @@ }, /turf/open/floor/plating, /area/ship/engineering) -"nl" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_x = 6; - pixel_y = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) "nq" = ( /obj/machinery/camera{ dir = 10; @@ -818,6 +821,12 @@ }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) +"py" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/bridge) "pE" = ( /obj/effect/turf_decal/corner_techfloor_grid{ dir = 5 @@ -910,13 +919,6 @@ "qo" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/dorm) -"qu" = ( -/obj/machinery/blackbox_recorder, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "qv" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -1199,20 +1201,14 @@ }, /area/ship/engineering) "tJ" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 - }, -/obj/machinery/camera{ +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ dir = 4; - c_tag = "Exterior - Fore-Port" - }, -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5; - pixel_y = -4; - pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + id = "kansatsu_observation" }, -/turf/open/floor/plating/airless, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, /area/ship/bridge) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1273,22 +1269,14 @@ /turf/open/floor/plating, /area/ship/engineering) "vN" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"wy" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = -7 +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_observation" }, -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/grey, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave, -/area/ship/crew/dorm) +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/bridge) "xf" = ( /obj/effect/turf_decal/box/white, /obj/machinery/light/directional/west, @@ -1320,6 +1308,24 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/tech, /area/ship/bridge) +"ys" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"yt" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Command Quarters"; + req_access_txt = "19" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm/dormtwo) "yw" = ( /obj/structure/chair/bench/red/directional/east, /obj/structure/railing, @@ -1403,19 +1409,18 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch{ - name = "Command Quarters"; - req_access_txt = "19" +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 2 }, -/obj/structure/cable/orange{ - icon_state = "1-2" +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_x = 12; + pixel_y = 7 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm/dormtwo) +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "Ap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -1534,16 +1539,6 @@ }, /turf/open/floor/plating/airless, /area/ship/bridge) -"ER" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kansatsu_observation" - }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/bridge) "EX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -1560,16 +1555,11 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "FH" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ - pixel_x = 12; - pixel_y = 7 +/obj/structure/chair/office, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/machinery/light/directional/south, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, /turf/open/floor/plasteel/white, /area/ship/bridge) "FJ" = ( @@ -1648,12 +1638,11 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Hp" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 7; - pixel_x = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + color = "#555555" }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Hz" = ( /obj/machinery/door/firedoor/border_only, @@ -1669,103 +1658,46 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) -"Ic" = ( -/obj/structure/table/glass, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 +"Ig" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = 8 }, -/obj/item/radio{ - pixel_y = 6 +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"ID" = ( +/obj/machinery/button/door{ + id = "kansatsu_cargo"; + name = "External Access"; + pixel_y = -20; + dir = 1; + pixel_x = 9 }, -/obj/item/radio{ - pixel_y = 6 +/obj/effect/turf_decal/box/white, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/black, +/obj/item/clothing/head/helmet/space/syndicate/black, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/tank/jetpack/oxygen/harness, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"IJ" = ( +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 }, /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 }, -/obj/machinery/camera{ - dir = 2; - c_tag = "Cryogenics" - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"Ig" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - name = "Command Wardrobe"; - icon_state = "sec_wall"; - req_access_txt = "19" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -10 - }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Command Quarters" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 - }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 - }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew/dorm/dormtwo) -"Iy" = ( -/obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, /turf/open/floor/plasteel/white, -/area/ship/bridge) -"ID" = ( -/obj/machinery/button/door{ - id = "kansatsu_cargo"; - name = "External Access"; - pixel_y = -20; - dir = 1; - pixel_x = 9 - }, -/obj/effect/turf_decal/box/white, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/syndicate/black, -/obj/item/clothing/head/helmet/space/syndicate/black, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/tank/jetpack/oxygen/harness, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"IJ" = ( -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 +/area/ship/crew) +"Jg" = ( +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, /turf/open/floor/plasteel/white, -/area/ship/crew) +/area/ship/bridge) "Jp" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp{ @@ -1807,19 +1739,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew/dorm) -"Jx" = ( -/obj/machinery/computer/security{ - icon_state = "computer-right"; - icon_keyboard = "syndie_key" - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/structure/sign/poster/contraband/cybersun{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "JI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/white, @@ -1860,6 +1779,19 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"Lq" = ( +/obj/machinery/computer/security{ + icon_state = "computer-right"; + icon_keyboard = "syndie_key" + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "Lr" = ( /obj/structure/toilet{ pixel_y = 15; @@ -1891,8 +1823,15 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Mb" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm/dormtwo) +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "Mn" = ( /obj/machinery/computer/cargo{ dir = 8; @@ -2034,6 +1973,21 @@ }, /turf/open/floor/plasteel/white, /area/ship/bridge) +"OB" = ( +/obj/structure/filingcabinet/double/grey, +/obj/item/folder/syndicate, +/obj/item/folder/red, +/obj/item/folder, +/obj/item/folder/white, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "OD" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 4 @@ -2086,33 +2040,32 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"PO" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - dir = 8; - c_tag = "Hallway" +"Qa" = ( +/obj/structure/table/glass, +/obj/item/radio{ + pixel_y = 6 }, -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 1 +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 }, /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/crew) -"Qa" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - id = "kansatsu_observation" +/obj/machinery/camera{ + dir = 2; + c_tag = "Cryogenics" }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/bridge) +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) "Ql" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; @@ -2330,11 +2283,37 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "SL" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4; - color = "#555555" +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/white, +/area/ship/crew) +"Tb" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Observation Deck"; + req_access_txt = "19" + }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_lockdown"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Tv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -2365,19 +2344,21 @@ }, /area/ship/engineering) "Ur" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#555555" +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 }, -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Fore-Port" }, -/obj/structure/cable/orange{ - icon_state = "0-4" +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." }, -/obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/plasteel/white, -/area/ship/engineering) +/turf/open/floor/plating/airless, +/area/ship/bridge) "UE" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -2531,6 +2512,20 @@ "Xw" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) +"XI" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 6 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#555555" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "XJ" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 @@ -2545,26 +2540,19 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "XX" = ( -/obj/structure/filingcabinet/double/grey, -/obj/item/folder/syndicate, -/obj/item/folder/red, -/obj/item/folder, -/obj/item/folder/white, -/obj/item/clipboard, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"Yt" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/machinery/power/terminal{ + dir = 8 }, -/turf/open/floor/plasteel/patterned/brushed, -/area/ship/bridge) +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/white, +/area/ship/engineering) "YE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -2614,20 +2602,43 @@ /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/effect/turf_decal/corner/opaque/white/half, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Command Wardrobe"; + icon_state = "sec_wall"; + req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/newscaster/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -10 + }, +/obj/machinery/camera{ + dir = 4; + c_tag = "Command Quarters" }, /obj/structure/cable/orange{ - icon_state = "4-8" + icon_state = "2-4" }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/crew) +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -2636,19 +2647,8 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "ZI" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax/syndicate{ - pixel_y = 6 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 2; - color = "#555555" - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm/dormtwo) "ZQ" = ( /obj/machinery/camera{ dir = 1; @@ -2714,7 +2714,7 @@ XJ YG Nu Va -Ur +XX jH NW yl @@ -2836,7 +2836,7 @@ Fw BS yw IJ -Zs +SL cZ cw zY @@ -2975,7 +2975,7 @@ IJ mD qo sR -wy +cE qo YQ YQ @@ -2985,9 +2985,9 @@ YQ YQ YQ YQ -Mb +ZI ty -Mb +ZI dA oC qo @@ -3002,10 +3002,10 @@ YQ YQ YQ YQ -Mb -Ig -Ah -PO +ZI +Zs +yt +fk GG qo lh @@ -3019,13 +3019,13 @@ YQ YQ YQ YQ -Mb -lK -Mb +ZI +fO +ZI Xw aT Xw -Ic +Qa qo qo YQ @@ -3036,9 +3036,9 @@ YQ YQ YQ YQ -Mb -Mb -Mb +ZI +ZI +ZI DL DB Xw @@ -3070,12 +3070,12 @@ YQ YQ YQ YQ -tJ +Ur Xw -Jx +Lq JI uq -Yt +py UE Xw YQ @@ -3089,7 +3089,7 @@ YQ YQ YQ Xw -qu +Jg Rz FJ Mn @@ -3106,10 +3106,10 @@ YQ YQ YQ Xw -XX +OB QO -Iy FH +Ah Xw bO YQ @@ -3123,8 +3123,8 @@ YQ YQ YQ Xw -ZI -SL +XI +Hp Qy dZ Xw @@ -3141,7 +3141,7 @@ YQ YQ bO Xw -aj +Tb Xw Xw Xw @@ -3158,7 +3158,7 @@ YQ YQ YQ Xw -aa +aj yn Xw bO @@ -3174,10 +3174,10 @@ YQ YQ YQ YQ -Qa -fk vN -Qa +aa +ys +vN YQ YQ YQ @@ -3191,10 +3191,10 @@ YQ YQ YQ YQ -Qa -Hp -nl -Qa +vN +Ig +Mb +vN YQ YQ YQ @@ -3208,10 +3208,10 @@ YQ YQ YQ YQ -Qa -ER -ER -Qa +vN +tJ +tJ +vN YQ YQ YQ From 37e97b8265db1ff3cb5d46294c03bf6883498e59 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:49:06 +0200 Subject: [PATCH 13/49] no stimpacks --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 550 +++++++++--------- 1 file changed, 274 insertions(+), 276 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index b21f964d1665..09aae5cd559f 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -163,19 +163,6 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"cE" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = -7 - }, -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/grey, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave, -/area/ship/crew/dorm) "cL" = ( /obj/effect/turf_decal/corner/opaque/white/half{ dir = 4 @@ -303,8 +290,6 @@ /obj/item/storage/firstaid/regular, /obj/item/roller, /obj/item/reagent_containers/hypospray/medipen/morphine, -/obj/item/reagent_containers/hypospray/medipen/survival, -/obj/item/reagent_containers/hypospray/medipen/survival, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -342,24 +327,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - dir = 8; - c_tag = "Hallway" - }, -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/crew) -"fO" = ( /obj/structure/bed, /obj/item/bedsheet/syndie, /obj/machinery/power/apc/auto_name/directional/north, @@ -369,6 +336,20 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) +"fr" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 6 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#555555" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "gj" = ( /obj/machinery/light/directional/north, /obj/structure/closet/crate/secure/science{ @@ -410,6 +391,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"gR" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "hr" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; @@ -796,6 +785,10 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) +"oF" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "oN" = ( /obj/structure/railing, /obj/machinery/door/firedoor/border_only, @@ -821,7 +814,7 @@ }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) -"py" = ( +"pe" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 1 }, @@ -1201,18 +1194,26 @@ }, /area/ship/engineering) "tJ" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kansatsu_observation" +/obj/structure/chair/office, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/white, /area/ship/bridge) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) +"un" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "uq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1277,6 +1278,24 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/bridge) +"wm" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Observation Deck"; + req_access_txt = "19" + }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_lockdown"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) "xf" = ( /obj/effect/turf_decal/box/white, /obj/machinery/light/directional/west, @@ -1308,24 +1327,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/tech, /area/ship/bridge) -"ys" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"yt" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch{ - name = "Command Quarters"; - req_access_txt = "19" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm/dormtwo) "yw" = ( /obj/structure/chair/bench/red/directional/east, /obj/structure/railing, @@ -1409,17 +1410,20 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 2 +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 }, -/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ - pixel_x = 12; - pixel_y = 7 +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Fore-Port" }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/white, +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + }, +/turf/open/floor/plating/airless, /area/ship/bridge) "Ap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -1448,6 +1452,20 @@ color = "#777777" }, /area/ship/engineering) +"BQ" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Command Quarters"; + req_access_txt = "19" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm/dormtwo) "BS" = ( /obj/structure/chair/bench/red/directional/east, /turf/open/floor/plasteel/tech, @@ -1460,6 +1478,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"CF" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/bridge) "CP" = ( /obj/item/kirbyplants/fullysynthetic{ pixel_y = 20 @@ -1489,6 +1517,21 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"Dh" = ( +/obj/structure/filingcabinet/double/grey, +/obj/item/folder/syndicate, +/obj/item/folder/red, +/obj/item/folder, +/obj/item/folder/white, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "DB" = ( /obj/machinery/light_switch{ pixel_y = -19; @@ -1555,11 +1598,16 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "FH" = ( -/obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 2 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, /area/ship/bridge) "FJ" = ( @@ -1637,13 +1685,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew) -"Hp" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4; - color = "#555555" - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "Hz" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1659,12 +1700,11 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Ig" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 7; - pixel_x = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + color = "#555555" }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/white, /area/ship/bridge) "ID" = ( /obj/machinery/button/door{ @@ -1691,13 +1731,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) -"Jg" = ( -/obj/machinery/blackbox_recorder, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "Jp" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp{ @@ -1739,6 +1772,32 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew/dorm) +"JE" = ( +/obj/structure/table/glass, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/machinery/camera{ + dir = 2; + c_tag = "Cryogenics" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) "JI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/white, @@ -1779,19 +1838,6 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"Lq" = ( -/obj/machinery/computer/security{ - icon_state = "computer-right"; - icon_keyboard = "syndie_key" - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/structure/sign/poster/contraband/cybersun{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "Lr" = ( /obj/structure/toilet{ pixel_y = 15; @@ -1823,15 +1869,8 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Mb" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_x = 6; - pixel_y = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm/dormtwo) "Mn" = ( /obj/machinery/computer/cargo{ dir = 8; @@ -1864,6 +1903,24 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) +"MS" = ( +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" + }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) "No" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 8 @@ -1973,21 +2030,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/bridge) -"OB" = ( -/obj/structure/filingcabinet/double/grey, -/obj/item/folder/syndicate, -/obj/item/folder/red, -/obj/item/folder, -/obj/item/folder/white, -/obj/item/clipboard, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "OD" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 4 @@ -2041,31 +2083,43 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Qa" = ( -/obj/structure/table/glass, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Command Wardrobe"; + icon_state = "sec_wall"; + req_access_txt = "19" }, -/obj/item/radio{ - pixel_y = 6 +/obj/machinery/newscaster/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -10 }, -/obj/item/radio{ - pixel_y = 6 +/obj/machinery/camera{ + dir = 4; + c_tag = "Command Quarters" }, -/obj/item/radio{ - pixel_y = 6 +/obj/structure/cable/orange{ + icon_state = "2-4" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/obj/machinery/camera{ - dir = 2; - c_tag = "Cryogenics" +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "Ql" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; @@ -2283,37 +2337,11 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "SL" = ( -/obj/effect/turf_decal/corner/opaque/white/half, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/white, -/area/ship/crew) -"Tb" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Observation Deck"; - req_access_txt = "19" - }, -/obj/machinery/door/poddoor/shutters{ - id = "kansatsu_lockdown"; - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Tv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -2344,21 +2372,20 @@ }, /area/ship/engineering) "Ur" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Exterior - Fore-Port" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5; - pixel_y = -4; - pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/open/floor/plating/airless, -/area/ship/bridge) +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/crew) "UE" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -2512,20 +2539,6 @@ "Xw" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) -"XI" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax/syndicate{ - pixel_y = 6 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 2; - color = "#555555" - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "XJ" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 @@ -2540,19 +2553,18 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "XX" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#555555" +/obj/machinery/computer/security{ + icon_state = "computer-right"; + icon_keyboard = "syndie_key" }, -/obj/machinery/power/terminal{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/cable/orange{ - icon_state = "0-4" +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = 32 }, -/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, -/area/ship/engineering) +/area/ship/bridge) "YE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -2602,43 +2614,19 @@ /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - name = "Command Wardrobe"; - icon_state = "sec_wall"; - req_access_txt = "19" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -10 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Command Quarters" +/obj/machinery/power/terminal{ + dir = 8 }, /obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 - }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 + icon_state = "0-4" }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm/dormtwo) +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/white, +/area/ship/engineering) "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -2647,8 +2635,18 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "ZI" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm/dormtwo) +/obj/machinery/firealarm/directional/east{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = -7 + }, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "ZQ" = ( /obj/machinery/camera{ dir = 1; @@ -2714,7 +2712,7 @@ XJ YG Nu Va -XX +Zs jH NW yl @@ -2836,7 +2834,7 @@ Fw BS yw IJ -SL +Ur cZ cw zY @@ -2975,7 +2973,7 @@ IJ mD qo sR -cE +ZI qo YQ YQ @@ -2985,9 +2983,9 @@ YQ YQ YQ YQ -ZI +Mb ty -ZI +Mb dA oC qo @@ -3002,10 +3000,10 @@ YQ YQ YQ YQ -ZI -Zs -yt -fk +Mb +Qa +BQ +MS GG qo lh @@ -3019,13 +3017,13 @@ YQ YQ YQ YQ -ZI -fO -ZI +Mb +fk +Mb Xw aT Xw -Qa +JE qo qo YQ @@ -3036,9 +3034,9 @@ YQ YQ YQ YQ -ZI -ZI -ZI +Mb +Mb +Mb DL DB Xw @@ -3070,12 +3068,12 @@ YQ YQ YQ YQ -Ur +Ah Xw -Lq +XX JI uq -py +pe UE Xw YQ @@ -3089,7 +3087,7 @@ YQ YQ YQ Xw -Jg +SL Rz FJ Mn @@ -3106,10 +3104,10 @@ YQ YQ YQ Xw -OB +Dh QO +tJ FH -Ah Xw bO YQ @@ -3123,8 +3121,8 @@ YQ YQ YQ Xw -XI -Hp +fr +Ig Qy dZ Xw @@ -3141,7 +3139,7 @@ YQ YQ bO Xw -Tb +wm Xw Xw Xw @@ -3176,7 +3174,7 @@ YQ YQ vN aa -ys +oF vN YQ YQ @@ -3192,8 +3190,8 @@ YQ YQ YQ vN -Ig -Mb +gR +un vN YQ YQ @@ -3209,8 +3207,8 @@ YQ YQ YQ vN -tJ -tJ +CF +CF vN YQ YQ From c2e815f12d4dc11aaaf0719b42b05fbc763e332a Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 18:12:49 +0200 Subject: [PATCH 14/49] buttons, access --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 632 +++++++++--------- 1 file changed, 329 insertions(+), 303 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 09aae5cd559f..e4efa39cd434 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1,9 +1,21 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/chair/office/light{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/tech, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Observation Deck"; + req_access_txt = "19" + }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_lockdown"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "ah" = ( /obj/effect/turf_decal/industrial/warning{ @@ -16,21 +28,14 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "aj" = ( -/obj/machinery/button/door{ - id = "kansatsu_observation"; - name = "Bridge Blast Doors"; - dir = 2; - pixel_y = 20; - pixel_x = 6 - }, -/obj/machinery/button/door{ - id = "kansatsu_lockdown"; - name = "Observation Lockdown"; - dir = 2; - pixel_y = 20; - pixel_x = -6 +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kansatsu_observation" }, -/turf/open/floor/plasteel/tech, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, /area/ship/bridge) "aQ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -327,29 +332,39 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-8" +/obj/machinery/button/door{ + id = "kansatsu_observation"; + name = "Observation Windows"; + dir = 2; + pixel_y = 20; + pixel_x = 6; + req_access_txt = "19" }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm/dormtwo) -"fr" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax/syndicate{ - pixel_y = 6 +/obj/machinery/button/door{ + id = "kansatsu_lockdown"; + name = "Observation Lockdown"; + dir = 2; + pixel_y = 20; + pixel_x = -6; + req_access_txt = "19" }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"fC" = ( +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 2; - color = "#555555" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/white, -/area/ship/bridge) +/area/ship/crew) "gj" = ( /obj/machinery/light/directional/north, /obj/structure/closet/crate/secure/science{ @@ -391,14 +406,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"gR" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 7; - pixel_x = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) "hr" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; @@ -424,6 +431,11 @@ cleanspeed = 20 }, /obj/machinery/light/small/directional/south, +/obj/machinery/camera{ + dir = 4; + c_tag = "Bathroom"; + layer = 3.39 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "if" = ( @@ -601,6 +613,16 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew) +"kd" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "km" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8; @@ -785,10 +807,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) -"oF" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) "oN" = ( /obj/structure/railing, /obj/machinery/door/firedoor/border_only, @@ -814,12 +832,6 @@ }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) -"pe" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/turf/open/floor/plasteel/patterned/brushed, -/area/ship/bridge) "pE" = ( /obj/effect/turf_decal/corner_techfloor_grid{ dir = 5 @@ -901,12 +913,16 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 4 }, -/obj/structure/closet/emcloset/wall/directional/north{ - populate = 0 +/obj/machinery/button/door{ + id = "kansatsu_bathroom"; + name = "Door Lockdown Override"; + dir = 2; + pixel_y = 20; + pixel_x = 7; + normaldoorcontrol = 1; + specialfunctions = 4; + req_access_txt = "19" }, -/obj/item/storage/toolbox/emergency, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/white, /area/ship/crew) "qo" = ( @@ -978,6 +994,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/white, /area/ship/crew) "re" = ( @@ -1090,6 +1107,12 @@ color = "#777777" }, /area/ship/security/armory) +"th" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/bridge) "tk" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 4 @@ -1110,6 +1133,19 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) +"tm" = ( +/obj/machinery/firealarm/directional/east{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = -7 + }, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "tv" = ( /obj/item/storage/pistolcase/stechkin, /obj/item/storage/pistolcase/stechkin, @@ -1194,26 +1230,68 @@ }, /area/ship/engineering) "tJ" = ( -/obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"tO" = ( +/obj/structure/filingcabinet/double/grey, +/obj/item/folder/syndicate, +/obj/item/folder/red, +/obj/item/folder, +/obj/item/folder/white, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, /turf/open/floor/plasteel/white, /area/ship/bridge) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) -"un" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ +"uj" = ( +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Command Wardrobe"; + icon_state = "sec_wall"; + req_access_txt = "19" + }, +/obj/machinery/newscaster/directional/west, +/obj/machinery/light_switch{ dir = 4; - pixel_x = 6; - pixel_y = 1 + pixel_x = -20; + pixel_y = -10 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) +/obj/machinery/camera{ + dir = 4; + c_tag = "Command Quarters" + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "uq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1235,8 +1313,19 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/closet/emcloset/wall/directional/north{ + populate = 0; + pixel_x = 3 + }, +/obj/item/storage/toolbox/emergency, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/white, /area/ship/crew) +"vB" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "vK" = ( /obj/effect/turf_decal/corner/opaque/white/half, /obj/effect/turf_decal/trimline/opaque/syndiered/line, @@ -1278,23 +1367,12 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/bridge) -"wm" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ +"wz" = ( +/obj/effect/turf_decal/industrial/warning{ dir = 4; - name = "Observation Deck"; - req_access_txt = "19" - }, -/obj/machinery/door/poddoor/shutters{ - id = "kansatsu_lockdown"; - dir = 4 + color = "#555555" }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plasteel/white, /area/ship/bridge) "xf" = ( /obj/effect/turf_decal/box/white, @@ -1410,21 +1488,31 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 +/obj/structure/table/glass, +/obj/item/radio{ + pixel_y = 6 }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Exterior - Fore-Port" +/obj/item/radio{ + pixel_y = 6 }, -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5; - pixel_y = -4; - pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." +/obj/item/radio{ + pixel_y = 6 }, -/turf/open/floor/plating/airless, -/area/ship/bridge) +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/machinery/camera{ + dir = 2; + c_tag = "Cryogenics" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) "Ap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -1435,7 +1523,7 @@ /area/ship/security/armory) "AM" = ( /obj/machinery/door/airlock/grunge{ - name = "Bathroom" + name = "kansatsu_bathroom" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1452,20 +1540,6 @@ color = "#777777" }, /area/ship/engineering) -"BQ" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch{ - name = "Command Quarters"; - req_access_txt = "19" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm/dormtwo) "BS" = ( /obj/structure/chair/bench/red/directional/east, /turf/open/floor/plasteel/tech, @@ -1478,21 +1552,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"CF" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kansatsu_observation" - }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/bridge) "CP" = ( /obj/item/kirbyplants/fullysynthetic{ pixel_y = 20 }, -/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew) "CR" = ( @@ -1517,21 +1580,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) -"Dh" = ( -/obj/structure/filingcabinet/double/grey, -/obj/item/folder/syndicate, -/obj/item/folder/red, -/obj/item/folder, -/obj/item/folder/white, -/obj/item/clipboard, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "DB" = ( /obj/machinery/light_switch{ pixel_y = -19; @@ -1700,11 +1748,20 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Ig" = ( -/obj/effect/turf_decal/industrial/warning{ +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 + }, +/obj/machinery/camera{ dir = 4; - color = "#555555" + c_tag = "Exterior - Fore-Port" }, -/turf/open/floor/plasteel/white, +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + }, +/turf/open/floor/plating/airless, /area/ship/bridge) "ID" = ( /obj/machinery/button/door{ @@ -1772,32 +1829,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew/dorm) -"JE" = ( -/obj/structure/table/glass, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 - }, -/obj/machinery/camera{ - dir = 2; - c_tag = "Cryogenics" - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) "JI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/white, @@ -1856,21 +1887,30 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 8 }, -/obj/machinery/camera{ - dir = 6; - c_tag = "Bathroom"; - pixel_x = -4 - }, /obj/machinery/light_switch{ dir = 8; pixel_x = 20; pixel_y = -10 }, +/obj/machinery/button/door{ + id = "kansatsu_bathroom"; + name = "Door Lockdown"; + dir = 2; + pixel_y = 20; + pixel_x = 9; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Mb" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm/dormtwo) +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "Mn" = ( /obj/machinery/computer/cargo{ dir = 8; @@ -1903,24 +1943,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) -"MS" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - dir = 8; - c_tag = "Hallway" - }, -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/crew) "No" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 8 @@ -2083,43 +2105,18 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Qa" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - name = "Command Wardrobe"; - icon_state = "sec_wall"; - req_access_txt = "19" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -10 - }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Command Quarters" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" +/obj/machinery/computer/security{ + icon_state = "computer-right"; + icon_keyboard = "syndie_key" }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = 32 }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm/dormtwo) +/turf/open/floor/plasteel/white, +/area/ship/bridge) "Ql" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; @@ -2142,7 +2139,8 @@ name = "Observation Lockdown"; dir = 8; pixel_x = 20; - pixel_y = 6 + pixel_y = 6; + req_access_txt = "19" }, /obj/effect/turf_decal/industrial/warning/corner{ dir = 4; @@ -2163,6 +2161,20 @@ }, /turf/open/floor/plasteel/white, /area/ship/bridge) +"QL" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Command Quarters"; + req_access_txt = "19" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm/dormtwo) "QN" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/kansatsu_missions{ @@ -2337,11 +2349,24 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "SL" = ( -/obj/machinery/blackbox_recorder, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, +/area/ship/engineering) +"ST" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, /area/ship/bridge) "Tv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -2372,20 +2397,19 @@ }, /area/ship/engineering) "Ur" = ( -/obj/effect/turf_decal/corner/opaque/white/half, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#555555" }, -/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/white, -/area/ship/crew) +/area/ship/bridge) "UE" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -2536,6 +2560,19 @@ }, /turf/open/floor/plasteel/white, /area/ship/bridge) +"Xr" = ( +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -7 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "Xw" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) @@ -2553,18 +2590,23 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "XX" = ( -/obj/machinery/computer/security{ - icon_state = "computer-right"; - icon_keyboard = "syndie_key" +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 }, -/obj/structure/sign/poster/contraband/cybersun{ - pixel_y = 32 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/cable/orange{ + icon_state = "1-2" }, /turf/open/floor/plasteel/white, -/area/ship/bridge) +/area/ship/crew) "YE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -2614,19 +2656,13 @@ /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#555555" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "0-4" +/obj/structure/chair/office, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, /turf/open/floor/plasteel/white, -/area/ship/engineering) +/area/ship/bridge) "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -2635,18 +2671,8 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "ZI" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = -7 - }, -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/grey, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave, -/area/ship/crew/dorm) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm/dormtwo) "ZQ" = ( /obj/machinery/camera{ dir = 1; @@ -2712,7 +2738,7 @@ XJ YG Nu Va -Zs +SL jH NW yl @@ -2834,7 +2860,7 @@ Fw BS yw IJ -Ur +qS cZ cw zY @@ -2885,7 +2911,7 @@ Tv rR qA IJ -qS +fC cZ yH zO @@ -2973,7 +2999,7 @@ IJ mD qo sR -ZI +tm qo YQ YQ @@ -2983,9 +3009,9 @@ YQ YQ YQ YQ -Mb +ZI ty -Mb +ZI dA oC qo @@ -3000,10 +3026,10 @@ YQ YQ YQ YQ -Mb -Qa -BQ -MS +ZI +uj +QL +XX GG qo lh @@ -3017,13 +3043,13 @@ YQ YQ YQ YQ -Mb -fk -Mb +ZI +Xr +ZI Xw aT Xw -JE +Ah qo qo YQ @@ -3034,9 +3060,9 @@ YQ YQ YQ YQ -Mb -Mb -Mb +ZI +ZI +ZI DL DB Xw @@ -3068,12 +3094,12 @@ YQ YQ YQ YQ -Ah +Ig Xw -XX +Qa JI uq -pe +th UE Xw YQ @@ -3087,7 +3113,7 @@ YQ YQ YQ Xw -SL +tJ Rz FJ Mn @@ -3104,9 +3130,9 @@ YQ YQ YQ Xw -Dh +tO QO -tJ +Zs FH Xw bO @@ -3121,8 +3147,8 @@ YQ YQ YQ Xw -fr -Ig +Ur +wz Qy dZ Xw @@ -3139,7 +3165,7 @@ YQ YQ bO Xw -wm +aa Xw Xw Xw @@ -3156,7 +3182,7 @@ YQ YQ YQ Xw -aj +fk yn Xw bO @@ -3173,8 +3199,8 @@ YQ YQ YQ vN -aa -oF +ST +vB vN YQ YQ @@ -3190,8 +3216,8 @@ YQ YQ YQ vN -gR -un +Mb +kd vN YQ YQ @@ -3207,8 +3233,8 @@ YQ YQ YQ vN -CF -CF +aj +aj vN YQ YQ From cca61a63b633294f085c3cf43a2aed20c35e3ca4 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 18:17:28 +0200 Subject: [PATCH 15/49] desc --- code/modules/paperwork/folders_premade.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm index 5699d1b6c3fd..17cd61602ba9 100644 --- a/code/modules/paperwork/folders_premade.dm +++ b/code/modules/paperwork/folders_premade.dm @@ -44,6 +44,7 @@ /obj/item/folder/documents/syndicate/cybersun document = /obj/item/documents/syndicate/cybersun icon_state = "folder_sred" + desc = "A folder stamped \"Top Secret - Property of The Cybersun.\"" /obj/item/folder/documents/syndicate/red document = /obj/item/documents/syndicate/red From 9034a510d36ea2a900392ef128a17c0b038706ce Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 18:20:58 +0200 Subject: [PATCH 16/49] intel director --- .../shuttles/syndicate_cybersun_kansatsu.dm | 22 +++++++++---------- .../clothing/outfits/factions/syndicate.dm | 5 ----- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 6f67f9d5f110..e24f9f937380 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -1,10 +1,10 @@ -/datum/preset_holoimage/cybersun_intel_officer +/datum/preset_holoimage/cybersun_intel_director species_type = /datum/species/ipc - outfit_type = /datum/outfit/job/syndicate/head_of_personnel/cybersun/hologram + outfit_type = /datum/outfit/job/syndicate/captain/cybersun /obj/item/disk/holodisk/kansatsu/mission desc = "A classified holodisk containing a mission for the Cybersun Industries Intelligence Division." - preset_image_type = /datum/preset_holoimage/cybersun_intel_officer + preset_image_type = /datum/preset_holoimage/cybersun_intel_director /obj/item/disk/holodisk/kansatsu/mission/New(obj/L) ..() @@ -14,7 +14,7 @@ /obj/item/disk/holodisk/kansatsu/mission/safety name = "\improper IG-I-296" // Information Gathering - Infiltration - Random Number preset_record_text = {" - NAME Intelligence Officer Torch-3 + NAME Intelligence Director Torch-3 SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. DELAY 40 SAY You must gather information about the safety measures on board. You are to look for any potential flaws and exploits. @@ -30,7 +30,7 @@ /obj/item/disk/holodisk/kansatsu/mission/crew name = "\improper IG-I-138" // Information Gathering - Infiltration - Random Number preset_record_text = {" - NAME Intelligence Officer Torch-3 + NAME Intelligence Director Torch-3 SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. DELAY 40 SAY You must profile five members of the crew. Their profile must include credentials, habits and skills. Any further information is optional, but advised. @@ -46,7 +46,7 @@ /obj/item/disk/holodisk/kansatsu/mission/valueables name = "\improper IG-I-271" // Information Gathering - Infiltration - Random Number preset_record_text = {" - NAME Intelligence Officer Torch-3 + NAME Intelligence Director Torch-3 SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. DELAY 40 SAY On board, you must locate and catalogue all the objects of value. You may not seize them, unless you are tasked to by another mission. @@ -62,7 +62,7 @@ /obj/item/disk/holodisk/kansatsu/mission/ruins name = "\improper IG-S-290" // Information Gathering - Scouting - Random Number preset_record_text = {" - NAME Intelligence Officer Torch-3 + NAME Intelligence Director Torch-3 SAY Agents. Your vessel has been assigned a mission to scout your current sector. DELAY 40 SAY You are to locate war-era derelicts. You must explore them and take note of all the relevant details. @@ -76,7 +76,7 @@ /obj/item/disk/holodisk/kansatsu/mission/documents name = "\improper E-019" // Extraction - Random Number preset_record_text = {" - NAME Intelligence Officer Torch-3 + NAME Intelligence Director Torch-3 SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us. DELAY 40 SAY To be precise, you are after a bundle of classified documents. @@ -90,7 +90,7 @@ /obj/item/disk/holodisk/kansatsu/mission/pet name = "\improper E-271" // Extraction - Random Number preset_record_text = {" - NAME Intelligence Officer Torch-3 + NAME Intelligence Director Torch-3 SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us. DELAY 40 SAY To be precise, you are after a domesticated animal. The cutest you can possibly find. @@ -104,7 +104,7 @@ /obj/item/disk/holodisk/kansatsu/mission/training name = "\improper TO-23" // Training Operation - Random Number preset_record_text = {" - NAME Intelligence Officer Torch-3 + NAME Intelligence Director Torch-3 SAY Agents. Your vessel has been assigned a mission to perform a training operation. DELAY 40 SAY You are to organize a training mission for the junior agents assigned to your crew. @@ -118,7 +118,7 @@ /obj/item/disk/holodisk/kansatsu/mission/anomalies name = "\improper RD-166" // Research Division - Random Number preset_record_text = {" - NAME Intelligence Officer Torch-3 + NAME Intelligence Director Torch-3 SAY Agents. Your vessel has been assigned a mission to assist our research department. DELAY 40 SAY You are to collect at least four anomaly cores. diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index bd7be315d805..0255dbad94e8 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -535,11 +535,6 @@ r_pocket = /obj/item/kitchen/knife/switchblade glasses = /obj/item/clothing/glasses/sunglasses -/datum/outfit/job/syndicate/head_of_personnel/cybersun/hologram - name = "Syndicate - Intelligence Officer (Cybersun, Hologram)" // Used for the holodisks on the Kansatsu. - - mask = /obj/item/clothing/mask/gas/syndicate // Secrecy is Kansatsu's gimmick. - /datum/outfit/job/syndicate/head_of_personnel/suns name = "Syndicate - Academic Staff (SUNS)" id_assignment = "Academic Staff" From a2b5514f362547598aa9d1616cda630a5e904e15 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 21:51:07 +0200 Subject: [PATCH 17/49] okay --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 605 +++++++++--------- code/game/objects/items/storage/guncases.dm | 6 + code/modules/cargo/packs/ammo.dm | 8 + .../boxes_magazines/external/pistol.dm | 3 + .../projectiles/guns/ballistic/pistol.dm | 2 + 5 files changed, 339 insertions(+), 285 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index e4efa39cd434..25c6c6fcc660 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -39,7 +39,7 @@ /area/ship/bridge) "aQ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security/armory) +/area/ship/storage) "aT" = ( /obj/effect/turf_decal/siding/wood/end{ dir = 8; @@ -84,13 +84,7 @@ dir = 8; c_tag = "Engineering" }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/syndicate/black/engie, -/obj/item/clothing/head/helmet/space/syndicate/black/engie{ - name = "black engineering space helmet" - }, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/shoes/magboots/syndie, +/obj/machinery/autolathe, /turf/open/floor/plasteel/white, /area/ship/engineering) "bI" = ( @@ -102,9 +96,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/turf/open/floor/plasteel/patterned/grid{ - color = "#777777" - }, +/turf/open/floor/plating, /area/ship/engineering) "bO" = ( /turf/closed/wall/mineral/plastitanium, @@ -166,6 +158,19 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 4 }, +/obj/structure/closet/crate{ + name = "office supplies crate" + }, +/obj/item/tape/random, +/obj/item/tape/random, +/obj/item/tape/random, +/obj/item/tape/random, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/toner/extreme, +/obj/item/toner/extreme, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "cL" = ( @@ -242,6 +247,10 @@ pixel_x = -7; list_reagents = list(/datum/reagent/consumable/tomatojuice = 15) }, +/obj/item/reagent_containers/food/drinks/dry_ramen{ + pixel_x = 7; + list_reagents = null + }, /turf/open/floor/plasteel/tech, /area/ship/crew) "dA" = ( @@ -264,9 +273,14 @@ /obj/structure/table/glass, /obj/item/reagent_containers/food/drinks/bottle/wine{ pixel_y = 7; - pixel_x = -4 + pixel_x = -9 }, /obj/machinery/airalarm/directional/south, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = 6 + }, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/white, /area/ship/bridge) "ej" = ( @@ -367,6 +381,12 @@ /area/ship/crew) "gj" = ( /obj/machinery/light/directional/north, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, /obj/structure/closet/crate/secure/science{ req_access_txt = "19"; anchored = 1 @@ -378,16 +398,10 @@ /obj/item/clothing/accessory/holster/chameleon, /obj/item/clothing/accessory/holster/chameleon, /obj/item/disk/holodisk/kansatsu/gear/chameleon, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, -/area/ship/security/armory) +/area/ship/storage) "gP" = ( /obj/effect/turf_decal/industrial/warning{ dir = 2; @@ -403,7 +417,6 @@ /obj/item/tank/internals/oxygen/red, /obj/item/tank/internals/oxygen/red, /obj/item/tank/internals/oxygen/red, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "hr" = ( @@ -456,22 +469,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"ii" = ( -/obj/machinery/autolathe, -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 19; - pixel_y = -12 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/engineering) "im" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; @@ -486,9 +483,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/plasteel/patterned/grid{ - color = "#777777" - }, +/turf/open/floor/plating, /area/ship/engineering) "in" = ( /obj/structure/table/chem{ @@ -497,9 +492,6 @@ /obj/machinery/microwave{ pixel_y = 6 }, -/obj/structure/sign/poster/contraband/cybersun{ - pixel_y = 32 - }, /turf/open/floor/plasteel/dark, /area/ship/crew) "iL" = ( @@ -542,32 +534,14 @@ device_theme = "syndicate" }, /obj/item/disk/holodisk/kansatsu/gear/tablets, -/obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"iY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/rack, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/obj/item/stack/sheet/plastic/five, -/obj/item/stack/sheet/glass/twenty, -/obj/item/stack/sheet/metal/twenty, -/obj/structure/railing{ - dir = 8; - layer = 2.91 - }, -/turf/open/floor/plasteel/white, -/area/ship/engineering) "jj" = ( -/obj/machinery/power/ship_gravity, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/shoes/magboots/syndie, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -640,9 +614,7 @@ req_one_access = list(11, 19) }, /obj/item/stack/sheet/mineral/diamond/five, -/turf/open/floor/plasteel/patterned/grid{ - color = "#777777" - }, +/turf/open/floor/plating, /area/ship/engineering) "kL" = ( /obj/structure/chair/bench/red/directional/west, @@ -661,36 +633,39 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "lJ" = ( -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "A comfy-looking snake bed. There's bits of shed scales stuck in the bedding."; - name = "snake bed" - }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 10 }, -/mob/living/simple_animal/hostile/retaliate/poison/snake{ - icon = 'icons/mob/pets.dmi'; - icon_dead = "bookworm_dead"; - icon_living = "bookworm"; - icon_state = "bookworm"; - name = "Agent Berry"; - desc = "A red, slithery snake. This one is trained in corporate espionage. Allegedly, at least." - }, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/orange, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "tac"; + name = "Captain's Locker"; + req_access_txt = "20" + }, +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/armor/vest/capcarapace/cybersun, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "lP" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1; - color = "#FFFFFF" - }, /obj/structure/chair/office/light{ dir = 4 }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#FFFFFF" + }, /obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" @@ -752,6 +727,14 @@ color = "#000000"; dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/light_switch{ + pixel_x = 12; + pixel_y = 19 + }, /turf/open/floor/plasteel/white, /area/ship/engineering) "nA" = ( @@ -865,11 +848,25 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) +"pY" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/white, +/area/ship/engineering) "qa" = ( /obj/structure/closet/secure_closet/wall/directional/south{ name = "Engineer's Locker"; icon_state = "sec_wall"; - req_access_txt = "11" + req_one_access = list(11, 19) }, /obj/item/storage/backpack/security, /obj/item/storage/backpack/messenger/sec, @@ -881,12 +878,13 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/head/soft/cybersun, /obj/item/clothing/glasses/meson/engine, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 8 - }, /obj/item/clothing/glasses/welding, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#FFFFFF" + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" @@ -967,6 +965,28 @@ }, /turf/open/floor/plating/airless, /area/ship/external/dark) +"qM" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = 8 + }, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/pen/fourcolor, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, +/area/ship/storage) "qR" = ( /obj/machinery/door/airlock/hatch{ name = "Dormitory" @@ -1015,7 +1035,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, /obj/structure/catwalk/over/plated_catwalk/white, /turf/open/floor/plating, /area/ship/engineering) @@ -1037,6 +1062,7 @@ dir = 4 }, /obj/effect/decal/cleanable/oil/streak, +/obj/machinery/light/directional/north, /turf/open/floor/plasteel/white, /area/ship/engineering) "rF" = ( @@ -1050,22 +1076,54 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "so" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 9; - color = "#FFFFFF" - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 8 - }, /obj/structure/sink/kitchen{ pixel_y = 16; layer = 3.09; name = "large sink" }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 9; + color = "#FFFFFF" + }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, /area/ship/engineering) +"sF" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 10 + }, +/obj/machinery/firealarm/directional/east, +/obj/item/clipboard{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/machinery/camera{ + dir = 1; + c_tag = "Armory" + }, +/obj/item/reagent_containers/food/drinks/mug{ + pixel_y = 10; + pixel_x = 9; + list_reagents = list(/datum/reagent/consumable/icecoffee = 30) + }, +/obj/item/stamp/cybersun{ + pixel_x = 9; + pixel_y = 0 + }, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, +/area/ship/storage) "sR" = ( /obj/structure/closet/wall/directional/north{ name = "Agent Wardrobe" @@ -1090,23 +1148,30 @@ /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) "sZ" = ( -/obj/structure/filingcabinet/double{ - pixel_y = 17; - density = 0 - }, /obj/machinery/airalarm/directional/east, -/obj/item/folder/syndicate, -/obj/item/clipboard, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Intelligence Officer's Locker"; + icon_state = "sec_wall"; + req_access_txt = "19" + }, +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/glasses/sunglasses, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/gloves/krav_maga/combatglovesplus, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, -/area/ship/security/armory) +/area/ship/storage) "th" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 1 @@ -1147,48 +1212,38 @@ /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) "tv" = ( -/obj/item/storage/pistolcase/stechkin, -/obj/item/storage/pistolcase/stechkin, -/obj/item/ammo_box/c10mm{ - pixel_y = 7; - pixel_x = -3 - }, -/obj/item/ammo_box/c10mm{ - pixel_y = 5 - }, -/obj/item/ammo_box/c10mm/rubbershot{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/attachment/silencer{ - pixel_x = -3 - }, -/obj/item/attachment/silencer{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/kitchen/knife/switchblade{ - pixel_x = -3 +/obj/structure/sign/poster/contraband/stechkin{ + pixel_x = -32 }, -/obj/item/kitchen/knife/switchblade{ - pixel_x = 7 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 }, /obj/structure/closet/secure_closet{ anchored = 1; icon_state = "syndicate"; - name = "firearm storage"; + name = "weapon storage"; req_access_txt = "19" }, -/obj/structure/sign/poster/contraband/stechkin{ - pixel_x = -32 +/obj/item/storage/pistolcase/himehabu, +/obj/item/storage/pistolcase/himehabu, +/obj/item/ammo_box/c22lr_box, +/obj/item/ammo_box/c22lr_box, +/obj/item/attachment/silencer{ + pixel_x = -8 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 4 +/obj/item/attachment/silencer{ + pixel_x = -8 + }, +/obj/item/pen/edagger{ + pixel_x = 4 + }, +/obj/item/pen/edagger{ + pixel_x = 4 }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, -/area/ship/security/armory) +/area/ship/storage) "ty" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 8 @@ -1230,37 +1285,34 @@ }, /area/ship/engineering) "tJ" = ( -/obj/machinery/blackbox_recorder, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"tO" = ( /obj/structure/filingcabinet/double/grey, /obj/item/folder/syndicate, -/obj/item/folder/red, /obj/item/folder, +/obj/item/folder/red, /obj/item/folder/white, -/obj/item/clipboard, +/obj/item/disk/holodisk, +/obj/item/disk/holodisk, +/obj/item/disk/holodisk, /obj/item/pen/fourcolor, /obj/item/pen/fourcolor, /obj/item/pen/fourcolor, +/obj/item/clipboard, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"tO" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/machinery/photocopier, /turf/open/floor/plasteel/white, /area/ship/bridge) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) "uj" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - name = "Command Wardrobe"; - icon_state = "sec_wall"; - req_access_txt = "19" - }, -/obj/machinery/newscaster/directional/west, /obj/machinery/light_switch{ dir = 4; pixel_x = -20; @@ -1270,26 +1322,10 @@ dir = 4; c_tag = "Command Quarters" }, +/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 - }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 + icon_state = "0-2" }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "uq" = ( @@ -1451,7 +1487,6 @@ pixel_y = 19 }, /obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/decal/cleanable/oil/streak, /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 1 }, @@ -1462,11 +1497,10 @@ pixel_y = -32 }, /obj/structure/cable/orange{ - icon_state = "4-9" - }, -/turf/open/floor/plasteel/patterned/grid{ - color = "#777777" + icon_state = "0-9" }, +/obj/machinery/power/ship_gravity, +/turf/open/floor/plating, /area/ship/engineering) "zO" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ @@ -1484,7 +1518,22 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/freezer{ + name = "fridge" + }, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/item/reagent_containers/food/drinks/dry_ramen, +/obj/item/reagent_containers/food/drinks/dry_ramen, +/obj/item/reagent_containers/food/drinks/dry_ramen, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( @@ -1520,10 +1569,11 @@ /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, -/area/ship/security/armory) +/area/ship/storage) "AM" = ( /obj/machinery/door/airlock/grunge{ - name = "kansatsu_bathroom" + name = "kansatsu_bathroom"; + id_tag = "kansatsu_bathroom" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1536,9 +1586,7 @@ dir = 1 }, /obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plasteel/patterned/grid{ - color = "#777777" - }, +/turf/open/floor/plating, /area/ship/engineering) "BS" = ( /obj/structure/chair/bench/red/directional/east, @@ -1549,7 +1597,6 @@ dir = 2; color = "#FFFFFF" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "CP" = ( @@ -1656,6 +1703,9 @@ pixel_y = 7 }, /obj/machinery/light/directional/south, +/obj/item/stamp/cybersun{ + pixel_x = 9 + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "FJ" = ( @@ -1676,15 +1726,10 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, /obj/structure/chair/handrail{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/catwalk/over/plated_catwalk/white, /turf/open/floor/plating, /area/ship/engineering) @@ -1938,11 +1983,11 @@ }, /obj/machinery/door/airlock/hatch{ dir = 4; - name = "Armory"; + name = "Secure Storage"; req_access_txt = "19" }, /turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) +/area/ship/storage) "No" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 8 @@ -1987,6 +2032,19 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/bed/dogbed{ + anchored = 1; + desc = "A comfy-looking snake bed. There's bits of shed scales stuck in the bedding."; + name = "snake bed" + }, +/mob/living/simple_animal/hostile/retaliate/poison/snake{ + icon = 'icons/mob/pets.dmi'; + icon_dead = "bookworm_dead"; + icon_living = "bookworm"; + icon_state = "bookworm"; + name = "Agent Berry"; + desc = "A red, slithery snake. This one is trained in corporate espionage. Allegedly, at least." + }, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "NW" = ( @@ -2005,6 +2063,9 @@ color = "#555555" }, /obj/effect/decal/cleanable/oil, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ship/engineering) "Od" = ( @@ -2123,9 +2184,7 @@ color = "#FFFFFF" }, /obj/effect/decal/cleanable/oil, -/turf/open/floor/plasteel/patterned/grid{ - color = "#777777" - }, +/turf/open/floor/plating, /area/ship/engineering) "Qx" = ( /obj/structure/sign/warning/docking{ @@ -2147,18 +2206,12 @@ color = "#555555" }, /obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_y = 4; - pixel_x = 6 - }, -/obj/item/stamp/cybersun{ - pixel_x = -6 - }, -/obj/item/pen/fourcolor, /obj/machinery/newscaster/directional/east{ pixel_y = -7 }, +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = 10 + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "QL" = ( @@ -2189,19 +2242,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/white, /area/ship/bridge) -"Ri" = ( -/obj/machinery/door/airlock/hatch{ - dir = 8; - name = "Engineering" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) "Rj" = ( /obj/effect/turf_decal/box/white, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -2227,33 +2267,45 @@ /turf/open/floor/plasteel/white, /area/ship/crew) "Rv" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, /obj/structure/closet/secure_closet{ anchored = 1; icon_state = "syndicate"; name = "equipment storage"; req_access_txt = "19" }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, /obj/item/storage/box/zipties, -/obj/item/camera, -/obj/item/camera, +/obj/item/camera{ + pictures_left = 20; + pictures_max = 20; + desc = "A polaroid camera upgraded by Cybersun Virtual Solutions." + }, +/obj/item/camera{ + pictures_left = 20; + pictures_max = 20; + desc = "A polaroid camera upgraded by Cybersun Virtual Solutions." + }, /obj/item/taperecorder, /obj/item/taperecorder, /obj/item/binoculars, /obj/item/binoculars, /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, +/obj/item/pen/sleepy, +/obj/item/pen/sleepy, +/obj/item/pen/survival, +/obj/item/pen/survival, /obj/item/storage/pill_bottle/cyanide, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 4 - }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, -/area/ship/security/armory) +/area/ship/storage) "Rz" = ( /turf/open/floor/plasteel/white, /area/ship/bridge) @@ -2279,16 +2331,11 @@ /obj/machinery/door/window/brigdoor/westleft{ req_access_txt = "19" }, -/obj/item/paper_bin{ - pixel_y = 4; - pixel_x = -2 - }, /obj/structure/window/plasma/reinforced{ dir = 1 }, -/obj/item/pen/fourcolor, /turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) +/area/ship/storage) "RY" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/orange{ @@ -2320,7 +2367,10 @@ icon_state = "0-4" }, /obj/structure/railing, -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/rack, +/obj/item/stack/sheet/glass/twenty, +/obj/item/stack/sheet/plastic/five, +/obj/item/stack/sheet/metal/twenty, /turf/open/floor/plasteel/white, /area/ship/engineering) "SH" = ( @@ -2328,9 +2378,7 @@ dir = 1; piping_layer = 2 }, -/turf/open/floor/plasteel/patterned/grid{ - color = "#777777" - }, +/turf/open/floor/plating, /area/ship/engineering) "SK" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ @@ -2392,9 +2440,7 @@ color = "#FFFFFF" }, /obj/structure/cable/white, -/turf/open/floor/plasteel/patterned/grid{ - color = "#777777" - }, +/turf/open/floor/plating, /area/ship/engineering) "Ur" = ( /obj/structure/table/reinforced, @@ -2477,33 +2523,22 @@ c_tag = "Briefing Room" }, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/box/white, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"VJ" = ( /obj/structure/table/chem{ name = "kitchen counter" }, /obj/structure/sink/chem{ name = "kitchen sink" }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"VJ" = ( -/obj/structure/table/chem{ - name = "kitchen counter" +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = 32 }, -/obj/item/reagent_containers/food/drinks/waterbottle, -/obj/item/reagent_containers/food/drinks/waterbottle, -/obj/item/reagent_containers/food/drinks/waterbottle, -/obj/item/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/item/reagent_containers/food/drinks/dry_ramen, -/obj/item/reagent_containers/food/drinks/dry_ramen, -/obj/item/reagent_containers/food/drinks/dry_ramen, -/obj/structure/closet/wall/white/directional/north{ - name = "Freezer" +/obj/item/trash/plate{ + pixel_y = 2; + pixel_x = 9 }, /turf/open/floor/plasteel/dark, /area/ship/crew) @@ -2511,9 +2546,6 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/curtain/cloth{ color = "#730622"; icon_state = "bathroom-closed"; @@ -2563,14 +2595,14 @@ "Xr" = ( /obj/structure/bed, /obj/item/bedsheet/black, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, /obj/machinery/firealarm/directional/south{ pixel_x = -7 }, /obj/machinery/light/small/directional/east, +/obj/machinery/newscaster/directional/north, +/obj/effect/spawner/lootdrop/plushie{ + pixel_y = 6 + }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "Xw" = ( @@ -2670,33 +2702,36 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, /area/ship/engineering) +"ZH" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 8; + name = "Engineering" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) "ZI" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/dorm/dormtwo) "ZQ" = ( -/obj/machinery/camera{ - dir = 1; - c_tag = "Armory" - }, -/obj/machinery/light_switch{ - pixel_y = -19; - dir = 1; - pixel_x = 11 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/structure/chair/office/light{ dir = 4 }, -/obj/machinery/firealarm/directional/south, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, -/area/ship/security/armory) +/area/ship/storage) (1,1,1) = {" uR @@ -2742,7 +2777,7 @@ SL jH NW yl -yl +pY Sx bI km @@ -2773,7 +2808,7 @@ aQ aQ aQ aQ -iY +Nu nu iL rF @@ -2789,8 +2824,8 @@ aQ gj tv Rv -aQ -ii +qM +Nu ru cL bn @@ -2806,9 +2841,9 @@ aQ sZ Ap ZQ -aQ +sF Nu -Ri +ZH yF Nu tE diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm index 77f6fe0ed651..9a59858fcdc5 100644 --- a/code/game/objects/items/storage/guncases.dm +++ b/code/game/objects/items/storage/guncases.dm @@ -120,6 +120,12 @@ new /obj/item/ammo_box/magazine/m10mm/empty(src) new /obj/item/ammo_box/magazine/m10mm/empty(src) +/obj/item/storage/pistolcase/himehabu +/obj/item/storage/pistolcase/himehabu/PopulateContents() + new /obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag(src) + new /obj/item/ammo_box/magazine/m22lr/empty(src) + new /obj/item/ammo_box/magazine/m22lr/empty(src) + /obj/item/storage/pistolcase/candor /obj/item/storage/pistolcase/candor/PopulateContents() new /obj/item/gun/ballistic/automatic/pistol/candor/no_mag(src) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index d790cbbdf650..1149081067a9 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -382,3 +382,11 @@ desc = "Contains a fifty-round box of .44 roumain hollow point ammo, great against unarmored targets." contains = list(/obj/item/ammo_box/a44roum/hp) cost = 500 + +/datum/supply_pack/ammo/c22lr + name = ".22lr Ammo Box Crate" + desc = "TODO" + contains = list(/obj/item/ammo_box/c22lr_box, + /obj/item/ammo_box/c22lr_box) + crate_name = "ammo crate" + cost = 250 diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 8a1792485715..be84c0098d0e 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -176,3 +176,6 @@ max_ammo = 10 w_class = WEIGHT_CLASS_TINY multiple_sprites = AMMO_BOX_PER_BULLET + +/obj/item/ammo_box/magazine/m22lr/empty + start_empty = TRUE diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index b2416462da39..1d03891afaa0 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -421,3 +421,5 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq) spread_unwielded = 0 wield_slowdown = 0 +/obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag + spawnwithmagazine = FALSE From d6d10a37f3e8d252c426b337eb138171c5521ab7 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 21:52:47 +0200 Subject: [PATCH 18/49] desc by bjarl --- _maps/configs/syndicate_cybersun_kansatsu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index 7b9b07be1876..472f81484843 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -7,7 +7,7 @@ "NATURAL_AGGRESSIVE" ], "map_name": "Kansatsu-class Scout Courier", - "description": "This aged poorly. Gotta make a new desc. Now, allow me to reach the minimum amount of symbols. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "description": "The Kansatsu-class Scout-Courier is a Cybersun retrofit of obsolete Scanmag-class Fast Couriers, a design dating back to the early 200s F.S. The ubiquity of the Scanmag-class has made them an easy purchase for Cybersun, who can retrofit, equip, and deploy the newly christened Kansatsu into the Frontier. The typical mission goal of a Kansatsu is reconnaissance of assets in a particular system. Their speed allows them to undertake a wide variety of ‘odd-jobs’, ranging from high speed pizza delivery (a favorite of certain cybersun officials), to orbital insertion of an operative. A standard crew is no less than 4 people, but depending on the mission - a Kansatsu can safely carry up to 7, although there’s no guarantee that it will be comfortable.", "tags": [ "Specialist" ], From a526bd30849513e40430783931d94a64d91783e9 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 21:55:54 +0200 Subject: [PATCH 19/49] cameras --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 25c6c6fcc660..6aec709ea0d0 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1109,7 +1109,7 @@ }, /obj/machinery/camera{ dir = 1; - c_tag = "Armory" + c_tag = "Secure Storage" }, /obj/item/reagent_containers/food/drinks/mug{ pixel_y = 10; @@ -1439,6 +1439,10 @@ /obj/item/binoculars, /obj/effect/turf_decal/trimline/opaque/syndiered/line, /obj/machinery/light/small/directional/south, +/obj/machinery/camera{ + dir = 10; + c_tag = "Observation Deck" + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "yw" = ( @@ -1659,6 +1663,10 @@ dir = 9 }, /obj/machinery/light/directional/west, +/obj/machinery/camera{ + dir = 6; + c_tag = "Bridge" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "DU" = ( @@ -1677,6 +1685,19 @@ }, /turf/open/floor/plating/airless, /area/ship/bridge) +"EB" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 8; + name = "Engineering" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) "EX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -2702,19 +2723,6 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, /area/ship/engineering) -"ZH" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/airlock/hatch{ - dir = 8; - name = "Engineering" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) "ZI" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/dorm/dormtwo) @@ -2843,7 +2851,7 @@ Ap ZQ sF Nu -ZH +EB yF Nu tE From 4763bdc065fea98203b16bb90c5b203cb928dec9 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 7 Sep 2024 00:55:26 +0200 Subject: [PATCH 20/49] OOPS --- code/game/objects/items/storage/firstaid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 4b05a12e85b8..2fccc6df9b19 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -477,6 +477,6 @@ name = "bottle of cyanide pills" desc = "Contains pills used to quickly and quietly kill people. Consume at your own risk." -/obj/item/storage/pill_bottle/trophazole/PopulateContents() +/obj/item/storage/pill_bottle/cyanide/PopulateContents() for(var/i in 1 to 5) new /obj/item/reagent_containers/pill/cyanide(src) From 90cf59238ca81f93a66bfe5d88f90ac7bcb193c0 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 7 Sep 2024 11:12:20 +0200 Subject: [PATCH 21/49] more stuff --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 21 ++++++++++++++----- .../components/storage/concrete/pockets.dm | 1 + code/game/objects/items/storage/secure.dm | 1 - code/modules/cargo/packs/ammo.dm | 4 ++-- .../clothing/outfits/factions/syndicate.dm | 3 ++- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 6aec709ea0d0..fa260f67f604 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -877,6 +877,7 @@ /obj/item/clothing/under/syndicate/cybersun/research, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/head/soft/cybersun, +/obj/item/storage/belt/utility/full/engi, /obj/item/clothing/glasses/meson/engine, /obj/item/clothing/glasses/welding, /obj/effect/turf_decal/industrial/warning{ @@ -1102,7 +1103,6 @@ pixel_x = 20; pixel_y = 10 }, -/obj/machinery/firealarm/directional/east, /obj/item/clipboard{ pixel_x = -5; pixel_y = 3 @@ -1120,6 +1120,15 @@ pixel_x = 9; pixel_y = 0 }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/button/door{ + id = "kansatsu_secure_storage"; + name = "Window Access"; + dir = 8; + pixel_x = 20; + pixel_y = 1; + req_access_txt = "19" + }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -1164,10 +1173,11 @@ }, /obj/item/clothing/under/syndicate/cybersun/officer, /obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/gloves/krav_maga/combatglovesplus, +/obj/item/pen/edagger, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -2349,12 +2359,13 @@ }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/machinery/door/window/brigdoor/westleft{ - req_access_txt = "19" - }, /obj/structure/window/plasma/reinforced{ dir = 1 }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_secure_storage"; + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) "RY" = ( diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 32a74c843b01..b1a0d89b1442 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -144,6 +144,7 @@ . = ..() can_hold = typecacheof(list( /obj/item/gun/ballistic/automatic/pistol/syndicate, + /obj/item/gun/ballistic/automatic/pistol/himehabu, /obj/item/gun/ballistic/revolver, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/disabler, diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index f5c5fe638f26..5591b49c899a 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -210,5 +210,4 @@ new /obj/item/gun/ballistic/revolver/syndicate/no_mag(src) new /obj/item/ammo_box/a357 (src) new /obj/item/ammo_box/a357 (src) - new /obj/item/ammo_box/a357 (src) new /obj/item/folder/documents/syndicate/cybersun (src) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 1149081067a9..5d4b1f64640d 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -384,8 +384,8 @@ cost = 500 /datum/supply_pack/ammo/c22lr - name = ".22lr Ammo Box Crate" - desc = "TODO" + name = ".22 LR Ammo Box Crate" + desc = "Contains two 75 round ammo boxes for refilling .22 LR weapons." contains = list(/obj/item/ammo_box/c22lr_box, /obj/item/ammo_box/c22lr_box) crate_name = "ammo crate" diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 0255dbad94e8..7789bad2d3c0 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -532,7 +532,7 @@ head = /obj/item/clothing/head/HoS/cybersun gloves = /obj/item/clothing/gloves/combat id = /obj/item/card/id/syndicate_command/crew_id - r_pocket = /obj/item/kitchen/knife/switchblade + r_pocket = null glasses = /obj/item/clothing/glasses/sunglasses /datum/outfit/job/syndicate/head_of_personnel/suns @@ -1200,6 +1200,7 @@ r_pocket = /obj/item/radio head = /obj/item/clothing/head/soft/cybersun accessory = /obj/item/clothing/accessory/armband/engine + belt = null /datum/outfit/job/syndicate/engineer/suns name = "Syndicate - Ship Engineer (SUNS)" From 8167e4c6b69de413d77d80706defcee31f4e8d69 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 7 Sep 2024 11:35:19 +0200 Subject: [PATCH 22/49] pens --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 21 +++++-------------- .../shuttles/syndicate_cybersun_kansatsu.dm | 21 +++++++++++++++++++ .../game/objects/items/storage/uplink_kits.dm | 9 ++++++++ 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index fa260f67f604..05aa2e0417df 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1238,18 +1238,8 @@ /obj/item/storage/pistolcase/himehabu, /obj/item/ammo_box/c22lr_box, /obj/item/ammo_box/c22lr_box, -/obj/item/attachment/silencer{ - pixel_x = -8 - }, -/obj/item/attachment/silencer{ - pixel_x = -8 - }, -/obj/item/pen/edagger{ - pixel_x = 4 - }, -/obj/item/pen/edagger{ - pixel_x = 4 - }, +/obj/item/attachment/silencer, +/obj/item/attachment/silencer, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -2312,6 +2302,8 @@ req_access_txt = "19" }, /obj/item/storage/box/zipties, +/obj/item/storage/box/syndie_kit/pens, +/obj/item/storage/box/syndie_kit/pens, /obj/item/camera{ pictures_left = 20; pictures_max = 20; @@ -2324,14 +2316,11 @@ }, /obj/item/taperecorder, /obj/item/taperecorder, +/obj/item/disk/holodisk/kansatsu/gear/pens, /obj/item/binoculars, /obj/item/binoculars, /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, -/obj/item/pen/sleepy, -/obj/item/pen/sleepy, -/obj/item/pen/survival, -/obj/item/pen/survival, /obj/item/storage/pill_bottle/cyanide, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index e24f9f937380..34bbd8d1214a 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -188,3 +188,24 @@ SAY Good luck. DELAY 20 "} + +/obj/item/disk/holodisk/kansatsu/gear/pens + name = "\improper IR-304" // Introductory Recording - Random Number + desc = "A classified holodisk containing an introduction to the modified pens." + preset_record_text = {" + NAME Researcher Meenus-Seeba + SAY You have been issued a set of Cybersun Industries Modified Pen Kit. + DELAY 40 + SAY It contains three advanced pens with utility in espionage. + DELAY 40 + SAY First of the pens doubles as a tiny energy knife. Extremely useful in combat and for utility, while being practically unrecognizable. + DELAY 40 + SAY Second pen is equipped with a hidden chemical injector at the tip. After stabbing a target with it, they will be subdued shortly. Perfect for target extraction. + DELAY 40 + SAY Third pen, and the most visually distinctive one, has a diamond tip that can be used to mine. Not the fastest way to move around, but can certainly prove useful in emergencies. + DELAY 40 + SAY The Cybersun Industries Modified Pen Kit also contains a complimentraty pocket protector to carry the pens in without drawing too much suspicion. + DELAY 40 + SAY Good luck. + DELAY 20 + "} diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index f34aae9e6f82..eece0bd89a45 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -590,3 +590,12 @@ new /obj/item/storage/belt/soulstone/full/purified(src) new /obj/item/sbeacondrop/constructshell(src) new /obj/item/sbeacondrop/constructshell(src) + +/obj/item/storage/box/syndie_kit/pens + name = "modified pens kit" + +/obj/item/storage/box/syndie_kit/pens/PopulateContents() + new /obj/item/pen/edagger + new /obj/item/pen/sleepy + new /obj/item/pen/survival + new /obj/item/clothing/accessory/pocketprotector From e3b94894094d0d8d5e5950dc1259060a7b9558d7 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 7 Sep 2024 23:49:33 +0200 Subject: [PATCH 23/49] new missions --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 11 +++-- .../shuttles/syndicate_cybersun_kansatsu.dm | 48 ++++++++++++++----- .../game/objects/items/storage/uplink_kits.dm | 9 ++-- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 05aa2e0417df..19a5e04205bf 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -393,11 +393,15 @@ }, /obj/item/storage/box/syndie_kit/chameleon, /obj/item/storage/box/syndie_kit/chameleon, -/obj/item/chameleon, -/obj/item/chameleon, +/obj/item/storage/box/syndie_kit/pens, +/obj/item/storage/box/syndie_kit/pens, +/obj/item/storage/box/syndie_kit/tracking_beacons, /obj/item/clothing/accessory/holster/chameleon, /obj/item/clothing/accessory/holster/chameleon, +/obj/item/chameleon, +/obj/item/chameleon, /obj/item/disk/holodisk/kansatsu/gear/chameleon, +/obj/item/disk/holodisk/kansatsu/gear/pens, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -2302,8 +2306,6 @@ req_access_txt = "19" }, /obj/item/storage/box/zipties, -/obj/item/storage/box/syndie_kit/pens, -/obj/item/storage/box/syndie_kit/pens, /obj/item/camera{ pictures_left = 20; pictures_max = 20; @@ -2316,7 +2318,6 @@ }, /obj/item/taperecorder, /obj/item/taperecorder, -/obj/item/disk/holodisk/kansatsu/gear/pens, /obj/item/binoculars, /obj/item/binoculars, /obj/item/clothing/glasses/night, diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 34bbd8d1214a..156abf3f1c2f 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -27,6 +27,27 @@ DELAY 40 "} +/obj/item/disk/holodisk/kansatsu/mission/bugging + name = "\improper IG-I-085" // Information Gathering - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You are to plant a tracking beacon on board, in a secure location. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY This mission will be considered completed with at least four beacons planted. Do not disappoint us. + DELAY 40 + "} + +/obj/item/storage/box/syndie_kit/tracking_beacons + name = "box of tracking beacons" + +/obj/item/storage/box/syndie_kit/tracking_beacons/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/beacon(src) + /obj/item/disk/holodisk/kansatsu/mission/crew name = "\improper IG-I-138" // Information Gathering - Infiltration - Random Number preset_record_text = {" @@ -101,15 +122,17 @@ DELAY 20 "} -/obj/item/disk/holodisk/kansatsu/mission/training - name = "\improper TO-23" // Training Operation - Random Number +/obj/item/disk/holodisk/kansatsu/mission/gem + name = "\improper E-147" // Extraction - Random Number preset_record_text = {" NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to perform a training operation. + SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset. + DELAY 40 + SAY To be precise, you are after a rare gem. DELAY 40 - SAY You are to organize a training mission for the junior agents assigned to your crew. + SAY They can be found in derelicts and remains of certain fauna. DELAY 40 - SAY The exercise must be under oversight of at least one trained agent. + SAY You are also permitted to retrieve it from any group of interest that is not friendly to us. You must avoid recognition if you do so. DELAY 40 SAY Do not disappoint us. DELAY 20 @@ -142,8 +165,9 @@ /obj/item/disk/holodisk/kansatsu/mission/ruins = 5, /obj/item/disk/holodisk/kansatsu/mission/documents = 4, /obj/item/disk/holodisk/kansatsu/mission/pet = 3, - /obj/item/disk/holodisk/kansatsu/mission/training = 1, - /obj/item/disk/holodisk/kansatsu/mission/anomalies = 2 + /obj/item/disk/holodisk/kansatsu/mission/gem = 3, + /obj/item/disk/holodisk/kansatsu/mission/anomalies = 2, // Lower because it doesn't really use much of the spy gimmick. Still fits though so it stays. + /obj/item/disk/holodisk/kansatsu/mission/bugging = 4 ) lootcount = 2 @@ -175,15 +199,15 @@ desc = "A classified holodisk containing an introduction to the Chameleon gear." preset_record_text = {" NAME Researcher Meenus-Seeba - SAY You have been issued a Cybersun Industries Chameleon Gear Kit. + SAY You have been issued a Cybersun Industries Chameleon Gear Set. DELAY 40 - SAY It contains two sets of three pieces of advanced gear used for espionage. + SAY It contains three pieces of advanced gear used for espionage. DELAY 40 - SAY First gadget inside is the Chameleon kit - a holographically amplified set of clothing that can swiftly and quitely allow to blend in. + SAY First gadget included is the Chameleon kit - a holographically amplified set of clothing that can swiftly and quitely allow to blend in. DELAY 40 SAY Second piece of gear is the Chameleon holster. It allows you to smuggle a firearm past any security checkpoint, which will prove vital for self-defense and assassination missions. DELAY 40 - SAY Third, and the most exciting, gadget is the Chameleon projector. It is a personal cloaking device that is excellent for getting in and out unnoticed. + SAY Third, and most exciting, is the Chameleon projector. It is a personal cloaking device that is excellent for getting in and out unnoticed. DELAY 40 SAY Good luck. DELAY 20 @@ -194,7 +218,7 @@ desc = "A classified holodisk containing an introduction to the modified pens." preset_record_text = {" NAME Researcher Meenus-Seeba - SAY You have been issued a set of Cybersun Industries Modified Pen Kit. + SAY You have been issued a set of Cybersun Biodynamics Modified Pen Kit. DELAY 40 SAY It contains three advanced pens with utility in espionage. DELAY 40 diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index eece0bd89a45..dc21371cee24 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -595,7 +595,8 @@ name = "modified pens kit" /obj/item/storage/box/syndie_kit/pens/PopulateContents() - new /obj/item/pen/edagger - new /obj/item/pen/sleepy - new /obj/item/pen/survival - new /obj/item/clothing/accessory/pocketprotector + new /obj/item/pen/edagger(src) + new /obj/item/pen/sleepy(src) + new /obj/item/pen/survival(src) + new /obj/item/clothing/accessory/pocketprotector(src) + From 9453cb47ff23b2032dce413fef8fd9b1a77cbc86 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:06:16 +0200 Subject: [PATCH 24/49] sci gear --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 23 +++++----- .../shuttles/syndicate_cybersun_kansatsu.dm | 45 ++++++++++++++++--- .../game/objects/items/storage/uplink_kits.dm | 8 ---- 3 files changed, 49 insertions(+), 27 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 19a5e04205bf..d604b8550c9b 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -273,7 +273,7 @@ /obj/structure/table/glass, /obj/item/reagent_containers/food/drinks/bottle/wine{ pixel_y = 7; - pixel_x = -9 + pixel_x = -6 }, /obj/machinery/airalarm/directional/south, /obj/item/paper_bin{ @@ -281,6 +281,9 @@ pixel_x = 6 }, /obj/item/pen/fourcolor, +/obj/item/stamp/chameleon{ + pixel_x = -15 + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "ej" = ( @@ -391,17 +394,11 @@ req_access_txt = "19"; anchored = 1 }, -/obj/item/storage/box/syndie_kit/chameleon, -/obj/item/storage/box/syndie_kit/chameleon, -/obj/item/storage/box/syndie_kit/pens, -/obj/item/storage/box/syndie_kit/pens, -/obj/item/storage/box/syndie_kit/tracking_beacons, -/obj/item/clothing/accessory/holster/chameleon, -/obj/item/clothing/accessory/holster/chameleon, -/obj/item/chameleon, -/obj/item/chameleon, -/obj/item/disk/holodisk/kansatsu/gear/chameleon, -/obj/item/disk/holodisk/kansatsu/gear/pens, +/obj/item/storage/box/syndie_kit/kansatsu/chameleon, +/obj/item/storage/box/syndie_kit/kansatsu/chameleon, +/obj/item/storage/box/syndie_kit/kansatsu/pens, +/obj/item/storage/box/syndie_kit/kansatsu/pens, +/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -1729,7 +1726,7 @@ }, /obj/machinery/light/directional/south, /obj/item/stamp/cybersun{ - pixel_x = 9 + pixel_x = 7 }, /turf/open/floor/plasteel/white, /area/ship/bridge) diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 156abf3f1c2f..f1aaba8432ac 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -41,10 +41,11 @@ DELAY 40 "} -/obj/item/storage/box/syndie_kit/tracking_beacons +/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons name = "box of tracking beacons" + illustration = "sparkler" -/obj/item/storage/box/syndie_kit/tracking_beacons/PopulateContents() +/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons/PopulateContents() for(var/i in 1 to 7) new /obj/item/beacon(src) @@ -199,20 +200,41 @@ desc = "A classified holodisk containing an introduction to the Chameleon gear." preset_record_text = {" NAME Researcher Meenus-Seeba - SAY You have been issued a Cybersun Industries Chameleon Gear Set. + SAY You have been issued a Cybersun Industries Chameleon Gear Kit. DELAY 40 SAY It contains three pieces of advanced gear used for espionage. DELAY 40 - SAY First gadget included is the Chameleon kit - a holographically amplified set of clothing that can swiftly and quitely allow to blend in. + SAY The most exciting gadget included is the Chameleon kit - the Chameleon projector. It is a personal cloaking device that is excellent for getting in and out unnoticed. DELAY 40 - SAY Second piece of gear is the Chameleon holster. It allows you to smuggle a firearm past any security checkpoint, which will prove vital for self-defense and assassination missions. + The rest of DELAY 40 - SAY Third, and most exciting, is the Chameleon projector. It is a personal cloaking device that is excellent for getting in and out unnoticed. + SAY Second piece of gear is the Chameleon holster. It allows you to smuggle a firearm past any security checkpoint, which will prove vital for self-defense and assassination missions. DELAY 40 SAY Good luck. DELAY 20 "} +/obj/item/storage/box/syndie_kit/kansatsu/chameleon + name = "chameleon gear kit" + illustration = "glasses" + +/obj/item/storage/box/syndie_kit/kansatsu/chameleon/PopulateContents() // Same as normal, but instead of stamp and PDA, it gets a holster, a projector and a holodisk. + new /obj/item/clothing/under/chameleon(src) + new /obj/item/clothing/suit/chameleon(src) + new /obj/item/clothing/gloves/chameleon(src) + new /obj/item/clothing/shoes/chameleon(src) + new /obj/item/clothing/glasses/chameleon(src) + new /obj/item/clothing/head/chameleon(src) + new /obj/item/clothing/mask/chameleon(src) + new /obj/item/clothing/neck/chameleon(src) + new /obj/item/storage/backpack/chameleon(src) + new /obj/item/storage/belt/chameleon(src) + new /obj/item/radio/headset/chameleon(src) + new /obj/item/clothing/accessory/holster/chameleon(src) + new /obj/item/chameleon(src) + new /obj/item/disk/holodisk/kansatsu/gear/chameleon(src) + + /obj/item/disk/holodisk/kansatsu/gear/pens name = "\improper IR-304" // Introductory Recording - Random Number desc = "A classified holodisk containing an introduction to the modified pens." @@ -233,3 +255,14 @@ SAY Good luck. DELAY 20 "} + +/obj/item/storage/box/syndie_kit/kansatsu/pens + name = "modified pen kit" + illustration = "fpen" + +/obj/item/storage/box/syndie_kit/kansatsu/pens/PopulateContents() + new /obj/item/pen/edagger(src) + new /obj/item/pen/sleepy(src) + new /obj/item/pen/survival(src) + new /obj/item/clothing/accessory/pocketprotector(src) + new /obj/item/disk/holodisk/kansatsu/gear/pens(src) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index dc21371cee24..be638a27fc3a 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -591,12 +591,4 @@ new /obj/item/sbeacondrop/constructshell(src) new /obj/item/sbeacondrop/constructshell(src) -/obj/item/storage/box/syndie_kit/pens - name = "modified pens kit" - -/obj/item/storage/box/syndie_kit/pens/PopulateContents() - new /obj/item/pen/edagger(src) - new /obj/item/pen/sleepy(src) - new /obj/item/pen/survival(src) - new /obj/item/clothing/accessory/pocketprotector(src) From b03016957106a604e2715800798225ab634211b7 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:07:41 +0200 Subject: [PATCH 25/49] leave me alone --- code/game/objects/items/storage/uplink_kits.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index be638a27fc3a..f34aae9e6f82 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -590,5 +590,3 @@ new /obj/item/storage/belt/soulstone/full/purified(src) new /obj/item/sbeacondrop/constructshell(src) new /obj/item/sbeacondrop/constructshell(src) - - From 0f9f68e0da8d3f9d18fc2923d1705ee85c969a90 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:09:11 +0200 Subject: [PATCH 26/49] industries --- code/modules/paperwork/folders_premade.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm index 17cd61602ba9..2493ea2b1d58 100644 --- a/code/modules/paperwork/folders_premade.dm +++ b/code/modules/paperwork/folders_premade.dm @@ -44,7 +44,7 @@ /obj/item/folder/documents/syndicate/cybersun document = /obj/item/documents/syndicate/cybersun icon_state = "folder_sred" - desc = "A folder stamped \"Top Secret - Property of The Cybersun.\"" + desc = "A folder stamped \"Top Secret - Property of Cybersun Industries.\"" /obj/item/folder/documents/syndicate/red document = /obj/item/documents/syndicate/red From b9ea7ebceb1a30892b470a98325f886406ada69c Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:31:02 +0200 Subject: [PATCH 27/49] advertisement mission --- .../shuttles/syndicate_cybersun_kansatsu.dm | 65 ++++++++++++------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index f1aaba8432ac..2ace6a10bdcb 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -27,28 +27,6 @@ DELAY 40 "} -/obj/item/disk/holodisk/kansatsu/mission/bugging - name = "\improper IG-I-085" // Information Gathering - Infiltration - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. - DELAY 40 - SAY You are to plant a tracking beacon on board, in a secure location. - DELAY 40 - SAY You must avoid recognition while performing this mission. - DELAY 40 - SAY This mission will be considered completed with at least four beacons planted. Do not disappoint us. - DELAY 40 - "} - -/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons - name = "box of tracking beacons" - illustration = "sparkler" - -/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons/PopulateContents() - for(var/i in 1 to 7) - new /obj/item/beacon(src) - /obj/item/disk/holodisk/kansatsu/mission/crew name = "\improper IG-I-138" // Information Gathering - Infiltration - Random Number preset_record_text = {" @@ -95,6 +73,46 @@ DELAY 40 "} +/obj/item/disk/holodisk/kansatsu/mission/bugging + name = "\improper SD-I-085" // Special Delivery - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You are to plant a tracking beacon on board, in a secure location. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY This mission will be considered completed with at least four beacons planted. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons + name = "box of tracking beacons" + illustration = "sparkler" + +/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/beacon(src) + +/obj/item/disk/holodisk/kansatsu/mission/advertisement + name = "\improper SD-I-202" // Special Delivery - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You are to leave a Cybersun Virtual Solutions advertisement in a crew area. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY This mission will be considered completed with at least four advertisements distributed. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + /obj/item/disk/holodisk/kansatsu/mission/documents name = "\improper E-019" // Extraction - Random Number preset_record_text = {" @@ -168,7 +186,8 @@ /obj/item/disk/holodisk/kansatsu/mission/pet = 3, /obj/item/disk/holodisk/kansatsu/mission/gem = 3, /obj/item/disk/holodisk/kansatsu/mission/anomalies = 2, // Lower because it doesn't really use much of the spy gimmick. Still fits though so it stays. - /obj/item/disk/holodisk/kansatsu/mission/bugging = 4 + /obj/item/disk/holodisk/kansatsu/mission/bugging = 4, + /obj/item/disk/holodisk/kansatsu/mission/advertisement = 3 ) lootcount = 2 From db9007866bcc4bc3c414c39331085e718b600e1d Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:36:33 +0200 Subject: [PATCH 28/49] red insuls --- _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index d604b8550c9b..8f58fd935e06 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -876,7 +876,7 @@ }, /obj/item/clothing/under/syndicate/gec, /obj/item/clothing/under/syndicate/cybersun/research, -/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/red/insulated, /obj/item/clothing/head/soft/cybersun, /obj/item/storage/belt/utility/full/engi, /obj/item/clothing/glasses/meson/engine, From d1b2a9cc61cf85e08e6aee32168dc02a6b3ceca6 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:51:32 +0200 Subject: [PATCH 29/49] should fix it all? --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 13 +++++++++++-- code/game/objects/items/storage/guncases.dm | 4 ++-- code/game/objects/items/storage/secure.dm | 8 ++++---- .../projectiles/boxes_magazines/external/pistol.dm | 14 -------------- .../guns/manufacturer/scarborough/ballistics.dm | 3 +++ 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 8f58fd935e06..14b0f87f61dd 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -655,6 +655,7 @@ /obj/item/clothing/gloves/combat, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/head/HoS/cybersun, +/obj/item/pen/edagger, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "lP" = ( @@ -1327,7 +1328,11 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/turf/open/floor/carpet/nanoweave/red, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/dorm/dormtwo) "uq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2622,7 +2627,11 @@ /obj/effect/spawner/lootdrop/plushie{ pixel_y = 6 }, -/turf/open/floor/carpet/nanoweave/red, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/dorm/dormtwo) "Xw" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm index da536daa33db..301d0f605364 100644 --- a/code/game/objects/items/storage/guncases.dm +++ b/code/game/objects/items/storage/guncases.dm @@ -138,8 +138,8 @@ /obj/item/storage/pistolcase/himehabu /obj/item/storage/pistolcase/himehabu/PopulateContents() new /obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag(src) - new /obj/item/ammo_box/magazine/m22lr/empty(src) - new /obj/item/ammo_box/magazine/m22lr/empty(src) + new /obj/item/ammo_box/magazine/m22lr_himehabu/empty(src) + new /obj/item/ammo_box/magazine/m22lr_himehabu/empty(src) /obj/item/storage/pistolcase/candor /obj/item/storage/pistolcase/candor/PopulateContents() diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 5591b49c899a..b7347ddf28cc 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -207,7 +207,7 @@ name = "Captain's secure safe" /obj/item/storage/secure/safe/cybersun/PopulateContents() - new /obj/item/gun/ballistic/revolver/syndicate/no_mag(src) - new /obj/item/ammo_box/a357 (src) - new /obj/item/ammo_box/a357 (src) - new /obj/item/folder/documents/syndicate/cybersun (src) + new /obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag(src) + new /obj/item/ammo_box/magazine/m22lr_himehabu(src) + new /obj/item/ammo_box/magazine/m22lr_himehabu(src) + new /obj/item/folder/documents/syndicate/cybersun(src) diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 9df554a1af21..90d2c7e4546e 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -122,17 +122,3 @@ caliber = "9mm" max_ammo = 4 custom_materials = list(/datum/material/iron = 20000) - -/obj/item/ammo_box/magazine/m22lr - name = "pistol magazine (.22 LR)" - desc = "A single-stack handgun magazine designed to chamber .22 LR. It's rather tiny, all things considered." - icon_state = "himehabu_mag-10" - base_icon_state = "himehabu_mag" - ammo_type = /obj/item/ammo_casing/c22lr - caliber = "22lr" - max_ammo = 10 - w_class = WEIGHT_CLASS_TINY - multiple_sprites = AMMO_BOX_PER_BULLET - -/obj/item/ammo_box/magazine/m22lr/empty - start_empty = TRUE diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm index 18239e94dd7e..19729a7a0337 100644 --- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm @@ -358,6 +358,9 @@ EMPTY_GUN_HELPER(automatic/pistol/himehabu) w_class = WEIGHT_CLASS_TINY multiple_sprites = AMMO_BOX_PER_BULLET +/obj/item/ammo_box/magazine/m22lr_himehabu/empty + start_empty = TRUE + //########### SMGS ###########// From 6ac81efdd5c83c9d2f1b4704b6b39a68fa2ef6e0 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:52:18 +0200 Subject: [PATCH 30/49] shush --- code/modules/projectiles/guns/ballistic/pistol.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 49df8cb7d3f8..e81b57d43f37 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -302,3 +302,4 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq) /obj/item/gun/ballistic/derringer/no_mag spawnwithmagazine = FALSE + From ba77f56493ffdb8c4a196616f531f2bc017e9831 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:16:49 +0200 Subject: [PATCH 31/49] That scout is a spah!!! --- _maps/configs/syndicate_cybersun_kansatsu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index 7b21201dc0ef..1d494f120f4d 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -8,7 +8,7 @@ "NATURAL_AGGRESSIVE" ], "map_name": "Kansatsu-class Scout Courier", - "description": "The Kansatsu-class Scout-Courier is a Cybersun retrofit of obsolete Scanmag-class Fast Couriers, a design dating back to the early 200s F.S. The ubiquity of the Scanmag-class has made them an easy purchase for Cybersun, who can retrofit, equip, and deploy the newly christened Kansatsu into the Frontier. The typical mission goal of a Kansatsu is reconnaissance of assets in a particular system. Their speed allows them to undertake a wide variety of ‘odd-jobs’, ranging from high speed pizza delivery (a favorite of certain cybersun officials), to orbital insertion of an operative. A standard crew is no less than 4 people, but depending on the mission - a Kansatsu can safely carry up to 7, although there’s no guarantee that it will be comfortable.", + "description": "The Kansatsu-class Scout-Courier is a Cybersun Virtual Solutions retrofit of obsolete Scanmag-class Fast Couriers, a design dating back to the early 200s F.S. The ubiquity of the Scanmag-class has made them an easy purchase for Cybersun, who can retrofit, equip, and deploy the newly christened Kansatsu into the Frontier. The typical mission goal of a Kansatsu is reconnaissance of assets in a particular system. Their speed allows them to undertake a wide variety of ‘odd-jobs’, ranging from high speed pizza delivery (a favorite of certain cybersun officials), to orbital insertion of an operative. A standard crew is no less than 4 people, but depending on the mission - a Kansatsu can safely carry up to 7, although there’s no guarantee that it will be comfortable.", "tags": [ "Specialist" ], From 2868d8a2b0e4bbc1191507b944f3aa9c9aa25f66 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 17 Sep 2024 10:38:49 +0200 Subject: [PATCH 32/49] kinda better bedroom, elec'd windows --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 135 ++++++++++++++++-- .../shuttles/syndicate_cybersun_kansatsu.dm | 2 +- 2 files changed, 125 insertions(+), 12 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 14b0f87f61dd..a50ccfa077b7 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -15,6 +15,9 @@ id = "kansatsu_lockdown"; dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "ah" = ( @@ -35,6 +38,9 @@ id = "kansatsu_observation" }, /obj/machinery/door/firedoor/window, +/obj/structure/cable/orange{ + icon_state = "0-1" + }, /turf/open/floor/plating, /area/ship/bridge) "aQ" = ( @@ -365,6 +371,9 @@ pixel_x = -6; req_access_txt = "19" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "fC" = ( @@ -1286,6 +1295,21 @@ color = "#777777" }, /area/ship/engineering) +"tH" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/bridge) "tJ" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 @@ -1318,13 +1342,12 @@ /obj/machinery/light_switch{ dir = 4; pixel_x = -20; - pixel_y = -10 + pixel_y = -12 }, /obj/machinery/camera{ dir = 4; c_tag = "Command Quarters" }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/orange{ icon_state = "0-2" }, @@ -1332,6 +1355,11 @@ dir = 1 }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/closet/wall/red/directional/north, +/obj/item/clothing/under/misc/pj/red, +/obj/item/clothing/under/misc/pj/red, +/obj/effect/spawner/lootdrop/plushie, /turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/dorm/dormtwo) "uq" = ( @@ -1341,6 +1369,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/structure/cable/orange{ + icon_state = "5-8" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "uR" = ( @@ -1366,6 +1397,9 @@ /area/ship/crew) "vB" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "vK" = ( @@ -1407,6 +1441,12 @@ id = "kansatsu_observation" }, /obj/machinery/door/firedoor/window, +/obj/structure/cable/orange{ + icon_state = "1-4" + }, +/obj/structure/cable/orange{ + icon_state = "0-1" + }, /turf/open/floor/plating, /area/ship/bridge) "wz" = ( @@ -1414,6 +1454,9 @@ dir = 4; color = "#555555" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "xf" = ( @@ -1598,6 +1641,21 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating, /area/ship/engineering) +"BI" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/bridge) "BS" = ( /obj/structure/chair/bench/red/directional/east, /turf/open/floor/plasteel/tech, @@ -1819,6 +1877,21 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"HO" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) "Ig" = ( /obj/effect/turf_decal/corner_techfloor_grid{ dir = 10 @@ -1975,6 +2048,21 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/crew) +"LE" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/bridge) "Mb" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -2267,6 +2355,9 @@ /area/ship/crew) "QO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "Rj" = ( @@ -2330,6 +2421,9 @@ }, /area/ship/storage) "Rz" = ( +/obj/structure/cable/orange{ + icon_state = "4-10" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "RO" = ( @@ -2438,6 +2532,12 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "Tv" = ( @@ -2585,6 +2685,19 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) +"WY" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) "Xa" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -2614,6 +2727,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "Xr" = ( @@ -2624,9 +2740,6 @@ }, /obj/machinery/light/small/directional/east, /obj/machinery/newscaster/directional/north, -/obj/effect/spawner/lootdrop/plushie{ - pixel_y = 6 - }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 1 }, @@ -3248,7 +3361,7 @@ YQ YQ YQ YQ -vN +HO ST vB vN @@ -3265,10 +3378,10 @@ YQ YQ YQ YQ -vN +LE Mb kd -vN +LE YQ YQ YQ @@ -3282,10 +3395,10 @@ YQ YQ YQ YQ -vN -aj +tH aj -vN +WY +BI YQ YQ YQ diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 2ace6a10bdcb..400550b18bcf 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -8,7 +8,7 @@ /obj/item/disk/holodisk/kansatsu/mission/New(obj/L) ..() - pixel_x = base_pixel_x + rand(-5, 5) + pixel_x = base_pixel_x + rand(-5, 5) // Must still fit on the table. pixel_y = base_pixel_y + rand(-3, 2) /obj/item/disk/holodisk/kansatsu/mission/safety From 4830baabbf66186d23b32a23322b34a49d71280c Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:00:35 +0200 Subject: [PATCH 33/49] fits better --- code/modules/clothing/outfits/factions/syndicate.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index e2403fa2a6bc..6b5e7b86fa7c 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -1196,7 +1196,6 @@ name = "Syndicate - Engineer (Cybersun)" uniform = /obj/item/clothing/under/syndicate/cybersun/research - shoes = /obj/item/clothing/shoes/workboots r_pocket = /obj/item/radio head = /obj/item/clothing/head/soft/cybersun accessory = /obj/item/clothing/accessory/armband/engine From d38c6622b705fc7678a622a8cd9a0f8d9919fb2f Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 22 Sep 2024 10:41:02 +0200 Subject: [PATCH 34/49] I think that's meant to work? --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index a50ccfa077b7..04363357ee90 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -778,13 +778,14 @@ dir = 6; pixel_y = 12; pixel_x = -8; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent."; + id = "kansatsu_grid" }, /obj/effect/turf_decal/corner_techfloor_grid{ dir = 5 }, /turf/open/floor/plating/airless, -/area/ship/bridge) +/area/ship/engineering) "oC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -834,14 +835,15 @@ dir = 6; pixel_y = 12; pixel_x = -8; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent."; + id = "kansatsu_grid" }, /obj/machinery/camera{ dir = 5; c_tag = "Exterior - Starboard" }, /turf/open/floor/plating/airless, -/area/ship/bridge) +/area/ship/crew/dorm) "pM" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner, /obj/structure/extinguisher_cabinet/directional/south{ @@ -1377,10 +1379,11 @@ "uR" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ dir = 9; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent."; + id = "kansatsu_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) +/area/ship/engineering) "vk" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/corner{ dir = 1 @@ -1676,10 +1679,11 @@ "CR" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ dir = 10; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent."; + id = "kansatsu_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) +/area/ship/engineering) "CU" = ( /obj/machinery/door/poddoor{ dir = 2; @@ -1742,7 +1746,8 @@ dir = 6; pixel_y = 12; pixel_x = -8; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent."; + id = "kansatsu_grid" }, /obj/effect/turf_decal/corner_techfloor_grid{ dir = 5 @@ -1904,7 +1909,8 @@ dir = 5; pixel_y = -4; pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent."; + id = "kansatsu_grid" }, /turf/open/floor/plating/airless, /area/ship/bridge) @@ -2192,13 +2198,14 @@ dir = 5; pixel_y = -4; pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent."; + id = "kansatsu_grid" }, /obj/effect/turf_decal/corner_techfloor_grid{ dir = 10 }, /turf/open/floor/plating/airless, -/area/ship/bridge) +/area/ship/crew) "Oi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/orange{ @@ -2503,7 +2510,8 @@ dir = 5; pixel_y = -4; pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent."; + id = "kansatsu_grid" }, /obj/effect/turf_decal/corner_techfloor_grid{ dir = 10 @@ -2513,7 +2521,7 @@ c_tag = "Exterior - Port" }, /turf/open/floor/plating/airless, -/area/ship/bridge) +/area/ship/crew) "SL" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8; @@ -2590,7 +2598,8 @@ }, /obj/machinery/turretid{ pixel_y = -22; - pixel_x = -13 + pixel_x = -13; + id = "kansatsu_grid" }, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) From 54a231c6f07e1ab69716fdb4ef1b7b96a8eeb1af Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:19:27 +0200 Subject: [PATCH 35/49] think I broke something --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 132 ------------------ 1 file changed, 132 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 389cbb3b5c7e..04363357ee90 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -728,87 +728,7 @@ dir = 10; c_tag = "Airlock - External" }, -<<<<<<< HEAD /obj/effect/turf_decal/corner_techfloor_grid{ -======= -/obj/item/storage/box/rxglasses/spyglasskit, -/obj/item/melee/knife/letter_opener, -/turf/open/floor/plasteel/dark, -/area/ship/crew/office) -"nF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_y = 22 - }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) -"nO" = ( -/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/box/red, -/obj/machinery/camera, -/turf/open/floor/plating, -/area/ship/external) -"oN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock{ - name = "Cryopod Room" - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/dorm) -"pa" = ( -/obj/machinery/fax/syndicate, -/obj/item/toy/figure/detective{ - name = "Intel Buddy"; - pixel_x = 5; - pixel_y = 10; - toysay = "Let's see what Command thinks of this..." - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/office) -"pM" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/office) -"qa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/spline/fancy/transparent/grey{ ->>>>>>> upstream/master dir = 6 }, /turf/open/floor/plating/airless, @@ -1299,40 +1219,7 @@ pixel_y = 24; pixel_x = -8 }, -<<<<<<< HEAD /turf/open/floor/plasteel/white, -======= -/obj/structure/safe/floor{ - number_of_tumblers = 3 - }, -/obj/item/implanter/stealth, -/obj/item/implanter/stealth, -/obj/item/modular_computer/laptop/preset/civilian, -/obj/item/clothing/mask/chameleon, -/obj/item/melee/knife/combat, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/reagent_containers/pill/cyanide, -/obj/item/paper/crumpled{ - default_raw_text = "Hand this stuff out to the field agents. They'll have a blast." - }, -/obj/item/clothing/mask/chameleon, -/obj/item/card/id/syndicate/anyone, -/obj/item/card/id/syndicate/anyone, -/obj/effect/turf_decal/box, -/turf/open/floor/plating, -/area/ship/crew/office) -"Vw" = ( -/obj/structure/chair/comfy/grey/directional/south, -/obj/machinery/light/small/directional/north, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/dark, ->>>>>>> upstream/master /area/ship/crew) "tm" = ( /obj/machinery/firealarm/directional/east{ @@ -2955,28 +2842,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -<<<<<<< HEAD /obj/effect/turf_decal/trimline/opaque/syndiered/line, /turf/open/floor/plasteel/white, /area/ship/bridge) -======= -/obj/effect/turf_decal/box, -/obj/item/melee/knife/survival, -/obj/item/melee/knife/survival, -/obj/item/melee/knife/survival, -/obj/item/melee/knife/survival, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/structure/closet/crate/wooden{ - name = "survival kit" - }, -/obj/item/survivalcapsule, -/obj/item/survivalcapsule, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) ->>>>>>> upstream/master "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 From 36bc6e01eed19aeac3d306e6dbbf5d1fe740cb67 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:31:59 +0200 Subject: [PATCH 36/49] aspawn --- _maps/configs/syndicate_cybersun_kansatsu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index 1d494f120f4d..8c8ce0e2e89a 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -40,5 +40,5 @@ "slots": 2 } }, - "enabled": true + "enabled": false } From 4aed11bb8d70683ed9538c70f15eaadf388cf95e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 7 Oct 2024 16:15:23 +0200 Subject: [PATCH 37/49] safe --- _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 04363357ee90..9bd0ffab1685 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -2145,10 +2145,10 @@ /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 9 }, -/obj/item/storage/secure/safe/cybersun{ - dir = 8; +/obj/item/storage/secure/safe/cybersun/solutions{ pixel_x = -31; - pixel_y = -4 + pixel_y = -4; + dir = 8 }, /obj/structure/cable/orange{ icon_state = "1-2" From 41a1b8a9576d09846d36d2660b186018291b0388 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 14 Oct 2024 08:26:02 +0200 Subject: [PATCH 38/49] soap --- _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 9bd0ffab1685..93bdccca0224 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -450,9 +450,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/white, /obj/structure/curtain, -/obj/item/soap/syndie{ - cleanspeed = 20 - }, +/obj/item/soap/syndie, /obj/machinery/light/small/directional/south, /obj/machinery/camera{ dir = 4; From 38baabddd463ba64a861e3f4c0d51343f3394580 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:33:10 +0200 Subject: [PATCH 39/49] updatepaths --- _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 93bdccca0224..a3d9ddb460cf 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1247,8 +1247,8 @@ }, /obj/item/storage/pistolcase/himehabu, /obj/item/storage/pistolcase/himehabu, -/obj/item/ammo_box/c22lr_box, -/obj/item/ammo_box/c22lr_box, +/obj/item/storage/box/ammo/c22lr, +/obj/item/storage/box/ammo/c22lr, /obj/item/attachment/silencer, /obj/item/attachment/silencer, /turf/open/floor/plasteel/patterned/grid{ From f08f05ab335dc646257c42b21dcac20a239eb7ea Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 22 Oct 2024 20:39:32 +0200 Subject: [PATCH 40/49] well, goodbye --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 8 +- .../shuttles/syndicate_cybersun_kansatsu.dm | 194 ------------------ 2 files changed, 4 insertions(+), 198 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 0c496971180f..7f7293eb1d03 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -407,7 +407,6 @@ /obj/item/storage/box/syndie_kit/kansatsu/chameleon, /obj/item/storage/box/syndie_kit/kansatsu/pens, /obj/item/storage/box/syndie_kit/kansatsu/pens, -/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -2350,12 +2349,13 @@ /area/ship/crew/dorm/dormtwo) "QN" = ( /obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/kansatsu_missions{ - pixel_y = 6 - }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 }, +/obj/item/folder/red{ + pixel_x = -5; + pixel_y = 4 + }, /turf/open/floor/plasteel/mono/white, /area/ship/crew) "QO" = ( diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 400550b18bcf..2ee609766a51 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -1,197 +1,3 @@ -/datum/preset_holoimage/cybersun_intel_director - species_type = /datum/species/ipc - outfit_type = /datum/outfit/job/syndicate/captain/cybersun - -/obj/item/disk/holodisk/kansatsu/mission - desc = "A classified holodisk containing a mission for the Cybersun Industries Intelligence Division." - preset_image_type = /datum/preset_holoimage/cybersun_intel_director - -/obj/item/disk/holodisk/kansatsu/mission/New(obj/L) - ..() - pixel_x = base_pixel_x + rand(-5, 5) // Must still fit on the table. - pixel_y = base_pixel_y + rand(-3, 2) - -/obj/item/disk/holodisk/kansatsu/mission/safety - name = "\improper IG-I-296" // Information Gathering - Infiltration - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. - DELAY 40 - SAY You must gather information about the safety measures on board. You are to look for any potential flaws and exploits. - DELAY 40 - SAY You must avoid recognition while performing this mission. - DELAY 40 - SAY Your officers must then prepare an official report on this. - DELAY 40 - SAY This mission will be considered completed with at least three reports. Do not disappoint us. - DELAY 40 - "} - -/obj/item/disk/holodisk/kansatsu/mission/crew - name = "\improper IG-I-138" // Information Gathering - Infiltration - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. - DELAY 40 - SAY You must profile five members of the crew. Their profile must include credentials, habits and skills. Any further information is optional, but advised. - DELAY 40 - SAY You must avoid recognition while performing this mission. - DELAY 40 - SAY Your officers must then prepare an official report on this. - DELAY 40 - SAY This mission will be considered completed with at least five reports. Do not disappoint us. - DELAY 40 - "} - -/obj/item/disk/holodisk/kansatsu/mission/valueables - name = "\improper IG-I-271" // Information Gathering - Infiltration - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. - DELAY 40 - SAY On board, you must locate and catalogue all the objects of value. You may not seize them, unless you are tasked to by another mission. - DELAY 40 - SAY You must avoid recognition while performing this mission. - DELAY 40 - SAY Your officers must then prepare an official report on this. - DELAY 40 - SAY This mission will be considered completed with at least three reports. Do not disappoint us. - DELAY 40 - "} - -/obj/item/disk/holodisk/kansatsu/mission/ruins - name = "\improper IG-S-290" // Information Gathering - Scouting - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to scout your current sector. - DELAY 40 - SAY You are to locate war-era derelicts. You must explore them and take note of all the relevant details. - DELAY 40 - SAY Your officers must then prepare an official report on this. - DELAY 40 - SAY This mission will be considered completed with at least five reports. Do not disappoint us. - DELAY 40 - "} - -/obj/item/disk/holodisk/kansatsu/mission/bugging - name = "\improper SD-I-085" // Special Delivery - Infiltration - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. - DELAY 40 - SAY You are to plant a tracking beacon on board, in a secure location. - DELAY 40 - SAY You must avoid recognition while performing this mission. - DELAY 40 - SAY This mission will be considered completed with at least four beacons planted. - DELAY 40 - SAY Do not disappoint us. - DELAY 20 - "} - -/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons - name = "box of tracking beacons" - illustration = "sparkler" - -/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons/PopulateContents() - for(var/i in 1 to 7) - new /obj/item/beacon(src) - -/obj/item/disk/holodisk/kansatsu/mission/advertisement - name = "\improper SD-I-202" // Special Delivery - Infiltration - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. - DELAY 40 - SAY You are to leave a Cybersun Virtual Solutions advertisement in a crew area. - DELAY 40 - SAY You must avoid recognition while performing this mission. - DELAY 40 - SAY This mission will be considered completed with at least four advertisements distributed. - DELAY 40 - SAY Do not disappoint us. - DELAY 20 - "} - -/obj/item/disk/holodisk/kansatsu/mission/documents - name = "\improper E-019" // Extraction - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us. - DELAY 40 - SAY To be precise, you are after a bundle of classified documents. - DELAY 40 - SAY You must avoid recognition while performing this mission. - DELAY 40 - SAY Do not disappoint us. - DELAY 20 - "} - -/obj/item/disk/holodisk/kansatsu/mission/pet - name = "\improper E-271" // Extraction - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us. - DELAY 40 - SAY To be precise, you are after a domesticated animal. The cutest you can possibly find. - DELAY 40 - SAY You must avoid recognition while performing this mission. - DELAY 40 - SAY Do not disappoint us. - DELAY 20 - "} - -/obj/item/disk/holodisk/kansatsu/mission/gem - name = "\improper E-147" // Extraction - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset. - DELAY 40 - SAY To be precise, you are after a rare gem. - DELAY 40 - SAY They can be found in derelicts and remains of certain fauna. - DELAY 40 - SAY You are also permitted to retrieve it from any group of interest that is not friendly to us. You must avoid recognition if you do so. - DELAY 40 - SAY Do not disappoint us. - DELAY 20 - "} - -/obj/item/disk/holodisk/kansatsu/mission/anomalies - name = "\improper RD-166" // Research Division - Random Number - preset_record_text = {" - NAME Intelligence Director Torch-3 - SAY Agents. Your vessel has been assigned a mission to assist our research department. - DELAY 40 - SAY You are to collect at least four anomaly cores. - DELAY 40 - SAY They are scattered around the planetoids in your sector. You are also permitted to retrieve them from other vessels. - DELAY 40 - SAY The anomaly cores must be stored in your armory, in the company-issued secure crate. - DELAY 40 - SAY Do not disappoint us. - DELAY 20 - "} - - -/obj/effect/spawner/lootdrop/kansatsu_missions - name = "Kansatsu Missions" - lootdoubles = FALSE - loot = list( - /obj/item/disk/holodisk/kansatsu/mission/safety = 3, - /obj/item/disk/holodisk/kansatsu/mission/crew = 5, - /obj/item/disk/holodisk/kansatsu/mission/valueables = 4, - /obj/item/disk/holodisk/kansatsu/mission/ruins = 5, - /obj/item/disk/holodisk/kansatsu/mission/documents = 4, - /obj/item/disk/holodisk/kansatsu/mission/pet = 3, - /obj/item/disk/holodisk/kansatsu/mission/gem = 3, - /obj/item/disk/holodisk/kansatsu/mission/anomalies = 2, // Lower because it doesn't really use much of the spy gimmick. Still fits though so it stays. - /obj/item/disk/holodisk/kansatsu/mission/bugging = 4, - /obj/item/disk/holodisk/kansatsu/mission/advertisement = 3 - ) - - lootcount = 2 - /datum/preset_holoimage/cybersun_researcher outfit_type = /datum/outfit/job/syndicate/science/cybersun species_type = /datum/species/elzuose From 7a021c7bc25452ba4f5c452f73692a17241df0ac Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 24 Oct 2024 20:59:08 +0200 Subject: [PATCH 41/49] Revert "well, goodbye" This reverts commit f08f05ab335dc646257c42b21dcac20a239eb7ea. --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 8 +- .../shuttles/syndicate_cybersun_kansatsu.dm | 194 ++++++++++++++++++ 2 files changed, 198 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 7f7293eb1d03..0c496971180f 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -407,6 +407,7 @@ /obj/item/storage/box/syndie_kit/kansatsu/chameleon, /obj/item/storage/box/syndie_kit/kansatsu/pens, /obj/item/storage/box/syndie_kit/kansatsu/pens, +/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -2349,13 +2350,12 @@ /area/ship/crew/dorm/dormtwo) "QN" = ( /obj/structure/table/reinforced, +/obj/effect/spawner/lootdrop/kansatsu_missions{ + pixel_y = 6 + }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 }, -/obj/item/folder/red{ - pixel_x = -5; - pixel_y = 4 - }, /turf/open/floor/plasteel/mono/white, /area/ship/crew) "QO" = ( diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 2ee609766a51..400550b18bcf 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -1,3 +1,197 @@ +/datum/preset_holoimage/cybersun_intel_director + species_type = /datum/species/ipc + outfit_type = /datum/outfit/job/syndicate/captain/cybersun + +/obj/item/disk/holodisk/kansatsu/mission + desc = "A classified holodisk containing a mission for the Cybersun Industries Intelligence Division." + preset_image_type = /datum/preset_holoimage/cybersun_intel_director + +/obj/item/disk/holodisk/kansatsu/mission/New(obj/L) + ..() + pixel_x = base_pixel_x + rand(-5, 5) // Must still fit on the table. + pixel_y = base_pixel_y + rand(-3, 2) + +/obj/item/disk/holodisk/kansatsu/mission/safety + name = "\improper IG-I-296" // Information Gathering - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You must gather information about the safety measures on board. You are to look for any potential flaws and exploits. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Your officers must then prepare an official report on this. + DELAY 40 + SAY This mission will be considered completed with at least three reports. Do not disappoint us. + DELAY 40 + "} + +/obj/item/disk/holodisk/kansatsu/mission/crew + name = "\improper IG-I-138" // Information Gathering - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You must profile five members of the crew. Their profile must include credentials, habits and skills. Any further information is optional, but advised. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Your officers must then prepare an official report on this. + DELAY 40 + SAY This mission will be considered completed with at least five reports. Do not disappoint us. + DELAY 40 + "} + +/obj/item/disk/holodisk/kansatsu/mission/valueables + name = "\improper IG-I-271" // Information Gathering - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY On board, you must locate and catalogue all the objects of value. You may not seize them, unless you are tasked to by another mission. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Your officers must then prepare an official report on this. + DELAY 40 + SAY This mission will be considered completed with at least three reports. Do not disappoint us. + DELAY 40 + "} + +/obj/item/disk/holodisk/kansatsu/mission/ruins + name = "\improper IG-S-290" // Information Gathering - Scouting - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to scout your current sector. + DELAY 40 + SAY You are to locate war-era derelicts. You must explore them and take note of all the relevant details. + DELAY 40 + SAY Your officers must then prepare an official report on this. + DELAY 40 + SAY This mission will be considered completed with at least five reports. Do not disappoint us. + DELAY 40 + "} + +/obj/item/disk/holodisk/kansatsu/mission/bugging + name = "\improper SD-I-085" // Special Delivery - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You are to plant a tracking beacon on board, in a secure location. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY This mission will be considered completed with at least four beacons planted. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons + name = "box of tracking beacons" + illustration = "sparkler" + +/obj/item/storage/box/syndie_kit/kansatsu/tracking_beacons/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/beacon(src) + +/obj/item/disk/holodisk/kansatsu/mission/advertisement + name = "\improper SD-I-202" // Special Delivery - Infiltration - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to infiltrate vessels belonging to any group of interest. + DELAY 40 + SAY You are to leave a Cybersun Virtual Solutions advertisement in a crew area. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY This mission will be considered completed with at least four advertisements distributed. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/disk/holodisk/kansatsu/mission/documents + name = "\improper E-019" // Extraction - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us. + DELAY 40 + SAY To be precise, you are after a bundle of classified documents. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/disk/holodisk/kansatsu/mission/pet + name = "\improper E-271" // Extraction - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset belonging to any group of interest that is not friendly to us. + DELAY 40 + SAY To be precise, you are after a domesticated animal. The cutest you can possibly find. + DELAY 40 + SAY You must avoid recognition while performing this mission. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/disk/holodisk/kansatsu/mission/gem + name = "\improper E-147" // Extraction - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to locate and retrieve an asset. + DELAY 40 + SAY To be precise, you are after a rare gem. + DELAY 40 + SAY They can be found in derelicts and remains of certain fauna. + DELAY 40 + SAY You are also permitted to retrieve it from any group of interest that is not friendly to us. You must avoid recognition if you do so. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + +/obj/item/disk/holodisk/kansatsu/mission/anomalies + name = "\improper RD-166" // Research Division - Random Number + preset_record_text = {" + NAME Intelligence Director Torch-3 + SAY Agents. Your vessel has been assigned a mission to assist our research department. + DELAY 40 + SAY You are to collect at least four anomaly cores. + DELAY 40 + SAY They are scattered around the planetoids in your sector. You are also permitted to retrieve them from other vessels. + DELAY 40 + SAY The anomaly cores must be stored in your armory, in the company-issued secure crate. + DELAY 40 + SAY Do not disappoint us. + DELAY 20 + "} + + +/obj/effect/spawner/lootdrop/kansatsu_missions + name = "Kansatsu Missions" + lootdoubles = FALSE + loot = list( + /obj/item/disk/holodisk/kansatsu/mission/safety = 3, + /obj/item/disk/holodisk/kansatsu/mission/crew = 5, + /obj/item/disk/holodisk/kansatsu/mission/valueables = 4, + /obj/item/disk/holodisk/kansatsu/mission/ruins = 5, + /obj/item/disk/holodisk/kansatsu/mission/documents = 4, + /obj/item/disk/holodisk/kansatsu/mission/pet = 3, + /obj/item/disk/holodisk/kansatsu/mission/gem = 3, + /obj/item/disk/holodisk/kansatsu/mission/anomalies = 2, // Lower because it doesn't really use much of the spy gimmick. Still fits though so it stays. + /obj/item/disk/holodisk/kansatsu/mission/bugging = 4, + /obj/item/disk/holodisk/kansatsu/mission/advertisement = 3 + ) + + lootcount = 2 + /datum/preset_holoimage/cybersun_researcher outfit_type = /datum/outfit/job/syndicate/science/cybersun species_type = /datum/species/elzuose From 4e586c9e5dcc8eb2f16469a82e46c7c51dbfa9b9 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 24 Oct 2024 21:03:20 +0200 Subject: [PATCH 42/49] bed --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 0c496971180f..b36c910a781a 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1226,8 +1226,7 @@ /obj/structure/extinguisher_cabinet/directional/east{ pixel_y = -7 }, -/obj/structure/bed, -/obj/item/bedsheet/black, +/obj/effect/spawner/bunk_bed, /obj/structure/curtain/cloth/grey, /obj/machinery/light/small/directional/south, /turf/open/floor/carpet/nanoweave, @@ -1351,16 +1350,12 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/closet/wall/red/directional/north, /obj/item/clothing/under/misc/pj/red, /obj/item/clothing/under/misc/pj/red, /obj/effect/spawner/lootdrop/plushie, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm/dormtwo) "uq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2639,11 +2634,8 @@ pixel_x = -32 }, /obj/machinery/airalarm/directional/south, -/obj/item/bedsheet/black{ - dir = 4 - }, /obj/structure/curtain/cloth/grey, -/obj/structure/bed{ +/obj/effect/spawner/bunk_bed{ dir = 4 }, /turf/open/floor/carpet/nanoweave, @@ -2747,11 +2739,7 @@ }, /obj/machinery/light/small/directional/east, /obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm/dormtwo) "Xw" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, From 8448dfa1a97ce17329db223096e9ea3466d5bd94 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:37:12 +0200 Subject: [PATCH 43/49] updated paths --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 16 ++++++++-------- .../shuttles/syndicate_cybersun_kansatsu.dm | 5 ++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index b36c910a781a..3393fa867686 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -820,7 +820,7 @@ /obj/structure/dresser{ dir = 1 }, -/obj/effect/spawner/lootdrop/plushie/moth{ +/obj/effect/spawner/random/entertainment/plushie/moth{ pixel_y = 11 }, /turf/open/floor/carpet/nanoweave, @@ -1354,7 +1354,7 @@ /obj/structure/closet/wall/red/directional/north, /obj/item/clothing/under/misc/pj/red, /obj/item/clothing/under/misc/pj/red, -/obj/effect/spawner/lootdrop/plushie, +/obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm/dormtwo) "uq" = ( @@ -1575,11 +1575,11 @@ /obj/item/reagent_containers/food/drinks/waterbottle, /obj/item/reagent_containers/food/drinks/bottle/absinthe, /obj/item/reagent_containers/food/snacks/canned/beans, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, /obj/item/reagent_containers/food/drinks/dry_ramen, /obj/item/reagent_containers/food/drinks/dry_ramen, /obj/item/reagent_containers/food/drinks/dry_ramen, @@ -2345,7 +2345,7 @@ /area/ship/crew/dorm/dormtwo) "QN" = ( /obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/kansatsu_missions{ +/obj/effect/spawner/random/kansatsu_missions{ pixel_y = 6 }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index 400550b18bcf..d7fc543a7134 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -174,7 +174,7 @@ "} -/obj/effect/spawner/lootdrop/kansatsu_missions +/obj/effect/spawner/random/kansatsu_missions name = "Kansatsu Missions" lootdoubles = FALSE loot = list( @@ -189,8 +189,7 @@ /obj/item/disk/holodisk/kansatsu/mission/bugging = 4, /obj/item/disk/holodisk/kansatsu/mission/advertisement = 3 ) - - lootcount = 2 + spawn_loot_count = 2 /datum/preset_holoimage/cybersun_researcher outfit_type = /datum/outfit/job/syndicate/science/cybersun From 6c4a3dab2c2af3f880aad81b6e9ee916ee996e12 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:48:12 +0200 Subject: [PATCH 44/49] oopsie! --- code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm index d7fc543a7134..d673dd9c59bc 100644 --- a/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm +++ b/code/game/MapData/shuttles/syndicate_cybersun_kansatsu.dm @@ -176,7 +176,7 @@ /obj/effect/spawner/random/kansatsu_missions name = "Kansatsu Missions" - lootdoubles = FALSE + spawn_loot_double = FALSE loot = list( /obj/item/disk/holodisk/kansatsu/mission/safety = 3, /obj/item/disk/holodisk/kansatsu/mission/crew = 5, From 1fb2ea2e07b857513ae9b9db598c7c92859bbda1 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 26 Oct 2024 12:32:53 +0200 Subject: [PATCH 45/49] yea --- code/game/objects/items/storage/filled_guncases.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm index 91c5d9d7f02c..081133f1be1d 100644 --- a/code/game/objects/items/storage/filled_guncases.dm +++ b/code/game/objects/items/storage/filled_guncases.dm @@ -73,6 +73,10 @@ gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang/indie mag_type = /obj/item/ammo_box/magazine/boomslang/short +/obj/item/storage/guncase/pistol/himehabu + gun_type = /obj/item/gun/ballistic/automatic/pistol/himehabu + mag_type = /obj/item/ammo_box/magazine/m22lr_himehabu + /* Etherbor */ /obj/item/storage/guncase/pistol/kalixpistol From bc45bb4ea3323da61395df56cd00be62dc0b8601 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 26 Oct 2024 12:35:33 +0200 Subject: [PATCH 46/49] these guys should be together yea --- code/game/objects/items/storage/filled_guncases.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm index 081133f1be1d..d107ca4b5664 100644 --- a/code/game/objects/items/storage/filled_guncases.dm +++ b/code/game/objects/items/storage/filled_guncases.dm @@ -65,6 +65,10 @@ gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck/indie mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck +/obj/item/storage/guncase/pistol/himehabu + gun_type = /obj/item/gun/ballistic/automatic/pistol/himehabu + mag_type = /obj/item/ammo_box/magazine/m22lr_himehabu + /obj/item/storage/guncase/cobra gun_type = /obj/item/gun/ballistic/automatic/smg/cobra/indie mag_type = /obj/item/ammo_box/magazine/m45_cobra @@ -73,10 +77,6 @@ gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang/indie mag_type = /obj/item/ammo_box/magazine/boomslang/short -/obj/item/storage/guncase/pistol/himehabu - gun_type = /obj/item/gun/ballistic/automatic/pistol/himehabu - mag_type = /obj/item/ammo_box/magazine/m22lr_himehabu - /* Etherbor */ /obj/item/storage/guncase/pistol/kalixpistol From a5b578f81f96af9ecafc5bc53860c49b9a089950 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 27 Oct 2024 20:58:29 +0100 Subject: [PATCH 47/49] temporarily un-aspawned --- _maps/configs/syndicate_cybersun_kansatsu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index 8c8ce0e2e89a..1d494f120f4d 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -40,5 +40,5 @@ "slots": 2 } }, - "enabled": false + "enabled": true } From a109bef53321e02ceaedb58dc8cd8cf2b6793578 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Wed, 13 Nov 2024 12:41:17 +0100 Subject: [PATCH 48/49] this --- _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 3393fa867686..b134f5a71bf2 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -886,7 +886,7 @@ }, /obj/item/clothing/under/syndicate/gec, /obj/item/clothing/under/syndicate/cybersun/research, -/obj/item/clothing/gloves/color/red/insulated, +/obj/item/clothing/gloves/color/yellow, /obj/item/clothing/head/soft/cybersun, /obj/item/storage/belt/utility/full/engi, /obj/item/clothing/glasses/meson/engine, From 69391c7f49d774e41d42b7d6c044d79d441143fc Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 16 Nov 2024 11:47:59 +0100 Subject: [PATCH 49/49] lol --- _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index b134f5a71bf2..277552f8a5fb 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1621,7 +1621,7 @@ /area/ship/storage) "AM" = ( /obj/machinery/door/airlock/grunge{ - name = "kansatsu_bathroom"; + name = "Bathroom"; id_tag = "kansatsu_bathroom" }, /obj/machinery/door/firedoor/border_only,