From 4e0c5cf5ba8c5a435e92b1d32ad45510c252a294 Mon Sep 17 00:00:00 2001 From: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:32:13 -0400 Subject: [PATCH 01/41] Fixes a few ships' TEG setups (#3075) ## About The Pull Request Removes the disposals chutes some TEG setups have for you to throw lit welding tools into, and replaces them with proper igniters. ## Why It's Good For The Game Having a disposals chute to throw lit welding tools into was a stop-gap solution to igniters not working, which was fixed over a year ago in #1675. ## Changelog :cl: add: Adds an igniter and button to the TEG of every ship that was missing one del: Removed the welding tool TEG chute some ships had /:cl: --- .../independent/independent_lagoon.dmm | 39 ++++++------------- .../independent/independent_shetland.dmm | 23 +---------- _maps/shuttles/inteq/inteq_talos.dmm | 11 ++++-- .../shuttles/nanotrasen/nanotrasen_gecko.dmm | 21 ++++------ 4 files changed, 28 insertions(+), 66 deletions(-) diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm index 7e96d8f93b53..14823f92db63 100644 --- a/_maps/shuttles/independent/independent_lagoon.dmm +++ b/_maps/shuttles/independent/independent_lagoon.dmm @@ -930,12 +930,6 @@ }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/canteen) -"fZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering) "gb" = ( /turf/open/floor/plasteel, /area/ship/hallway/fore) @@ -1150,9 +1144,6 @@ /turf/open/floor/wood, /area/ship/crew/library) "hK" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 }, @@ -2507,12 +2498,6 @@ /obj/effect/turf_decal/corner/opaque/white/diagonal, /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) -"qq" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering) "qu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -3147,7 +3132,6 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "uV" = ( -/obj/structure/closet/radiation, /obj/machinery/firealarm/directional/west, /turf/open/floor/plating, /area/ship/engineering) @@ -5503,6 +5487,11 @@ /obj/effect/turf_decal/industrial/radiation{ dir = 10 }, +/obj/machinery/button/ignition/incinerator/atmos{ + dir = 4; + pixel_x = -27; + pixel_y = 8 + }, /turf/open/floor/plating, /area/ship/engineering) "LB" = ( @@ -5560,12 +5549,6 @@ /turf/open/floor/light, /area/ship/engineering) "Me" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/item/weldingtool, -/obj/item/weldingtool, /obj/machinery/button/door/incinerator_vent_atmos_aux{ dir = 4; pixel_x = -28; @@ -5581,6 +5564,9 @@ pixel_x = -28; pixel_y = -8 }, +/obj/machinery/computer/atmos_control/incinerator{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering) "Mf" = ( @@ -5610,13 +5596,11 @@ /turf/open/floor/wood, /area/ship/crew/library) "Mr" = ( -/obj/machinery/computer/atmos_control/incinerator{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/trimline/opaque/green/arrow_ccw, +/obj/structure/closet/radiation, /turf/open/floor/plating, /area/ship/engineering) "Mx" = ( @@ -5888,6 +5872,7 @@ /area/ship/hallway/fore) "Pc" = ( /obj/machinery/air_sensor/atmos/incinerator_tank, +/obj/machinery/igniter/incinerator_atmos, /turf/open/floor/engine, /area/ship/engineering) "Pe" = ( @@ -7664,7 +7649,7 @@ Pn Bz Pn Nr -qq +Pn hK Pc FA @@ -7705,7 +7690,7 @@ eS Vc Pn VS -fZ +Pn NB cT RC diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm index 13599cc298cf..e269c70cfefa 100644 --- a/_maps/shuttles/independent/independent_shetland.dmm +++ b/_maps/shuttles/independent/independent_shetland.dmm @@ -1895,7 +1895,6 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -2215,12 +2214,6 @@ /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/hallway/fore) -"sV" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) "sX" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -2299,9 +2292,6 @@ "tU" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /turf/open/floor/plating, /area/ship/engineering/engine) "tX" = ( @@ -2935,9 +2925,6 @@ pixel_x = -23; pixel_y = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /turf/open/floor/plating, /area/ship/engineering/engine) "yU" = ( @@ -4406,9 +4393,6 @@ pixel_x = -4; pixel_y = 10 }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /turf/open/floor/engine/vacuum, /area/ship/engineering/engine) "LQ" = ( @@ -5912,11 +5896,6 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "Zn" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/obj/item/weldingtool/mini, /turf/open/floor/plating, /area/ship/engineering/engine) "Zr" = ( @@ -6109,7 +6088,7 @@ pr NK yP qk -sV +Zn CZ vz on diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 1e08e3912dc6..f5f113f79e4a 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -2961,6 +2961,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1, +/obj/machinery/button/ignition/incinerator/atmos{ + dir = 4; + pixel_x = -30; + pixel_y = 12 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "sa" = ( @@ -3419,10 +3424,10 @@ }, /obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{ pixel_x = -8; - pixel_y = 8; + pixel_y = 8 }, /obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{ - pixel_x = -12; + pixel_x = -12 }, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) @@ -6310,6 +6315,7 @@ /obj/machinery/atmospherics/pipe/simple/purple/hidden{ dir = 4 }, +/obj/machinery/igniter/incinerator_atmos, /turf/open/floor/engine/vacuum, /area/ship/engineering/engine) "Ps" = ( @@ -7253,7 +7259,6 @@ }, /obj/machinery/button/door{ id = "talos_tank_burn"; - name = "Access Door Control"; pixel_x = 4; pixel_y = 21; req_access = null; diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm index 8314f17e288c..b05fd520c158 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -263,9 +263,6 @@ }, /area/ship/maintenance/starboard) "cv" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/igniter/incinerator_atmos, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -426,7 +423,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew) "dZ" = ( -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/ntspaceworks_big/one{ dir = 4 }, @@ -2843,9 +2839,6 @@ /turf/open/floor/plating, /area/ship/maintenance/fore) "CF" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/engine, /area/ship/engineering/engine) @@ -4360,9 +4353,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "Sv" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/power/generator{ dir = 4 }, @@ -4906,7 +4896,6 @@ /area/ship/hallway/fore) "WN" = ( /obj/machinery/atmospherics/components/binary/circulator, -/obj/structure/disposalpipe/segment, /turf/open/floor/engine, /area/ship/engineering/engine) "WR" = ( @@ -5257,9 +5246,13 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "ZS" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/button/ignition/incinerator/atmos{ + dir = 4; + pixel_x = -23; + pixel_y = -3 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "ZX" = ( From ba370c5e23e15bcd6864bb23a218b5a84a7f3a19 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 12:43:25 -0500 Subject: [PATCH 02/41] Automatic changelog generation for PR #3075 [ci skip] --- html/changelogs/AutoChangeLog-pr-3075.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3075.yml diff --git a/html/changelogs/AutoChangeLog-pr-3075.yml b/html/changelogs/AutoChangeLog-pr-3075.yml new file mode 100644 index 000000000000..554ff3998800 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3075.yml @@ -0,0 +1,6 @@ +author: SapphicOverload +changes: + - {rscadd: Adds an igniter and button to the TEG of every ship that was missing + one} + - {rscdel: Removed the welding tool TEG chute some ships had} +delete-after: true From b049c3b191884e2610969815c9d2d33a76101c84 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:34:11 -0700 Subject: [PATCH 03/41] Talos QOL Improvements (#3105) ## About The Pull Request ![talos2](https://github.com/shiptest-ss13/Shiptest/assets/60533805/f7fb731c-c2e6-4360-8c32-1375c2fe99f6) Makes some adjustments to address common issues with the Talos. - Areas have been changed so cargo no longer drops in the wings - Artificer Class II is now Honorable Artificer - Gas storage tank access buttons are restricted to Honorable Artificer - Comms and workshop have switched places - Crate shelves have been added to cargobay - Additional shuttle docks have been added on the starboard side - Added an autolathe to cargo - Removed Corpsmen ## Why It's Good For The Game Talos is a decent ship but had a few recurring problems. This fixes them. ## Changelog :cl: fix: Cargo pods no longer land in Talos maint fix: Gas tanks on the Talos have higher security fix: Talos now has an autolathe in cargo /:cl: --- _maps/configs/inteq_talos.json | 6 +- _maps/shuttles/inteq/inteq_talos.dmm | 1369 +++++++++-------- code/game/area/ship_areas.dm | 6 + .../clothing/outfits/factions/inteq.dm | 4 +- 4 files changed, 728 insertions(+), 657 deletions(-) diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json index e65253ad3239..207b29eca77b 100644 --- a/_maps/configs/inteq_talos.json +++ b/_maps/configs/inteq_talos.json @@ -27,7 +27,7 @@ "officer": true, "slots": 1 }, - "Artificer Class II": { + "Honorable Artificer": { "outfit": "/datum/outfit/job/inteq/ce", "officer": true, "slots": 1 @@ -36,10 +36,6 @@ "outfit": "/datum/outfit/job/inteq/engineer", "slots": 3 }, - "Corpsman": { - "outfit": "/datum/outfit/job/inteq/paramedic", - "slots": 2 - }, "Enforcer": { "outfit": "/datum/outfit/job/inteq/security", "slots": 1 diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index f5f113f79e4a..7a4a3bec6618 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -2,7 +2,7 @@ "ab" = ( /obj/structure/sign/number/four, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "ae" = ( /obj/structure/cable{ icon_state = "4-8" @@ -25,14 +25,14 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "ag" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 4 +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 8 }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/dark, +/area/ship/storage) "ak" = ( /obj/structure/cable{ icon_state = "2-8" @@ -41,25 +41,38 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "an" = ( -/obj/machinery/telecomms/processor/preset_four{ - autolinkers = list("processor4","bus"); - network = "irmg_commnet" +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "ao" = ( +/obj/docking_port/mobile{ + dir = 2; + launch_status = 0; + port_direction = 8; + preferred_direction = 4 + }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/communications) +/area/ship/storage) "ap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/engine/atmos, -/obj/item/tank/jetpack/oxygen, +/obj/effect/turf_decal/trimline/opaque/yellow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) +/area/ship/storage) "as" = ( /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/turf_decal/corner/opaque/brown{ @@ -82,10 +95,19 @@ /area/ship/engineering/engine) "au" = ( /obj/machinery/light/directional/east, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/obj/machinery/telecomms/server/presets/common{ + autolinkers = list("common","hub"); + freq_listening = list(1459); + network = "irmg_commnet" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) +"aD" = ( +/obj/machinery/computer/telecomms/monitor{ + network = "irmg_commnet" + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "aH" = ( /obj/machinery/button/door{ dir = 4; @@ -167,7 +189,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "bb" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/grunge{ @@ -232,13 +254,11 @@ icon_state = "0-8" }, /obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/telecomms/server/presets/common{ - autolinkers = list("common","hub"); - freq_listening = list(1459); - network = "irmg_commnet" +/obj/machinery/computer/rdconsole/core{ + dir = 8 }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "bI" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -253,7 +273,7 @@ /obj/structure/mopbucket, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "bM" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor{ @@ -277,14 +297,16 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, -/obj/structure/rack, /obj/machinery/light/directional/south, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable{ icon_state = "0-4" }, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, +/obj/structure/crate_shelf, +/obj/structure/closet/crate, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "ce" = ( @@ -326,7 +348,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "cn" = ( /obj/machinery/light/directional/south, /obj/structure/railing{ @@ -417,9 +439,6 @@ name = "waste input pump"; on = 0 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -445,19 +464,11 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "cT" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/window/northleft{ - req_access_txt = "61" - }, -/obj/machinery/door/window/southright{ - req_access_txt = "61" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/navbeacon/wayfinding{ + location = "talos_workshop" }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/dark, +/area/ship/storage) "cV" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/storage) @@ -525,7 +536,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "dw" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable{ @@ -540,7 +551,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "dE" = ( /obj/structure/chair/comfy/shuttle{ dir = 4; @@ -583,7 +594,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "ej" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -624,9 +635,6 @@ /turf/open/floor/plating, /area/ship/engineering) "em" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/effect/turf_decal/industrial/warning{ dir = 4 }, @@ -641,6 +649,9 @@ piping_layer = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "eu" = ( @@ -669,13 +680,16 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "eC" = ( -/obj/structure/table, -/obj/item/mecha_parts/mecha_equipment/rcd, -/obj/item/mecha_parts/mecha_equipment/cable_layer, -/obj/item/radio/intercom/directional/west, -/obj/machinery/cell_charger, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/obj/machinery/telecomms/broadcaster/preset_right{ + autolinkers = list("broadcasterB","hub"); + network = "irmg_commnet" + }, +/obj/structure/window/reinforced/survival_pod, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "eK" = ( /obj/effect/turf_decal/trimline/opaque/yellow/corner{ dir = 4 @@ -749,7 +763,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "fg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -778,18 +792,27 @@ /obj/structure/grille, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "fo" = ( -/obj/machinery/rnd/production/protolathe/department/engineering, /obj/machinery/camera/autoname{ dir = 9 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/obj/machinery/telecomms/receiver/preset_right{ + autolinkers = list("receiverB","hub"); + freq_listening = list(1347,1359); + network = "irmg_commnet" + }, +/obj/structure/window/reinforced/survival_pod, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "fr" = ( /obj/item/cigbutt, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "fC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/opaque/yellow/warning{ @@ -820,17 +843,17 @@ /area/ship/bridge) "fK" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "fN" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "fU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "fX" = ( /obj/structure/chair/stool{ dir = 1 @@ -913,14 +936,14 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "go" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "gp" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/effect/turf_decal/siding/thinplating, @@ -956,13 +979,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"gF" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "gG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1061,18 +1077,7 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/structure/closet/crate{ - name = "sandbags crate" - }, -/obj/item/storage/box/emptysandbags{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/storage/box/emptysandbags, -/obj/item/storage/box/emptysandbags{ - pixel_x = 5; - pixel_y = -5 - }, +/obj/structure/crate_shelf, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "hc" = ( @@ -1115,11 +1120,11 @@ "hm" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "hw" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "hz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood, @@ -1133,7 +1138,7 @@ pixel_y = 6 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "hG" = ( /obj/structure/railing{ dir = 6; @@ -1245,7 +1250,7 @@ /obj/item/cigbutt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "im" = ( /obj/structure/railing{ dir = 4 @@ -1273,7 +1278,7 @@ dir = 4 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "iy" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 1 @@ -1384,19 +1389,25 @@ }, /obj/item/cigbutt, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "iW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/navbeacon/wayfinding{ + location = "talos_telecomms" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/engineering/communications) "iZ" = ( /obj/effect/turf_decal/trimline/opaque/yellow/corner, /obj/effect/turf_decal/siding/thinplating/corner, @@ -1442,7 +1453,7 @@ "jj" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) +/area/ship/storage/port) "jl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1472,7 +1483,7 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "jw" = ( /obj/structure/cable{ icon_state = "1-8" @@ -1486,7 +1497,7 @@ /turf/open/floor/carpet/orange, /area/ship/bridge) "jH" = ( -/obj/structure/cable/yellow{ +/obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/door/firedoor/border_only, @@ -1498,17 +1509,36 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/highsecurity{ - name = "Communications"; - req_access_txt = "61" +/obj/machinery/door/airlock/engineering{ + name = "Storage Bay"; + req_access_txt = "10" }, /turf/open/floor/plasteel/tech, -/area/ship/engineering/communications) -"jJ" = ( -/obj/machinery/light/directional/east, -/obj/machinery/rnd/production/circuit_imprinter/department/engi, -/turf/open/floor/plasteel/tech/grid, /area/ship/storage) +"jJ" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/folder/syndicate{ + desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'"; + name = "folder" + }, +/obj/item/pen, +/obj/item/multitool{ + pixel_x = 12; + pixel_y = 8 + }, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/north{ + dir = 4; + freerange = 1; + freqlock = 1; + frequency = 1347; + name = "IRMG shortwave intercom"; + pixel_x = 31; + pixel_y = 0 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "jP" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -1571,13 +1601,13 @@ /area/ship/hallway/central) "jW" = ( /obj/machinery/light/directional/east, -/obj/machinery/computer/telecomms/server{ - dir = 1; - network = "irmg_commnet" - }, /obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/structure/closet/toolcloset/empty, +/obj/item/rcl/pre_loaded, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/plasteel/dark, +/area/ship/storage) "jX" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1612,8 +1642,8 @@ }, /obj/item/clothing/glasses/meson, /obj/machinery/light_switch{ - pixel_x = 20; dir = 8; + pixel_x = 20; pixel_y = 11 }, /turf/open/floor/plasteel/tech/grid, @@ -1654,14 +1684,14 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/secure/loot, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "ks" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "kD" = ( /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) @@ -1671,7 +1701,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "kM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1732,16 +1762,13 @@ /turf/open/floor/engine/hull/reinforced/interior, /area/ship/engineering/engine) "ls" = ( -/obj/machinery/telecomms/server/presets/inteq{ - autolinkers = list("inteq","hub"); - freq_listening = list(1347); - network = "irmg_commnet" - }, /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/industrial/outline/yellow, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "lt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -1751,9 +1778,6 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "lA" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -1772,22 +1796,16 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "lB" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/backpack/satchel/med, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/glasses/hud/health, -/obj/item/storage/belt/medical/webbing, -/obj/item/clothing/suit/armor/inteq/corpsman, -/obj/item/clothing/head/soft/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, -/obj/item/clothing/under/syndicate/inteq/corpsman, /obj/structure/railing, /obj/effect/turf_decal/box/corners{ dir = 8 }, /obj/item/radio/intercom/directional/west, -/obj/item/storage/box/bodybags, /obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/storage/bag/ore, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "lC" = ( @@ -1815,7 +1833,7 @@ "lI" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "lM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1833,7 +1851,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/storage/port) "lO" = ( /obj/structure/cable{ icon_state = "2-4" @@ -1884,7 +1902,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "mi" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 4 @@ -1929,15 +1947,18 @@ /area/ship/security) "ms" = ( /obj/machinery/light/directional/west, -/obj/machinery/power/smes/engineering, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" }, -/obj/structure/sign/warning/coldtemp{ - pixel_x = -32 +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 10 }, -/turf/open/floor/plating, -/area/ship/engineering/communications) +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10; + layer = 2.030 + }, +/turf/open/floor/plasteel/dark, +/area/ship/storage) "mw" = ( /obj/effect/turf_decal/borderfloor{ dir = 1 @@ -1958,18 +1979,11 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "mz" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 9 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "mC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1999,7 +2013,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "mJ" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/atmospherics/pipe/layer_manifold{ @@ -2091,10 +2105,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) -"nh" = ( -/obj/structure/bed/roller, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "nl" = ( /turf/open/floor/plasteel/grimy, /area/ship/crew) @@ -2163,17 +2173,17 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "nE" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, -/area/ship/engineering/communications) +/area/ship/storage) "nF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "nH" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/turf_decal/industrial/warning/fulltile, @@ -2182,7 +2192,7 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "nJ" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 4 @@ -2266,26 +2276,16 @@ "od" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo/port) +/area/ship/maintenance/port) "og" = ( -/obj/structure/catwalk, -/obj/structure/marker_beacon{ - picked_color = "Burgundy" - }, -/turf/open/floor/plating/airless, -/area/ship/external/dark) +/turf/closed/wall/mineral/plastitanium, +/area/ship/engineering/communications) "oi" = ( -/obj/item/storage/firstaid/medical{ - pixel_x = -5 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = 5 - }, /obj/machinery/camera/autoname, /obj/machinery/status_display/shuttle{ pixel_y = 32 }, -/obj/structure/table, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "om" = ( @@ -2298,9 +2298,8 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/yellow/warning, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/engineering/communications) "on" = ( /obj/structure/cable{ icon_state = "2-4" @@ -2389,7 +2388,7 @@ }, /obj/item/trash/popcorn, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "oG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -2397,7 +2396,7 @@ /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "oR" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -2413,7 +2412,7 @@ icon_state = "1-4" }, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "oT" = ( /obj/structure/cable{ icon_state = "2-4" @@ -2456,7 +2455,7 @@ "oY" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "pb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/jukebox/boombox{ @@ -2464,7 +2463,7 @@ pixel_y = -11 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "pf" = ( /obj/structure/cable{ icon_state = "0-4" @@ -2520,7 +2519,7 @@ valve_open = 1 }, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "pu" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -2561,7 +2560,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "pL" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -2626,11 +2625,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/navbeacon/wayfinding{ - location = "talos_telecomms" - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) +/obj/machinery/rnd/production/protolathe/department/engineering, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "qe" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2672,8 +2669,8 @@ dir = 4 }, /obj/machinery/light_switch{ - pixel_x = 19; dir = 8; + pixel_x = 19; pixel_y = 11 }, /turf/open/floor/plasteel/patterned/grid, @@ -2692,7 +2689,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "qr" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2707,14 +2704,14 @@ name = "Access Door Control"; pixel_x = 21; pixel_y = -6; - req_access_txt = "24" + req_access_txt = "56" }, /obj/machinery/button/shieldwallgen{ dir = 8; id = "talos_tank_air"; pixel_x = 19; pixel_y = 4; - req_access_txt = "24" + req_access_txt = "56" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -2783,8 +2780,8 @@ }, /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/light_switch{ - pixel_y = 23; - pixel_x = -12 + pixel_x = -12; + pixel_y = 23 }, /obj/structure/cable{ icon_state = "0-8" @@ -2833,8 +2830,8 @@ dir = 9 }, /obj/machinery/light_switch{ - pixel_x = 20; dir = 8; + pixel_x = 20; pixel_y = 11 }, /turf/open/floor/plasteel/tech, @@ -2897,7 +2894,7 @@ "rw" = ( /obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "rB" = ( /obj/effect/turf_decal/trimline/opaque/yellow/warning, /turf/open/floor/engine/hull/reinforced, @@ -2921,7 +2918,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "rP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2963,43 +2960,27 @@ /obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1, /obj/machinery/button/ignition/incinerator/atmos{ dir = 4; - pixel_x = -30; - pixel_y = 12 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) -"sa" = ( -/obj/effect/turf_decal/box/corners, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) -"sc" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/folder/syndicate{ - desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'"; - name = "folder" - }, -/obj/item/pen, -/obj/item/multitool{ - pixel_x = 12; - pixel_y = 8 - }, -/obj/item/radio/intercom/directional/north{ - freerange = 1; - freqlock = 1; - frequency = 1347; - name = "IRMG shortwave intercom" + pixel_x = -30; + pixel_y = 12 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) +"sa" = ( +/obj/effect/turf_decal/box/corners, +/obj/structure/cable{ + icon_state = "2-4" }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) +"sc" = ( /obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/machinery/rnd/server, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "si" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "sl" = ( /obj/machinery/door/airlock/maintenance_hatch{ dir = 4 @@ -3011,7 +2992,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "sn" = ( /obj/structure/chair/stool{ dir = 1 @@ -3064,7 +3045,7 @@ /area/template_noop) "sy" = ( /turf/closed/wall/mineral/plastitanium, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "sA" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -3081,7 +3062,7 @@ pixel_y = -32 }, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "sD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -3089,7 +3070,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "sF" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -3247,11 +3228,11 @@ icon_state = "2-8" }, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "ti" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "tp" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -3294,7 +3275,7 @@ "ts" = ( /obj/structure/sign/number/one, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "tu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -3306,8 +3287,14 @@ dir = 6 }, /obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 5 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, /turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) +/area/ship/storage) "tA" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/engineering) @@ -3343,14 +3330,27 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) +"tM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 6 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 + }, +/obj/effect/landmark/start/station_engineer, +/obj/structure/chair/office, +/turf/open/floor/plasteel/dark, +/area/ship/storage) "tO" = ( -/obj/machinery/computer/telecomms/monitor{ - dir = 1; - network = "irmg_commnet" +/obj/effect/turf_decal/siding/thinplating/dark/end{ + dir = 4 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/dark, +/area/ship/storage) "tT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3386,13 +3386,13 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "uc" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/carpet, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "ud" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -3446,7 +3446,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "up" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 1 @@ -3471,10 +3471,10 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/structure/closet/crate/freezer/blood, /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/west, +/obj/machinery/autolathe, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "uC" = ( @@ -3501,22 +3501,17 @@ /turf/open/floor/plating, /area/ship/engineering) "uE" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/navbeacon/wayfinding{ - location = "talos_workshop" - }, -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/turf/open/floor/plasteel/tech, +/area/ship/engineering/communications) "uI" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "uO" = ( /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/machinery/iv_drip, +/obj/structure/table, +/obj/item/storage/box/cups, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "vi" = ( @@ -3524,7 +3519,7 @@ dir = 1 }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) +/area/ship/storage/port) "vn" = ( /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/turf_decal/corner/opaque/brown{ @@ -3552,7 +3547,7 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "vp" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/engineering/communications) "vv" = ( /obj/structure/cable/yellow{ @@ -3590,36 +3585,15 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "vM" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "ce"; - name = "artificer class II's locker"; - req_access = null; - req_access_txt = "56" - }, -/obj/item/clothing/under/syndicate/inteq/artificer, -/obj/item/clothing/under/syndicate/inteq/skirt/artificer, -/obj/item/storage/backpack/industrial, -/obj/item/clothing/suit/toggle/industrial, -/obj/item/clothing/head/hardhat/white, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/mask/gas/sechailer/balaclava/inteq, -/obj/item/clothing/gloves/combat, -/obj/item/megaphone/cargo{ - name = "engineering megaphone" - }, -/obj/item/stamp/ce{ - name = "artificer class II's rubber stamp" +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 5 }, -/obj/item/clothing/glasses/meson/engine, -/obj/item/clothing/glasses/welding, -/obj/item/pipe_dispenser, -/obj/item/storage/belt/utility/chief{ - name = "\improper Artificer Class II's toolbelt" +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, +/obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) +/area/ship/storage) "vP" = ( /obj/item/cigbutt, /turf/open/floor/plasteel/dark, @@ -3677,14 +3651,14 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "wb" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 8 +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 4 }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/dark, +/area/ship/storage) "wc" = ( /obj/structure/cable{ icon_state = "1-8" @@ -3729,10 +3703,16 @@ dir = 1 }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) +/area/ship/storage/port) "wx" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) +/area/ship/storage) "wy" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3809,7 +3789,7 @@ "wU" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "wY" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -3884,13 +3864,22 @@ "xj" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/cryo) +"xk" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 4; + height = 15; + width = 15 + }, +/turf/template_noop, +/area/template_noop) "xl" = ( -/obj/machinery/telecomms/bus/preset_four{ - autolinkers = list("hub","processor4","bus"); - network = "irmg_commnet" +/obj/machinery/mech_bay_recharge_port, +/obj/machinery/status_display/shuttle{ + pixel_y = -32 }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "xn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3921,18 +3910,17 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "xz" = ( -/obj/machinery/telecomms/broadcaster/preset_right{ - autolinkers = list("broadcasterB","hub"); - network = "irmg_commnet" - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/item/weldingtool/largetank, +/obj/item/clothing/glasses/welding, +/obj/item/multitool, +/obj/item/radio/intercom/directional/west, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "xB" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3959,14 +3947,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "xI" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/canteen) "xK" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -4033,10 +4018,20 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/cable/yellow, -/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/opaque/yellow/warning{ + dir = 9 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) +/area/ship/storage) "yj" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -4074,7 +4069,7 @@ /area/ship/hallway/central) "yp" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) +/area/ship/storage/port) "yq" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -4096,14 +4091,12 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "yr" = ( -/obj/structure/chair/office, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/effect/landmark/start/chief_engineer, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) +/obj/machinery/rnd/production/circuit_imprinter/department/engi, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "yx" = ( /obj/structure/table/reinforced, /obj/machinery/computer/secure_data/laptop, @@ -4145,7 +4138,7 @@ icon_state = "4-8" }, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "yS" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4171,7 +4164,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "zf" = ( /obj/item/storage/backpack/messenger/inteq, /obj/item/storage/backpack/messenger/inteq, @@ -4196,7 +4189,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "zh" = ( /obj/machinery/holopad/emergency/command, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4226,8 +4219,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/mecha_parts/mecha_equipment/rcd, +/obj/item/mecha_parts/mecha_equipment/cable_layer, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "zu" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -4263,17 +4260,14 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 10 - }, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/engineering/communications) "zB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/trashcart, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "zE" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/structure/cable{ @@ -4312,18 +4306,18 @@ icon_state = "2-4" }, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "zR" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera/autoname{ + dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 }, -/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/engineering/communications) "zT" = ( /obj/structure/chair/stool/bar{ dir = 8 @@ -4351,7 +4345,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "Ag" = ( /obj/structure/chair/stool{ dir = 1 @@ -4399,7 +4393,7 @@ /area/ship/crew/toilet) "Ap" = ( /turf/closed/wall/mineral/plastitanium, -/area/ship/cargo/port) +/area/ship/maintenance/port) "Ar" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4; @@ -4436,7 +4430,7 @@ "AB" = ( /obj/docking_port/stationary{ dir = 4; - dwidth = 4; + dwidth = 3; height = 15; width = 6 }, @@ -4491,7 +4485,7 @@ /obj/item/mop, /obj/item/pushbroom, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "AO" = ( /obj/machinery/suit_storage_unit/inherit/industrial, /obj/item/clothing/suit/space/hardsuit/engine, @@ -4591,7 +4585,7 @@ /obj/item/clothing/suit/space/inteq, /obj/item/clothing/head/helmet/space/inteq, /turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) +/area/ship/storage/port) "BJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4619,26 +4613,30 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "BP" = ( /obj/structure/cable{ icon_state = "1-4" }, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "BS" = ( /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/machinery/mineral/ore_redemption{ - dir = 4; - input_dir = 4; - output_dir = 0 - }, /obj/machinery/light_switch{ dir = 4; pixel_x = -19 }, +/obj/structure/crate_shelf, +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/medical{ + pixel_x = -5 + }, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "BY" = ( @@ -4711,7 +4709,7 @@ /obj/item/book/random, /obj/item/book/random, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "CK" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -4725,13 +4723,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "CP" = ( /obj/effect/turf_decal/borderfloor, -/obj/machinery/door/airlock/engineering{ - name = "Storage Bay"; - req_access_txt = "10" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -4741,13 +4735,16 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/airlock/highsecurity{ + name = "Communications"; + req_access_txt = "61" + }, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/engineering/communications) "CS" = ( /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/structure/bed/roller, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -4818,7 +4815,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/reagent_dispensers/watertank, +/obj/structure/crate_shelf, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ds" = ( @@ -4838,7 +4835,7 @@ dir = 1 }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) +/area/ship/storage/port) "DC" = ( /obj/effect/turf_decal/box/corners, /obj/structure/closet/crate{ @@ -4858,11 +4855,12 @@ /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, /obj/effect/decal/cleanable/dirt, +/obj/structure/crate_shelf, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "DO" = ( /turf/closed/wall/mineral/plastitanium, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "DQ" = ( /obj/effect/turf_decal/borderfloor{ dir = 1 @@ -4894,9 +4892,12 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "Eg" = ( -/obj/machinery/mech_bay_recharge_port, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/obj/machinery/telecomms/bus/preset_four{ + autolinkers = list("hub","processor4","bus"); + network = "irmg_commnet" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "Ep" = ( /obj/item/trash/can, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -4909,22 +4910,23 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/item/cigbutt, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Ex" = ( /obj/structure/cable{ icon_state = "1-4" }, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "EC" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 +/obj/structure/window/reinforced/survival_pod, +/obj/structure/window/reinforced/survival_pod{ + dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "EL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4952,7 +4954,7 @@ "Ff" = ( /obj/structure/sign/number/nine, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Fh" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable{ @@ -4960,7 +4962,7 @@ }, /obj/item/cigbutt, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "Fi" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -4970,23 +4972,17 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "Fk" = ( -/obj/structure/catwalk, -/obj/docking_port/mobile{ - dir = 2; - launch_status = 0; - port_direction = 8; - preferred_direction = 4 - }, /obj/structure/marker_beacon{ picked_color = "Burgundy" }, +/obj/structure/catwalk, /turf/open/floor/plating/airless, /area/ship/external/dark) "Fl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Fm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5100,7 +5096,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "FV" = ( /obj/structure/catwalk/over/plated_catwalk, /obj/structure/railing, @@ -5144,7 +5140,7 @@ dir = 4 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/storage/port) "Gm" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/external, @@ -5157,7 +5153,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Gr" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ dir = 8 @@ -5195,7 +5191,7 @@ /obj/item/clothing/suit/space/inteq, /obj/item/clothing/head/helmet/space/inteq, /turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Gv" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 1 @@ -5218,13 +5214,12 @@ /area/ship/crew/canteen) "Gz" = ( /obj/machinery/light/directional/south, -/obj/machinery/telecomms/hub{ - autolinkers = list("hub","bus","relay","messaging","inteq","common","broadcasterB","receiverB"); - id = "IRMG Communications Hub"; - network = "irmg_commnet" +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/mecha/working/ripley/cargo{ + name = "\improper APLU 'Big Boss'" }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/storage) "GA" = ( /obj/machinery/porta_turret/ship/weak{ dir = 5 @@ -5258,7 +5253,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "GR" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -5289,7 +5284,7 @@ icon_state = "1-8" }, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "He" = ( /obj/effect/turf_decal/techfloor{ dir = 4 @@ -5315,22 +5310,24 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/robot_debris, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "Hl" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/obj/item/weldingtool/largetank, -/obj/item/clothing/glasses/welding, -/obj/item/multitool, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/obj/machinery/computer/telecomms/server{ + network = "irmg_commnet" + }, +/obj/item/radio/intercom/directional/north{ + dir = 4; + pixel_x = 31; + pixel_y = 0 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "Ho" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Hp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5352,6 +5349,7 @@ /area/ship/engineering) "HD" = ( /obj/machinery/firealarm/directional/south, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "HI" = ( @@ -5384,7 +5382,7 @@ "If" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Io" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -5460,7 +5458,7 @@ /obj/item/circuitboard/machine/telecomms/message_server, /obj/item/circuitboard/machine/pacman, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "ID" = ( /obj/machinery/door/airlock/public/glass{ name = "Cryogenic Storage" @@ -5483,7 +5481,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "IJ" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -5539,7 +5537,7 @@ "Jk" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Jo" = ( /obj/structure/cable{ icon_state = "2-5" @@ -5561,16 +5559,16 @@ id = "talos_tank_fuel"; pixel_x = 19; pixel_y = 4; - req_access_txt = "24" + req_access_txt = "56" }, /obj/machinery/button/door{ - color = "red"; + color = null; dir = 8; id = "talos_tank_fuel"; - name = "Access Door Control (DANGER) (EXTREMELY DANGEROUS) (DO NOT PRESS)"; + name = "Access Door Control"; pixel_x = 21; pixel_y = -6; - req_access_txt = "24" + req_access_txt = "56" }, /obj/structure/cable{ icon_state = "1-8" @@ -5610,7 +5608,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "JP" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -5687,8 +5685,19 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Kf" = ( -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/window/northleft{ + req_access_txt = "61" + }, +/obj/machinery/door/window/southright{ + req_access_txt = "61" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/communications) "Ks" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5732,7 +5741,7 @@ icon_state = "0-2" }, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "KF" = ( /obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -5755,7 +5764,7 @@ dir = 4 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "KR" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5774,7 +5783,7 @@ icon_state = "1-8" }, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "KY" = ( /obj/effect/turf_decal/borderfloor, /obj/machinery/door/airlock/public/glass{ @@ -5852,7 +5861,7 @@ /obj/effect/turf_decal/industrial/warning/fulltile, /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "LJ" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -5903,14 +5912,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 }, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/engineering/communications) "LU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5928,16 +5937,11 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "LV" = ( -/obj/machinery/telecomms/receiver/preset_right{ - autolinkers = list("receiverB","hub"); - freq_listening = list(1347,1359); - network = "irmg_commnet" - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/obj/machinery/autolathe, +/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/glass/five, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "Ma" = ( /obj/effect/turf_decal/industrial/fire{ dir = 4 @@ -5948,6 +5952,9 @@ /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, /area/ship/engineering/engine) +"Me" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/template_noop) "Mf" = ( /obj/structure/chair{ dir = 4 @@ -5999,7 +6006,7 @@ }, /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Mx" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -6017,35 +6024,30 @@ icon_state = "0-2" }, /obj/machinery/light_switch{ - pixel_y = 23; - pixel_x = -12 + pixel_x = -12; + pixel_y = 23 }, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "My" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/obj/machinery/suit_storage_unit/inherit/industrial, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/clothing/suit/space/hardsuit/engine/elite, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/communications) "MC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 +/obj/effect/landmark/start/chief_engineer, +/obj/structure/chair/office{ + dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 4 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 }, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/engineering/communications) "MK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -6057,7 +6059,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/secure/loot, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "MS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6080,7 +6082,19 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/ore_box, +/obj/structure/crate_shelf, +/obj/structure/closet/crate{ + name = "sandbags crate" + }, +/obj/item/storage/box/emptysandbags{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/storage/box/emptysandbags, +/obj/item/storage/box/emptysandbags{ + pixel_x = -5; + pixel_y = 5 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "MX" = ( @@ -6106,17 +6120,17 @@ icon_state = "2-8" }, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Ng" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Ni" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Nj" = ( /obj/effect/turf_decal/box/corners, /obj/machinery/button/shieldwallgen{ @@ -6134,6 +6148,7 @@ }, /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Nk" = ( @@ -6166,7 +6181,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "NK" = ( /turf/open/floor/engine/air, /area/ship/engineering/engine) @@ -6213,19 +6228,52 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Oc" = ( -/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Oi" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 10 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10; + layer = 2.030 + }, +/turf/open/floor/plasteel/dark, +/area/ship/storage) "Ok" = ( -/obj/machinery/rnd/server, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "ce"; + name = "honorable artificer's locker"; + req_access_txt = "56" + }, +/obj/item/clothing/under/syndicate/inteq/artificer, +/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/storage/backpack/industrial, +/obj/item/clothing/suit/toggle/industrial, +/obj/item/clothing/head/hardhat/white, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/mask/gas/sechailer/balaclava/inteq, +/obj/item/clothing/gloves/combat, +/obj/item/megaphone/cargo{ + name = "engineering megaphone" + }, +/obj/item/stamp/ce{ + name = "honorable artificer's rubber stamp" + }, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/welding, +/obj/item/pipe_dispenser, +/obj/item/storage/belt/utility/chief{ + name = "honorable artificer's toolbelt" + }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/area/ship/engineering/communications) "Oq" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -6283,12 +6331,19 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "Pf" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/ship/external/dark) +"Pi" = ( +/obj/structure/catwalk, +/obj/structure/marker_beacon{ + picked_color = "Burgundy" + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) "Pk" = ( /obj/machinery/door/poddoor/shutters{ dir = 4; @@ -6309,7 +6364,7 @@ /area/ship/engineering/engine) "Pp" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo/port) +/area/ship/maintenance/port) "Pr" = ( /obj/machinery/air_sensor/atmos/incinerator_tank, /obj/machinery/atmospherics/pipe/simple/purple/hidden{ @@ -6329,7 +6384,7 @@ /obj/effect/spawner/lootdrop/maintenance/three, /obj/structure/closet/crate, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Pw" = ( /obj/machinery/porta_turret/ship/weak{ dir = 10 @@ -6360,7 +6415,7 @@ dir = 1 }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) +/area/ship/storage/port) "PJ" = ( /obj/effect/turf_decal/techfloor{ dir = 1 @@ -6489,7 +6544,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "QC" = ( /obj/structure/chair/stool{ dir = 1 @@ -6518,11 +6573,8 @@ "QS" = ( /obj/structure/sign/number/eight, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "QU" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1; @@ -6542,7 +6594,7 @@ icon_state = "4-8" }, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "QW" = ( /obj/structure/cable{ icon_state = "2-4" @@ -6550,7 +6602,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "QZ" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 8; @@ -6566,14 +6618,11 @@ /turf/open/floor/engine/hull/reinforced/interior, /area/ship/engineering/engine) "Rc" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 5 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "Rg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6592,14 +6641,14 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "Rp" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Rs" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/structure/cable{ @@ -6612,7 +6661,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Ry" = ( /obj/structure/cable{ icon_state = "0-4" @@ -6665,16 +6714,22 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) +"RO" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 6 + }, +/turf/closed/wall/mineral/plastitanium, +/area/template_noop) "RT" = ( /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "RV" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/plasma, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, -/area/ship/cargo/port) +/area/ship/maintenance/port) "RW" = ( /obj/machinery/turretid/lethal{ pixel_y = 32 @@ -6693,7 +6748,7 @@ dir = 4 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/storage/port) "Si" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 1 @@ -6748,9 +6803,12 @@ /turf/open/floor/plating, /area/ship/engineering) "Su" = ( -/obj/machinery/computer/mech_bay_power_console, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/obj/machinery/telecomms/processor/preset_four{ + autolinkers = list("processor4","bus"); + network = "irmg_commnet" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "SB" = ( /obj/structure/cable{ icon_state = "1-8" @@ -6795,7 +6853,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "SI" = ( /obj/structure/cable{ icon_state = "2-8" @@ -6818,14 +6876,15 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "SK" = ( -/obj/structure/closet/toolcloset/empty, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/electrical, -/obj/item/rcl/pre_loaded, /obj/machinery/light/directional/west, -/obj/effect/turf_decal/industrial/outline/yellow, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, /turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/area/ship/engineering/communications) "SL" = ( /obj/machinery/power/shuttle/engine/fueled/plasma{ dir = 4 @@ -6873,14 +6932,15 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "Tg" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 +/obj/structure/window/reinforced/survival_pod, +/obj/structure/window/reinforced/survival_pod{ + dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "Tj" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6890,7 +6950,6 @@ /area/ship/bridge) "Tq" = ( /obj/effect/turf_decal/box/corners, -/obj/effect/landmark/start/medical_doctor, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "TA" = ( @@ -6921,7 +6980,7 @@ icon_state = "4-8" }, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "TH" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/effect/decal/cleanable/dirt, @@ -6929,7 +6988,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "TK" = ( /obj/structure/window/reinforced{ dir = 4 @@ -6963,12 +7022,12 @@ "TN" = ( /obj/structure/falsewall/plastitanium, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "TO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "TS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7000,7 +7059,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/loot, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Uc" = ( /obj/structure/cable{ icon_state = "1-4" @@ -7100,15 +7159,15 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Uy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "UD" = ( /turf/closed/wall/mineral/plastitanium, -/area/ship/maintenance/port) +/area/ship/storage/port) "UG" = ( /obj/machinery/button/door{ dir = 4; @@ -7139,6 +7198,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"UO" = ( +/obj/machinery/light/directional/south, +/turf/template_noop, +/area/template_noop) "UP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7162,7 +7225,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "Ve" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -7183,15 +7246,12 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "Vg" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/warning{ - dir = 1 - }, /obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "Vj" = ( /obj/structure/table/reinforced, /obj/structure/sign/poster/contraband/red_rum{ @@ -7219,7 +7279,7 @@ /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "Vr" = ( /obj/item/trash/boritos, /turf/open/floor/plasteel/grimy, @@ -7230,7 +7290,7 @@ }, /obj/structure/grille, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "Vz" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, @@ -7310,7 +7370,7 @@ "Wd" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "We" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7339,7 +7399,7 @@ "Wg" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Wh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7356,7 +7416,7 @@ }, /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/storage/port) "Wp" = ( /obj/structure/window/reinforced{ dir = 4 @@ -7373,7 +7433,7 @@ /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Wz" = ( /obj/machinery/computer/helm{ dir = 8 @@ -7542,7 +7602,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "Yt" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -7604,7 +7664,15 @@ "YI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) +"YK" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/opaque/yellow/warning, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/plasteel/dark, +/area/ship/storage) "YU" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/structure/cable{ @@ -7615,33 +7683,34 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "YX" = ( /obj/structure/grille, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "YZ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Zb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/garbage, /turf/open/floor/plating/airless, -/area/ship/cargo/port) +/area/ship/maintenance/port) "Zc" = ( -/obj/mecha/working/ripley/cargo{ - name = "\improper APLU 'Big Boss'" - }, -/obj/effect/turf_decal/industrial/outline/yellow, /obj/machinery/status_display/shuttle{ pixel_y = 32 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/storage) +/obj/machinery/telecomms/hub{ + autolinkers = list("hub","bus","relay","messaging","inteq","common","broadcasterB","receiverB"); + id = "IRMG Communications Hub"; + network = "irmg_commnet" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "Zd" = ( /obj/machinery/door/airlock{ dir = 4; @@ -7668,7 +7737,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/firecloset, /turf/open/floor/plating/airless, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "Zj" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/effect/turf_decal/siding/thinplating, @@ -7685,7 +7754,7 @@ name = "vanguard's spare bedsheet" }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) "Zn" = ( /obj/structure/closet/emcloset/empty{ anchored = 1; @@ -7706,7 +7775,7 @@ /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) +/area/ship/storage/port) "Zo" = ( /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ @@ -7732,15 +7801,13 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Zu" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-4" +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/obj/structure/sign/warning/coldtemp{ + pixel_x = -32 }, -/obj/machinery/autolathe, -/obj/item/stack/sheet/metal/five, -/obj/item/stack/sheet/glass/five, /turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/area/ship/engineering/communications) "ZB" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -7782,31 +7849,33 @@ /area/ship/engineering/engine) "ZU" = ( /obj/machinery/light/directional/west, -/obj/machinery/computer/rdconsole/core{ - dir = 4 +/obj/machinery/telecomms/server/presets/inteq{ + autolinkers = list("inteq","hub"); + freq_listening = list(1347); + network = "irmg_commnet" }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "ZV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/area/ship/storage/port) "ZY" = ( /obj/structure/cable{ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/area/ship/storage/starboard) (1,1,1) = {" sw sw sw -sw +Pi sw sw tA @@ -7832,15 +7901,15 @@ ie sw sw sw -og +sw sw sw "} (2,1,1) = {" sw +Fk sw -sw -sw +MV sw hL OF @@ -7866,15 +7935,15 @@ pU Ar sw sw -MV +sw sw sw "} (3,1,1) = {" sw +MV sw -sw -sw +MV sw ia bM @@ -7900,15 +7969,15 @@ WH Pm sw sw -MV +sw sw sw "} (4,1,1) = {" sw +MV sw -sw -sw +MV sw vE OF @@ -7934,19 +8003,19 @@ pU pU sw sw -MV +sw sw sw "} (5,1,1) = {" sw Bd -sV -sV -sV -sV -sV -sV +vp +vp +vp +vp +vp +vp AO cj qD @@ -7964,23 +8033,23 @@ lA cF xK QU -ao -ao -ao -ao -ao +sV +sV +sV +sV +sV Pw sw "} (6,1,1) = {" -cV -sV +og +vp ZU eC Zu SK Ok -sV +vp HB MS yL @@ -8003,18 +8072,18 @@ yc ms xz ls -ao -vp +sV +cV "} (7,1,1) = {" -sV +vp Eg mz EC My LT zz -sV +vp Sj Qq ek @@ -8032,16 +8101,16 @@ bA pU lq mJ -ao +sV tu ap ag Oi xl -ao +sV "} (8,1,1) = {" -sV +vp Zc Vg Kf @@ -8070,19 +8139,19 @@ nE qc wx cT -Oi +YK Gz ao "} (9,1,1) = {" -sV +vp Su Rc Tg -Tg +aD MC zR -sV +vp jY gk iE @@ -8104,19 +8173,19 @@ nE zt vM wb -Oi +tM an -ao +sV "} (10,1,1) = {" -cV -sV +og +vp au fo Hl jJ -sV -sV +vp +vp sW sW sW @@ -8134,19 +8203,19 @@ xI pU NK NK -ao +sV yr tO LV bF -ao -vp +sV +cV "} (11,1,1) = {" sw GA -sV -sV +vp +vp sW sW sW @@ -8168,19 +8237,19 @@ xI pU NK NK -ao +sV sc jW -ao -ao +sV +sV Xa -MV +sw "} (12,1,1) = {" sw +MV sw -sw -cV +og sW zf GG @@ -8202,17 +8271,17 @@ xI pU pU pU -ao -ao -ao -vp -MV +sV +sV +sV +cV +sw +sw sw -MV "} (13,1,1) = {" sw -sw +MV sw sw sW @@ -8240,13 +8309,13 @@ An la sw sw -MV sw -MV +sw +sw "} (14,1,1) = {" sw -sw +MV sw JT sW @@ -8274,13 +8343,13 @@ qo la sw sw -MV sw -MV +sw +sw "} (15,1,1) = {" sw -sw +MV sw mU hg @@ -8308,13 +8377,13 @@ hT hT hT sw -MV sw -MV +sw +sw "} (16,1,1) = {" sw -sw +Pi sw mU Ml @@ -8342,9 +8411,9 @@ wD ot hT sw -MV sw -MV +sw +sw "} (17,1,1) = {" sw @@ -8375,10 +8444,10 @@ hT Zo Fe zw +xk +sw sw -MV sw -Fk "} (18,1,1) = {" sw @@ -8410,7 +8479,7 @@ zo NC hT sw -og +sw sw sw "} @@ -8521,7 +8590,7 @@ sw sw sw sw -sw +Me lC Ks IT @@ -8565,7 +8634,7 @@ zh jc Lc uO -gF +Ic nY ua MW @@ -8589,7 +8658,7 @@ sw sw sw sw -sw +UO lC ae bU @@ -8599,7 +8668,7 @@ WR Tj mX oi -nh +Oc iy qB Oc @@ -8657,7 +8726,7 @@ sw sw sw sw -sw +Me lC qF Zj @@ -8690,8 +8759,8 @@ sw sw sw sw -sw -sw +Me +RO lC UP gp @@ -9627,7 +9696,7 @@ sw sw sw sw -sw +jd sw sw sw diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm index 9fab6e35b3c6..9732893523b7 100644 --- a/code/game/area/ship_areas.dm +++ b/code/game/area/ship_areas.dm @@ -464,6 +464,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "storage" sound_environment = SOUND_AREA_STANDARD_STATION +/area/ship/storage/port + name = "Port Storage Bay" + +/area/ship/storage/starboard + name = "Starboard Storage Bay" + /area/ship/storage/eva name = "EVA Storage" icon_state = "eva" diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm index 75a36b1a3132..ee48b1872854 100644 --- a/code/modules/clothing/outfits/factions/inteq.dm +++ b/code/modules/clothing/outfits/factions/inteq.dm @@ -71,8 +71,8 @@ ///Chief Engineer /datum/outfit/job/inteq/ce - name = "IRMG - Artificer Class II" - id_assignment = "Artificer Class II" + name = "IRMG - Honorable Artificer" + id_assignment = "Honorable Artificer" job_icon = "chiefengineer" jobtype = /datum/job/chief_engineer From 7cc3bcc7cc9743a212591a9486d789c1e1c4ded6 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 12:59:12 -0500 Subject: [PATCH 04/41] Automatic changelog generation for PR #3105 [ci skip] --- html/changelogs/AutoChangeLog-pr-3105.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3105.yml diff --git a/html/changelogs/AutoChangeLog-pr-3105.yml b/html/changelogs/AutoChangeLog-pr-3105.yml new file mode 100644 index 000000000000..0e792045f197 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3105.yml @@ -0,0 +1,6 @@ +author: Apogee-dev +changes: + - {bugfix: Cargo pods no longer land in Talos maint} + - {bugfix: Gas tanks on the Talos have higher security} + - {bugfix: Talos now has an autolathe in cargo} +delete-after: true From 45326f2fb45ecd5a35b8e6d5e34b726ac2bebaa0 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:37:32 -0700 Subject: [PATCH 05/41] Reduces ship spawn limit for everything to 1 (#3166) ## About The Pull Request Reduces the spawn limit for every ship to 1, and makes the default limit for new ships 1. ## Why It's Good For The Game Nearly every ship was already set to a limit of 1. Making it the default just saves time. Most of the handful of ships that still had a cap of 2- mudskipper, li tieguai, and delta, for instance - were ships that would just compete for pop or nudge each other out of their niche if double-spawned, and a greater variety of ships are available to accept players after existing ones fill up than there previously were. ## Changelog :cl: balance: reduced default ship spawn limit to 1. /:cl: --- _maps/configs/independent_beluga.json | 2 +- _maps/configs/independent_mudskipper.json | 2 +- _maps/configs/independent_schmiedeberg.json | 2 +- _maps/configs/nanotrasen_gecko.json | 2 +- _maps/example_ship_config.json | 2 +- _maps/ship_config_schema.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json index 6d7926a8e845..0449bc3a8cae 100644 --- a/_maps/configs/independent_beluga.json +++ b/_maps/configs/independent_beluga.json @@ -12,7 +12,7 @@ "Service" ], "starting_funds": 4000, - "limit": 2, + "limit": 1, "job_slots": { "Captain": { "outfit": "/datum/outfit/job/independent/captain", diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json index 9f4cf32e0cf8..6119b39865d0 100644 --- a/_maps/configs/independent_mudskipper.json +++ b/_maps/configs/independent_mudskipper.json @@ -14,7 +14,7 @@ "SPACE" ], "map_path": "_maps/shuttles/independent/independent_mudskipper.dmm", - "limit": 2, + "limit": 1, "starting_funds": 1500, "job_slots": { "Salvage Leader": { diff --git a/_maps/configs/independent_schmiedeberg.json b/_maps/configs/independent_schmiedeberg.json index d7dd360bb1e4..e9cffc680320 100644 --- a/_maps/configs/independent_schmiedeberg.json +++ b/_maps/configs/independent_schmiedeberg.json @@ -14,7 +14,7 @@ "SUNS", "GENERAL" ], - "limit": 2, + "limit": 1, "job_slots": { "Chief Pharmacist": { "outfit": "/datum/outfit/job/independent/cmo/pharma", diff --git a/_maps/configs/nanotrasen_gecko.json b/_maps/configs/nanotrasen_gecko.json index 9ba0672f03db..01568c3c1d53 100644 --- a/_maps/configs/nanotrasen_gecko.json +++ b/_maps/configs/nanotrasen_gecko.json @@ -14,7 +14,7 @@ "Mining", "Engineering" ], - "limit": 2, + "limit": 1, "starting_funds": 5000, "job_slots": { "Captain": { diff --git a/_maps/example_ship_config.json b/_maps/example_ship_config.json index 7c34d7bc6841..0f4129fa3d5d 100644 --- a/_maps/example_ship_config.json +++ b/_maps/example_ship_config.json @@ -5,7 +5,7 @@ "prefix": "STSV", "namelists": ["GENERAL", "SPACE", "MYTHOLOGICAL", "WEAPONS"], "map_path": "_maps/shuttles/shiptest/null.dmm", - "limit": 2, + "limit": 1, "spawn_time_coeff": 1.5, "officer_time_coeff": 0.5, "job_slots": { diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json index 2afd8e065170..4c29f272413d 100644 --- a/_maps/ship_config_schema.json +++ b/_maps/ship_config_schema.json @@ -134,7 +134,7 @@ "description": "The amount of ships that can be spawned in by players in a round at once.", "minimum": 0, "maximum": 100, - "default": 2 + "default": 1 }, "starting_funds":{ "title": "Ship Starting Funds", From 8c992e7b7b6d9c554b23636d59ee7cb44089bc51 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 13:23:25 -0500 Subject: [PATCH 06/41] Automatic changelog generation for PR #3166 [ci skip] --- html/changelogs/AutoChangeLog-pr-3166.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3166.yml diff --git a/html/changelogs/AutoChangeLog-pr-3166.yml b/html/changelogs/AutoChangeLog-pr-3166.yml new file mode 100644 index 000000000000..bff17cd8eacb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3166.yml @@ -0,0 +1,4 @@ +author: Apogee-dev +changes: + - {balance: reduced default ship spawn limit to 1.} +delete-after: true From 1a1f63694567e5f8dfadceb0ef44ee3bbf9c5854 Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 8 Jul 2024 13:39:30 -0400 Subject: [PATCH 07/41] Should fix the loadout-box-killing runtime (#3164) ## About The Pull Request invalid items in loadout = runtime = no box This should remove any loadout items that don't exist before they can try to exist (they won't) ## Why It's Good For The Game uhm box ## Changelog :cl: fix: loadout boxes will no longer sometimes not spawn /:cl: Signed-off-by: Theos --- code/modules/client/preferences_savefile.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 3c3040f03906..71d968d16130 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -448,9 +448,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car READ_FILE(S["equipped_gear"], equipped_gear) if(config) //This should *probably* always be there, but just in case. if(length(equipped_gear) > CONFIG_GET(number/max_loadout_items)) - to_chat(parent, "Loadout maximum items exceeded in loaded slot, Your loadout has been cleared! You had [length(equipped_gear)]/[CONFIG_GET(number/max_loadout_items)] equipped items!") + to_chat(parent, span_userdanger("Loadout maximum items exceeded in loaded slot, Your loadout has been cleared! You had [length(equipped_gear)]/[CONFIG_GET(number/max_loadout_items)] equipped items!")) equipped_gear = list() - WRITE_FILE(S["equipped_gear"] , equipped_gear) + WRITE_FILE(S["equipped_gear"], equipped_gear) + + for(var/gear in equipped_gear) + if(!(gear in GLOB.gear_datums)) + to_chat(parent, span_warning("Removing nonvalid loadout item [gear] from loadout")) + equipped_gear -= gear //be GONE + WRITE_FILE(S["equipped_gear"], equipped_gear) READ_FILE(S["feature_human_tail"], features["tail_human"]) READ_FILE(S["feature_human_ears"], features["ears"]) From 4416e3746443ac70a6293abee4fd58af8e00a604 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 14:01:33 -0500 Subject: [PATCH 08/41] Automatic changelog generation for PR #3164 [ci skip] --- html/changelogs/AutoChangeLog-pr-3164.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3164.yml diff --git a/html/changelogs/AutoChangeLog-pr-3164.yml b/html/changelogs/AutoChangeLog-pr-3164.yml new file mode 100644 index 000000000000..cc98cad67b9c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3164.yml @@ -0,0 +1,4 @@ +author: SomeguyManperson +changes: + - {bugfix: loadout boxes will no longer sometimes not spawn} +delete-after: true From 402457c07a7bc13a40757f4aa75b2eb4e760ae18 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 8 Jul 2024 19:39:45 +0200 Subject: [PATCH 09/41] Adds plastic flowers. (#3168) ## About The Pull Request Adds a new item, a plastic flower. It can be reskinned into all of flowers with an alt+click. Adds that item into loadout, so chars can go and have flowers as part of their drip. ![obraz](https://github.com/shiptest-ss13/Shiptest/assets/108196626/247a8051-3316-446d-9771-79c4d6bece6a) ## Why It's Good For The Game More options for character creation. ## Changelog :cl: add: Added a plastic flower - a selection of flowers to wear. Added it to the loadout too. /:cl: --- code/modules/client/loadout/loadout_hat.dm | 4 ++++ code/modules/clothing/head/misc_special.dm | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm index d4ab1c858f26..3d2905720f0a 100644 --- a/code/modules/client/loadout/loadout_hat.dm +++ b/code/modules/client/loadout/loadout_hat.dm @@ -121,3 +121,7 @@ /datum/gear/hat/trapper display_name = "trapper hat" path = /obj/item/clothing/head/trapper + +/datum/gear/hat/flowers + display_name = "plastic flower, pickable" + path = /obj/item/clothing/head/plastic_flower diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index c04b61563f53..24e2f95f03bd 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -367,3 +367,20 @@ if(!warped) warp_up() +/obj/item/clothing/head/plastic_flower + name = "plastic flower" + desc = "A realistic imitation of a flower. Not edible though." + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state = "poppy" + body_parts_covered = null + unique_reskin = list( + "Poppy" = "poppy", + "Sunflower" = "sunflower", + "Moonflower" = "moonflower", + "Novaflower" = "novaflower", + "Harebell" = "harebell", + "Geranium" = "geranium", + "Lily" = "lily" + ) + custom_materials = (list(/datum/material/plastic = 1000)) + From 1b92b8a442d27c18379d85c3e0bad699c27ff6e6 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 14:15:11 -0500 Subject: [PATCH 10/41] Automatic changelog generation for PR #3168 [ci skip] --- html/changelogs/AutoChangeLog-pr-3168.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3168.yml diff --git a/html/changelogs/AutoChangeLog-pr-3168.yml b/html/changelogs/AutoChangeLog-pr-3168.yml new file mode 100644 index 000000000000..1a82f2fbe1e4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3168.yml @@ -0,0 +1,5 @@ +author: Sadhorizon +changes: + - {rscadd: Added a plastic flower - a selection of flowers to wear. Added it to + the loadout too.} +delete-after: true From f544d0d17eccd8cfa4c9687ec0f3435f429cb10a Mon Sep 17 00:00:00 2001 From: Martinpachu <86135885+Martinpachu@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:58:14 -0300 Subject: [PATCH 11/41] Makes .38 speedloaders cheaper. (#3159) ## About The Pull Request Makes .38 speedloaders cheaper 350 - 250 ## Why It's Good For The Game makes speedloaders less expensive than the gun ## Changelog :cl: balance: .38 speedloaders are cheaper /:cl: --- code/modules/cargo/packs/ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 0b77a0f00afe..a04d62059792 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -28,7 +28,7 @@ name = ".38 Speedloader Crate" desc = "Contains a .38 speedloader for revolvers, containing six rounds." contains = list(/obj/item/ammo_box/c38) - cost = 350 + cost = 250 /datum/supply_pack/ammo/m10mm_mag name = "10mm Stechkin Magazine Crate" From 9f3cb0a3e88329803f6232cd73b5b08441b9a1ba Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Mon, 8 Jul 2024 12:58:43 -0700 Subject: [PATCH 12/41] Fixes N+S Captain loadout (#3165) ## About The Pull Request I forgot to set some slots on the N+S Captain loadout to NULL, causing them to inherit normal Nanotrasen items. This PR nulls them out, making the N+S Captain effectively dressed as a Quartermaster, as he should be. ## Why It's Good For The Game bugfixes good ## Changelog :cl: fix: N+S Captains no longer spawn with Nanotrasen coats. /:cl: --- code/modules/clothing/outfits/factions/nanotrasen.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm index e93c7b4b8e52..f03c91d51a11 100644 --- a/code/modules/clothing/outfits/factions/nanotrasen.dm +++ b/code/modules/clothing/outfits/factions/nanotrasen.dm @@ -53,9 +53,13 @@ head = /obj/item/clothing/head/nanotrasen/cap/supply uniform = /obj/item/clothing/under/nanotrasen/supply/qm + suit = null + alt_suit = null dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo shoes = /obj/item/clothing/shoes/sneakers/brown glasses = /obj/item/clothing/glasses/sunglasses + gloves = null + neck = null l_hand = /obj/item/clipboard chameleon_extras = /obj/item/stamp/qm From 30e7d522797e3f04ea1838e49a2c08bac0733d89 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 15:29:50 -0500 Subject: [PATCH 13/41] Automatic changelog generation for PR #3165 [ci skip] --- html/changelogs/AutoChangeLog-pr-3165.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3165.yml diff --git a/html/changelogs/AutoChangeLog-pr-3165.yml b/html/changelogs/AutoChangeLog-pr-3165.yml new file mode 100644 index 000000000000..1578155eeb6f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3165.yml @@ -0,0 +1,4 @@ +author: Apogee-dev +changes: + - {bugfix: N+S Captains no longer spawn with Nanotrasen coats.} +delete-after: true From fb1b33138d6bc6c82aeb5a53e2f7fe33dee7fb96 Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Mon, 8 Jul 2024 12:58:54 -0700 Subject: [PATCH 14/41] The Tip-pening (#3171) ## About The Pull Request Removes a grand majority of the station-based / bad tips from selection, and adds around 80 new ones. ## Why It's Good For The Game A lot of these old tips were no longer relevant to Shiptest's gameplay loop. These new ones are a combination of roleplay, command, combat, survival, and general gameplay tips that come from my own knowledge of in-game mechanics. ## Changelog :cl: del: Removed some irrelevant old tips of the round add: Added 80+ new tips more relevant to Shiptest's gameplay loop /:cl: --- strings/sillytips.txt | 21 +++++---- strings/tips.txt | 104 +++++++++++++++++++++++++++++++----------- 2 files changed, 89 insertions(+), 36 deletions(-) diff --git a/strings/sillytips.txt b/strings/sillytips.txt index 192dbce6362f..165e3cbe54d6 100644 --- a/strings/sillytips.txt +++ b/strings/sillytips.txt @@ -5,16 +5,12 @@ When a round ends nearly everything about it is lost forever, leave your salt be Killing the entire sector isn't fun except when it is. You can win a pulse rifle from the arcade machine. Honest. Just like real life the entropy of the game can only increase with time. If things aren't on fire yet, just wait. -Completing your objectives is good practice, but the best antagonists will strive to do more than the bare minimum to really leave an impression. The more obscure and underused a game mechanic is, the less likely your victims are to be able to deal with it. Space is cold and it will quickly freeze you to death if you don't protect yourself. This isn't how thermodynamics really works but just go with it. -Blobs are weak to fire! Use a flame thrower for maximum damage! Cleanbot. -The wizard is supposed to be extremely strong in one on one combat, stop getting mad about it. Sometimes a round will just be a bust. C'est la vie. This is a game that is constantly being developed for. Expect things to be added, removed, fixed, and broken on a daily basis. It's fun to try and predict the round type from the tip of the round message. -The quartermaster is not a head of staff and will never be one. The bird remembers. Your sprite represents your hitbox, so that afro makes you easier to kill. The sacrifices we make for style. Sometimes admins will just do stuff. Roll with it. @@ -23,14 +19,21 @@ Plenty of things that aren't traditionally considered weapons can still be used DEATH IS IMMINENT! This game is older than most of the people playing it. Do not go gentle into that good night. -Flashbangs can weaken blob tiles, allowing for you and the crew to easily destroy them. Just the tip? Some people are unable to read text on a game where half of it is based on text. -As the Captain, you can use a whetstone to sharpen your fancy fountain pen for extra robustness. -As the Lawyer, you are the last bastion of roleplay-focused jobs. Even the curator got a whip to go fight people with, that sellout! There are at least 11 ways to get through plastic flaps. How many can you name? FEED ME A STRAY CAT -Did you know that tossing the clown into a singularity will either increase or decrease its size by a large amount? Most items have names longer than "soap". -Demoman takes skill. Ask and you shall receive. +Top Ten Goliath Moments!!! +Sometimes your ship will randomly disappear or obliterate you or get cleaved in half or any combination of the above. Don't dock to a planet at the same time as someone else or undock as someone is docking. +Go on. Saw off those beautiful Hunter's Pride stocks. The Huntsman is watching. +The Drinkening has put countless shiptester's basic reading compehension to the test. Will you succumb? +No, going really really fast through an electric storm won't render you immune. +None of you would survive the uptime drought. +Innumberable frontiersmen have died valiantly in a subshuttle chokepoint attempting to board. Sometimes, a direct subshuttle dock isn't the best tactical move. +Full-body prosthesis are still biological and have normal blood. Don't pump a full bag of coolant into their veins, you. +The shotgun may never miss, but it has low armour penetration with buckshot. +When your gun gives off a pathetic click, it's out of ammo. Mashing the trigger more in a panic won't restore your ammo. +The Trabuco is a crime against the Huntsman and the universe. There's a possibility it'll kill either yourself, your crew, the target, or all of the above. +Don't be the captain found dead in a pit, legioned, with 600 brute and every bone in their body broken. diff --git a/strings/tips.txt b/strings/tips.txt index 6a8c54086d94..85eda2e01283 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -19,33 +19,26 @@ You can screwdriver any non-chemical grenade to shorten fuses from 5 seconds, to If you find yourself in a fistfight with another player, staying on the offensive is usually the smart move. Running away often won't accomplish much. Different weapons have different strengths. Some weapons, such as spears, floor tiles, and throwing stars, deal more damage when thrown compared to when attacked normally. A thrown glass of water can make a slippery tile, allowing you to slow down your pursuers in a pinch. -When dealing with security, you can often get your sentence negated entirely through cooperation and deception. -Experiment with different setups of the supermatter engine to maximize output, but don't risk the crew's safety to do so! We were all new once, be patient and guide new players in the right direction. On most clothing items that go in the exosuit slot, you can put certain small items into your suit storage, such as a spraycan, your emergency oxygen tank, or a flashlight. Most job-related exosuit clothing can fit job-related items into it, such as the atmospheric technician's hardsuit/winter coat holding an RPD, or labcoats holding most medicine. If you're using hotkey mode, you can stop pulling things using H. If there's something you need from others, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together! You'll quickly lose your interest in the game if you play to win and kill. If you find yourself doing this, take a step back and talk to people - it's a much better experience! -Felinids get temporarily distracted by laser pointers. Use this to your advantage when being pursued by one. Don't be afraid to ask for help, whether from your peers or from mentors. As the Captain, you have absolute access and control over your ship, but this does not mean that being a horrible person won't result in mutiny and a ban. A medical hardsuit can hold an entire medkit in its suit storage! -While both heal toxin damage, the difference between charcoal and antitoxin is that charcoal will actively remove all other reagents from one's body, while antitoxin only removes various toxins - but can overdose. -You can surgically implant or extract things from people's chests. This can range from putting in a bomb to pulling out an alien larva. +While both heal toxin damage, the difference between charcoal and dylovene is that charcoal will actively remove all other reagents from one's body, while dylovene only removes various toxins - but can overdose. +You can surgically implant or extract things from people's chests using either organ manipulation or cavity implant surgeries. This can range from putting in a bomb to pulling out an alien larva. Using disarm attempt will intentionally fail a surgery step. Corpses with the "...and their soul has departed" description no longer have a ghost attached to them and aren't revivable or clonable. -Treating plasmamen is not impossible! Salbutamol stops them from suffocating and showers stop them from burning alive. You can even perform surgery on them by doing the procedure on a roller bed under a shower. +Treating plasmamen is not impossible! Salbutamol stops them from suffocating and showers or stasis beds stop them from burning alive. You can even perform surgery on them by doing the procedure on a roller bed under a shower. You can extract implants by holding an empty implant case in your offhand while performing the extraction step. There are dozens of chemicals that can heal, and even more that can cause harm. Experiment! Some chemicals can only be synthesized by heating up the contents with a chemical heater or manually with lighters and similar tools. You can recharge a chemical dispenser with an inducer or by replacing its cell. Water and Potassium mixed together will create an explosion, with power scaling by amount used. Don't do it. -You can eject someone from cloning early by disabling power in the room. Note that they will suffer more genetic damage and may lose vital organs from this. -Being a hulk makes you capable of dealing high melee damage, stunlocking people, and punching through walls. However, you can't fire guns, will lose your hulk status if you go into critical condition. You can take AIs out of their cores by loading them into an intelliCard, which lets you see their laws, It can also be placed into an AI system integrity restorer computer to revive and/or repair them. -You can use the mutation toxin obtained from green slimes to create various mutation toxins by mixing it with various chemicals! -You can maximize the number of uses you get out of a slime by feeding it slime steroid, created from purple slimes, while alive. You can then apply extract enhancer, created from cerulean slimes, on each extract. You can repair your cyborgs with a welding tool if they have brute damage, if they have burn damage, you can remove their battery, expose the wiring with a screwdriver and replace their wires with a cable coil. You can reset a cyborg's module by cutting and mending the reset wire with a wire cutter. You can augment people with cyborg limbs. Augmented limbs can easily be repaired with cables and welders. @@ -55,45 +48,33 @@ As a AI, you can take pictures with your camera and upload them to newscasters. As a AI, you can use CTRL + 1-9 to set a location hotkey for your camera, allowing you to save the location and jump to it at will. Tilde and zero will return you to the last spot you jumped from, and the numpad numbers act as aliases to the regular number keys. As a Cyborg, choose your module carefully, as only cutting and mending your reset wire will let you repick it. If possible, refrain from choosing a module until a situation that requires one occurs. As a Cyborg, you are immune to most forms of stunning, and excel at almost everything far better than humans. However, flashes can easily stunlock you and you cannot do any precision work as you lack hands. -As a Cyborg, you are impervious to fires and heat. If you are rogue, you can release plasma fires everywhere and walk through them without a care in the world! -As a Cyborg, you are extremely vulnerable to EMPs as EMPs both stun you and damage you. The ion rifle in the armory or a traitor with an EMP kit can kill you in seconds. +As a Cyborg, you are impervious to fires and heat. +As a Cyborg, you are extremely vulnerable to EMPs as EMPs both stun you and damage you. As a Service Cyborg, your spray can knocks people down. However, it is blocked by masks and glasses. As an Engineering Cyborg, you can attach air alarm/fire alarm/APC frames to walls by placing them on the floor and using a screwdriver on them. As a Medical Cyborg, you can fully perform surgery and even augment people. You can rename areas or create entirely new ones using your ship expansion permit. The chief engineer’s hardsuit is significantly better than other engineering hardsuits. It has the best features of both engineering and atmospherics hardsuits - boasting nigh-invulnerability to radiation and all atmospheric conditions. The supermatter shard is an extremely dangerous piece of equipment: touching it will disintegrate you. So will touching it with telepathy. -You can electrify grilles by placing wire "nodes" beneath them: the big seemingly unconnected bulges from a half completed wiring job. +Wire "nodes" (big, seemingly unconnected bulges from half completed wiring jobs) are able to do several things: link up thrusters to prechargers, hook up PACMAN generators, and shock grilles among other things. You can cool a supermatter crystal by spraying it with a fire extinguisher. Only for the brave! You can repair windows by using a welding tool on them while on any intent other than harm. -Don't underestimate the humble P.A.C.M.A.N. generators. A RCD can be reloaded with metal, glass or plasteel sheets instead of just compressed matter cartridges. You can unwrench a pipe regardless of the pressures of the gases inside, but if they're too high they can burst out and injure you! -ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches. Or, use it to seal a plasmaman cloning room. +ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches. Beware, they wear off after an amount of time highlighted by numbers on the fans. You can change the layer of a pipe by clicking with it on a wrenched pipe or other atmos component of the desired layer. -As a Clown, if you lose your banana peel, you can still slip people with your PDA! Honk! -As a Clown, eating bananas heals you slightly. Honk! -As a Clown, your Grail is the mineral bananium, which can be used to build you a fun and robust mech beloved by everyone. -As a Clown, you can use your stamp on a sheet of cardboard as the first step of making a honkbot. Fun for the whole crew! -As a Clown, spice your gimmicks up! Nobody likes a one-trick pony. -The null rod has anti magic functions: it makes you immune to magic. Books can be turned into a container that can store small items using wire cutters, bibles have this ability without needing to cut it. You can hack the MegaSeed Vendor to get access to more exotic seeds. These seeds can alternatively be ordered from a express console You can mutate the plants with unstable mutagen or, as an alternative, grow glowshrooms for their radium which also mutates plants to start you up! While growing plants you should look into increasing the potency of your plants. This increases the size, amount of chemicals, points gained from grinding them in the biogenerator, and lets people know you are a proficient botanist. You can create a very wide variety of food with the crafting menu. You can find it by looking for the hammer icon near your intents. You can rename custom food with a pen. -any cooked food will be much healthier than the junk food found in vendors. Having the crew routinely eating cooked will provide minor buffs. +Any cooked food will be much healthier than the junk food found in vendors. Most non-custom foods will have a secondary effect, ranging from healing you to making you move at lightspeed. Experiment! Mousetraps can be used to create bombs or booby-trap containers. -You can order contraband items from a express console without hacking it. -You can earn more cargo points by shipping back crates, liquid containers, plasma sheets, rare seeds from hydroponics, and more! -The express supply console can instantly delivers crates by drop pod. The impact will cause a small explosion as well. Every monster has a pattern you can exploit to minimize damage from the encounters. You can harvest goliath plates from goliaths and upgrade your explorer's suit, mining hardsuits as well as Firefighter APLUs with them, greatly reducing incoming melee damage. You can craft a variety of equipment from the local fauna. Bone axes, lava boats and ash drake armour are just a few of them! -As a Monkey, you can crawl through air or scrubber vents by alt+left clicking them. You must drop everything you are wearing and holding to do this, however. -As a Monkey, you can still wear a few human items, such as backpacks, gas masks and hats, and still have two free hands. As a Drone, you can ping other drones to alert them of areas in need of repair. As a Ghost, you can see the inside of a container on the ground by clicking on it. As a Ghost, you can double click on just about anything to follow it. Or just warp around! @@ -106,3 +87,72 @@ You can light a cigar on a supermatter crystal. Using sticky tape on items can make them stick to people and walls! Be careful, grenades might stick to your hand during the moment of truth! In a pinch, stripping yourself naked will give you a sizeable resistance to being tackled. What do you value more, your freedom or your dignity? Wearing riot armor makes you significantly more effective at performing tackle takedowns, but will use extra stamina with each leap! It will also significantly protect you from other tackles! +As the Captain of your vessel, do not neglect the responsibilities of your command. You are the anchor the crew is expected to rely upon, and not being present or authoritative will hurt the experience. +As a vessel's second in command, you have the unique position of being able to temper the behaviour of the Captain. Obey their orders, but do not be afraid to offer your own advice or shoulder some of command's responsibilities. +It is highly ill-advised to run off on your own while exploring. Many ruins and planets are perilous and a match for even experienced players, and having someone to watch your back will save you a lot of trouble. +More often that not, most ships will be apply-only. Don't be afraid to read the memo and try for an application, many captains simply want to curate a certain type of behaviour aboard their vessels. +Captaining is one of the best ways to curate a faction. Set standards, distinguish yourself and your crew, and keep them engaged, and they'll be coming back not only to your ship, but also to the faction. +Most improvised ways of providing medical aid or reviving the dead can be slow or dangerous to the person if you or your character are inexperienced with medicine. Don't be afraid to call for a medical ship if the situation is dire. +In the event most or all of your crew is incapacitated or dead, don't be afraid to ahelp to ask for a distress call. They'll be happy to get you back into the round and the medical ships will be happy as well. +Don't be afraid to ahelp if you're unsure about another player's conduct. If they're making you uncomfortable or hurting the experience, the admins would be happy to sort things out. +Many plants on sand and lava worlds are medicinal, and can stretch your supplies. +For higher tier drill contracts, its recommended to bring a toolbox, spare stock parts, and plasteel if you're not confident in your abilities. The drill is prone to running low on power or needing to be repaired if damaged. +Many weapons can get sawed off, hurting their accuracy and occasionally ammo capacity but wildly compacting them. Hunter's Pride shotguns, the Flaming Arrow, the Illestren, among others, are included. +Static anomalies will cause brain damage in close proximity. Minimize contact with them. +Gravitational anomalies (thronglers) can quickly kill if they're intense. Sometimes, a chair can be used to get close to neutralize them, but do so at your own risk. They cause heavy brute damage. +Certain anomalies like heartbeat, vein, jumper, or plasmasoul anomalies can interact with you through walls. Be careful docking to worlds with anomalies. +Safe speed for carp migrations are under 2 GM/s, for asteroids are below 3 GM/s, and for dust is below 7 GM/s. There is no safe speed for electrical storms, you need full grounding rod coverage. +You can sometimes minimize damage from electrical storms by turning off lights and preventing all source of passive light from touching the outside of the vessel. It is notoriously gimmicky, though, do so at your own risk. +Dwarf legions tend to try and run back towards you if you're too far away. Lure them in for an attack by withdrawing before they retreat again. +Brimdemons oftentimes will strike you with a single melee attack before fleeing for another beam. Back away once they're done firing to minimize chip damage. +You can examine someone twice to see which limb they're bleeding from, to administer gauze or sutures. +Vox are allergic to Ephedrine, Atropine, Epinephrine, Mannitol, Antihol, and Stimulants. Not lethal in small amounts, but it is recommended to purge these reagents if you've made a mistake. +Grinded iron or iron pills from oxygen deprivation kits can be used to slowly regenerate blood in living people, if your blood supplies are thin. +Crystal goliaths, elite mobs, and ancient goliaths give research points on dissection, varying from 5000 to 40000 depending on technology and mob. +Crystal legions and crystal goliaths are extremely dangerous up close. Try and eliminate them quickly from range with powerful firearms. +The smaller the vessel, the more throttle will effect your acceleration. If you're piloting a subshuttle, it's recommended to keep low throttle and adjust to your liking. +Plasma thrusters can allow for extreme speed, but it is recommended to conserve them. You can minimize fuel consumption by using them in small bursts with a low throttle before turning them back off. +Jackhammers can be used to quickly break down walls for breaching or salvage. +Blast doors can be taken apart for a fair amount of plasteel, if you're hurting on fuel. +Kepori have an innate ability to tackle. It can take the enemy off guard, but recommend a helmet if you're using it near walls or prone to miss. +Laser and energy weapons have a cell that can be removed with a screwdriver. If you're removing a cell from a weapon that is not in your hand (on a suit storage slot, for example), the cell will go into your hand instead of the ground. +Frontiersmen clothes and Ramzi Clique rusted red hardsuits are established pirate equipment, and you're likely to be fired upon if you wear them. Use at your own risk. +You can access the black market by building an uplink with a handheld radio, analyzer, and scanning module. It tends to have a random selection of unique items at highly varied prices. You can purchase a LTSRBT from the outpost for a more convenient delivery. +Most armour sets outside of hardsuits do not cover the limbs. Give yourself an advantage by firing on someones legs or arms to slow them down or shoot out their weapon. +You can remove prosthetics or IPC / FBP limbs with prosthetic removal surgery, even on yourself. +You can early eject the en bloc of Illestrens by not firing the last round and clicking on the rifle with your empty hand to take it out manually, for a fast and tactical reload. +The HP Shadow cannot reload all rounds at once with a speedloader, it must be reloaded one round at a time. +You can make an emergency landing by docking to an empty space if you've lost control of your speed or are about to crash into hazards. +It is safe to cross over the tile the system sun is on. Trust me, I've tried. +Acid tiles and acid from anomalies can be sprayed off with fire extinguishers. +You can extinguish yourself without walls nearby by clicking the tile you're on with your extinguisher. +It's wise to carry a pocket extinguisher on sand and lava worlds, for acid and lava respectively. +Directional firelocks can quickly minimize pressure loss from holofield failures, if your vessel lacks them. +Holofields rely on extra power being on the wire net. Make sure power load is a fair bit higher than the draw so you don't get launched into vacuum. +Elzuose are able to heal a respectable amount of damage by rooting in soil or grass. It gives a sizable mood increase, as well as charging your battery. +If you're confused about the contents of an alcoholic drink bottle, you can examine to more often than not see what it contains on the label. +If you don't feel like grinding 500 basic power cells to make potassium, you can buy chemicals from the outpost in bulk. +You can synthesize most chems by clicking certain reagents with stock parts. Examples being Iodine to Bromine with a scanning module and water into 2:1 hydrogen / oxygen with a capacitor. +Perfluorodecalin in oxygen deprivation kits convert oxygen damage to toxin damage at a very effective ratio. Just know what you're doing and be prepared to administer anti-tox chems if it is a large amount of damage. +Epi-pens contain a small amount of formaldehyde, that prevents organs from decaying while they're in a body's system. Use it to give yourself more time while reviving. +Anomalies will give two frequencies when you analyze them, a primary and a secondary, unstable frequency. The primary will neutralize, and the unstable will more often than not cause an explosion or a similar negative effect. +Landmines have 4 wires; one disarms the mind, the other deactivates the pressure plate, another blows it up, and another blows it up on a delay. +You can tamper with landmines from range by pulsing the wires with signalers. +Not everyone is from their species' homeworld. It can be common for a human to have a Kalixcian or Teceian name, for example. +It can be fun to brainstorm new characters. Give it a shot, you might like it. +You can create entire new shuttles and subshuttles with a shuttle manipulator either from RND or from the outpost. It's usually resource and money-intensive, so be prepared! +Class 3 drills are incredibly dangerous alone or in small groups, even if you're experienced with mining and combat. Bring along a larger crew or call someone willing to help if you're thinking of taking them on. +Most smaller ships can be easily made immune to electrical storms if grounding rods are spaced out around the hull. You can make some quick money from rarely-taken storm contracts. +Ripleys are able to hold up to ten crates and other miscellaneous items like PACMAN generators using a hydraulic clamp. The scrapper's favourite. +Fights can be heavily in favour of the defenders if you play your cards right. Get good angles, turn off lights to give yourself cover, and be able to fire from multiple areas. More than likely, you'll know your environment better than the attacker. +Crate shelves can be used to maximize storage in your cargo bays. No more messes for you. +You can fashion cloth into a rag to clean up your vessel if you've tracked in some blood. +Some ships might prioritize characters exclusively from a faction in their memos, and that's okay! You can experiment with new characters to join, or join / captain another ship. +Moths, if their wings are intact, have full mobility in zero gravity environments that have an atmosphere. +Vox are near-unmatched in hand-to-hand fighting; their kicks deal extra damage and hurt organs. +IPC posibrains are contained in the chest, not the head. +Shiptest has uptime on Wednesdays, Fridays, and Saturdays. +Exosuits are not as durable as they might feel, and it is still wise to take cover with them. +Turning on strafing mode on a mech for combat is wise, and allows you to keep your firing lines constantly on the enemy. +A Gygax's leg actuators drain the cell very quickly. Use sparingly. +Installing higher tier capacitors on mechs increases power efficiency on mech abilities, weapons, and idling. From f0e0cad1b90edcbcca61e0e5beda63aacc01b397 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 15:43:19 -0500 Subject: [PATCH 15/41] Automatic changelog generation for PR #3171 [ci skip] --- html/changelogs/AutoChangeLog-pr-3171.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3171.yml diff --git a/html/changelogs/AutoChangeLog-pr-3171.yml b/html/changelogs/AutoChangeLog-pr-3171.yml new file mode 100644 index 000000000000..e0dc11fa2d21 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3171.yml @@ -0,0 +1,5 @@ +author: generalthrax +changes: + - {rscdel: Removed some irrelevant old tips of the round} + - {rscadd: Added 80+ new tips more relevant to Shiptest's gameplay loop} +delete-after: true From 9ee0967d908f313e416d316330768c7314eb63c6 Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 8 Jul 2024 15:59:01 -0400 Subject: [PATCH 16/41] Projectiles are no longer bloodthirsty for stam/softcrit people (#3177) ## About The Pull Request replaces stat == dead check with a generic stat check because any stat above 0 means the target is incapable of doing much of anything Stamcrit now gives TRAIT_HANDS_BLOCKED like other stuns, this shouldn't do much except allow projectiles to fly over them since you can't do hands stuff in stamcrit anyway ## Why It's Good For The Game I don't WANT to fill the poor sod in the front with 500000 rubber bullets I WANT to crowd control!! ## Changelog :cl: code: People who are stunned are now more reliably passed by bullets not aimed directly at them /:cl: --- code/modules/mob/living/carbon/carbon.dm | 1 + code/modules/mob/living/carbon/status_procs.dm | 1 + code/modules/projectiles/projectile.dm | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index dd5b29059085..3ed2b86816ac 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -538,6 +538,7 @@ REMOVE_TRAIT(src, TRAIT_INCAPACITATED, STAMINA) REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA) REMOVE_TRAIT(src, TRAIT_FLOORED, STAMINA) + REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, STAMINA) else return update_health_hud() diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index cc15c12d836e..5ab2c57be0f4 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -17,6 +17,7 @@ ADD_TRAIT(src, TRAIT_INCAPACITATED, STAMINA) ADD_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA) ADD_TRAIT(src, TRAIT_FLOORED, STAMINA) + ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, STAMINA) if((maxHealth - health + getStaminaLoss()) > 120) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. //WS Edit - Stamina stacks with health damage adjustStaminaLoss(30, FALSE) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 0b9bcb8da4f7..66adeb53ac59 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -490,7 +490,7 @@ if(direct_target) return TRUE // If target not able to use items, move and stand - or if they're just dead, pass over. - if(L.stat == DEAD || (!hit_stunned_targets && HAS_TRAIT(L, TRAIT_IMMOBILIZED) && HAS_TRAIT(L, TRAIT_FLOORED) && HAS_TRAIT(L, TRAIT_HANDS_BLOCKED))) + if(L.stat || (!hit_stunned_targets && HAS_TRAIT(L, TRAIT_IMMOBILIZED) && HAS_TRAIT(L, TRAIT_FLOORED) && HAS_TRAIT(L, TRAIT_HANDS_BLOCKED))) return FALSE return TRUE From 2350ea0efd7003f846e31c86c1b8fd6aed2ac689 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 15:56:31 -0500 Subject: [PATCH 17/41] Automatic changelog generation for PR #3177 [ci skip] --- html/changelogs/AutoChangeLog-pr-3177.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3177.yml diff --git a/html/changelogs/AutoChangeLog-pr-3177.yml b/html/changelogs/AutoChangeLog-pr-3177.yml new file mode 100644 index 000000000000..acab9e74263a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3177.yml @@ -0,0 +1,5 @@ +author: SomeguyManperson +changes: + - {code_imp: People who are stunned are now more reliably passed by bullets not + aimed directly at them} +delete-after: true From 56e6a11189c8fd812cf654e591e77aa4878fb956 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 9 Jul 2024 00:54:33 +0000 Subject: [PATCH 18/41] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-3075.yml | 6 ------ html/changelogs/AutoChangeLog-pr-3105.yml | 6 ------ html/changelogs/AutoChangeLog-pr-3164.yml | 4 ---- html/changelogs/AutoChangeLog-pr-3165.yml | 4 ---- html/changelogs/AutoChangeLog-pr-3166.yml | 4 ---- html/changelogs/AutoChangeLog-pr-3168.yml | 5 ----- html/changelogs/AutoChangeLog-pr-3171.yml | 5 ----- html/changelogs/AutoChangeLog-pr-3177.yml | 5 ----- html/changelogs/archive/2024-07.yml | 20 ++++++++++++++++++++ 9 files changed, 20 insertions(+), 39 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-3075.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3105.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3164.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3165.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3166.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3168.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3171.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3177.yml diff --git a/html/changelogs/AutoChangeLog-pr-3075.yml b/html/changelogs/AutoChangeLog-pr-3075.yml deleted file mode 100644 index 554ff3998800..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3075.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: SapphicOverload -changes: - - {rscadd: Adds an igniter and button to the TEG of every ship that was missing - one} - - {rscdel: Removed the welding tool TEG chute some ships had} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3105.yml b/html/changelogs/AutoChangeLog-pr-3105.yml deleted file mode 100644 index 0e792045f197..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3105.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Apogee-dev -changes: - - {bugfix: Cargo pods no longer land in Talos maint} - - {bugfix: Gas tanks on the Talos have higher security} - - {bugfix: Talos now has an autolathe in cargo} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3164.yml b/html/changelogs/AutoChangeLog-pr-3164.yml deleted file mode 100644 index cc98cad67b9c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3164.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: SomeguyManperson -changes: - - {bugfix: loadout boxes will no longer sometimes not spawn} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3165.yml b/html/changelogs/AutoChangeLog-pr-3165.yml deleted file mode 100644 index 1578155eeb6f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3165.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Apogee-dev -changes: - - {bugfix: N+S Captains no longer spawn with Nanotrasen coats.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3166.yml b/html/changelogs/AutoChangeLog-pr-3166.yml deleted file mode 100644 index bff17cd8eacb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3166.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Apogee-dev -changes: - - {balance: reduced default ship spawn limit to 1.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3168.yml b/html/changelogs/AutoChangeLog-pr-3168.yml deleted file mode 100644 index 1a82f2fbe1e4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3168.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Sadhorizon -changes: - - {rscadd: Added a plastic flower - a selection of flowers to wear. Added it to - the loadout too.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3171.yml b/html/changelogs/AutoChangeLog-pr-3171.yml deleted file mode 100644 index e0dc11fa2d21..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3171.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: generalthrax -changes: - - {rscdel: Removed some irrelevant old tips of the round} - - {rscadd: Added 80+ new tips more relevant to Shiptest's gameplay loop} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3177.yml b/html/changelogs/AutoChangeLog-pr-3177.yml deleted file mode 100644 index acab9e74263a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3177.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: SomeguyManperson -changes: - - {code_imp: People who are stunned are now more reliably passed by bullets not - aimed directly at them} -delete-after: true diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index 9f6fd5a203ad..bc62e40c6188 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -20,3 +20,23 @@ - rscadd: Resprites the E-50 and gives it proper inhands now! - bugfix: The Syndicate sniper rifle fires at a normal rate of fire and has the correct recoil now. +2024-07-09: + Apogee-dev: + - bugfix: N+S Captains no longer spawn with Nanotrasen coats. + - balance: reduced default ship spawn limit to 1. + - bugfix: Cargo pods no longer land in Talos maint + - bugfix: Gas tanks on the Talos have higher security + - bugfix: Talos now has an autolathe in cargo + Sadhorizon: + - rscadd: Added a plastic flower - a selection of flowers to wear. Added it to the + loadout too. + SapphicOverload: + - rscadd: Adds an igniter and button to the TEG of every ship that was missing one + - rscdel: Removed the welding tool TEG chute some ships had + SomeguyManperson: + - bugfix: loadout boxes will no longer sometimes not spawn + - code_imp: People who are stunned are now more reliably passed by bullets not aimed + directly at them + generalthrax: + - rscdel: Removed some irrelevant old tips of the round + - rscadd: Added 80+ new tips more relevant to Shiptest's gameplay loop From b22d5cd3cf602a19d4f72c2fe4173aa6d0d9ef5a Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Mon, 8 Jul 2024 22:50:13 -0400 Subject: [PATCH 19/41] Fixes Vox sprites for a few clothing items (#3192) ## About The Pull Request A few items that had Vox variations at some point stopped properly displaying them. This makes them appear as they should again. The Inteq SWAT helmet, standard Inteq helmet and Inteq HUD goggles now properly show their sprite on Vox. ## Why It's Good For The Game Items having sprites is generally a good thing. ## Changelog :cl: Cloudbreak fix: A few clothing items now properly display again for Vox. /:cl: --- code/modules/clothing/glasses/hud.dm | 2 +- code/modules/clothing/head/helmet.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 0698981207bf..559816007b13 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -259,7 +259,7 @@ desc = "A snazzy looking pair of ballistic goggles with an integrated security hud. The opaque visor provides flash protection." icon_state = "inteq_goggles" item_state = "inteq_goggles" - supports_variations = KEPORI_VARIATION + supports_variations = KEPORI_VARIATION | VOX_VARIATION glass_colour_type = /datum/client_colour/glass_colour/orange /obj/item/clothing/glasses/hud/health/prescription diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 352349783bae..a6de8769642a 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -501,7 +501,7 @@ icon_state = "inteq_swat" item_state = "inteq_swat" flags_inv = HIDEHAIR - supports_variations = KEPORI_VARIATION + supports_variations = KEPORI_VARIATION | VOX_VARIATION content_overlays = TRUE /obj/item/clothing/head/helmet/inteq @@ -510,7 +510,7 @@ icon_state = "inteq_helmet" icon_state = "inteq_helmet" can_flashlight = TRUE - supports_variations = KEPORI_VARIATION + supports_variations = KEPORI_VARIATION | VOX_VARIATION content_overlays = TRUE /obj/item/clothing/head/solgov From 930fdcb61bede1cb04374c1bc235a0886ecc4874 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jul 2024 22:01:39 -0500 Subject: [PATCH 20/41] Automatic changelog generation for PR #3192 [ci skip] --- html/changelogs/AutoChangeLog-pr-3192.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3192.yml diff --git a/html/changelogs/AutoChangeLog-pr-3192.yml b/html/changelogs/AutoChangeLog-pr-3192.yml new file mode 100644 index 000000000000..ec307090ff54 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3192.yml @@ -0,0 +1,4 @@ +author: Cloudbreak +changes: + - {bugfix: A few clothing items now properly display again for Vox.} +delete-after: true From a32594ceeb6a057a508760e61b275a53df69db45 Mon Sep 17 00:00:00 2001 From: meem <75212565+meemofcourse@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:59:14 -0400 Subject: [PATCH 21/41] the tortuga's holofields now work (#3114) ## About The Pull Request * the tortuga, and the brawler's holofields now work. all the shutters on the brawler are now also three wide * minor greeble on the tortuga such as fire extinguishers and emergency closets ## Why It's Good For The Game competent maptainer ## Changelog :cl: add: Minor changes to the Tortuga. fix: The holofields on the Tortuga-class and Brawler-class now work. /:cl: --- _maps/shuttles/pirate/pirate_tortuga.dmm | 235 +++++++++++++++--- .../subshuttles/frontiersmen_brawler.dmm | 132 +++++----- 2 files changed, 270 insertions(+), 97 deletions(-) diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm index 07bd4710a9b1..4bc354b31b5c 100644 --- a/_maps/shuttles/pirate/pirate_tortuga.dmm +++ b/_maps/shuttles/pirate/pirate_tortuga.dmm @@ -55,8 +55,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/power/shieldwallgen/atmos{ - id = "watchdog_holo" +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "tortuga_holo" }, /turf/open/floor/plating, /area/ship/cargo) @@ -173,6 +173,10 @@ pixel_x = -9; dir = 8 }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = -6; + pixel_y = -3 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "ci" = ( @@ -268,8 +272,9 @@ /turf/open/floor/pod/dark, /area/ship/maintenance/starboard) "dE" = ( -/obj/structure/table, -/obj/item/storage/cans/sixbeer, +/obj/structure/chair/sofa/brown/old/right{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "dF" = ( @@ -393,7 +398,9 @@ pixel_x = -22; pixel_y = -10 }, -/obj/structure/rack, +/obj/structure/salvageable/computer{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "ff" = ( @@ -406,6 +413,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/structure/sign/poster/official/moth/hardhats{ + pixel_y = 32 + }, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "fj" = ( @@ -755,6 +765,7 @@ icon_state = "0-8" }, /obj/item/stack/sheet/mineral/plasma/twenty, +/obj/effect/turf_decal/industrial/hatch, /turf/open/floor/pod/dark, /area/ship/maintenance/port) "iW" = ( @@ -826,6 +837,7 @@ "jt" = ( /obj/machinery/telecomms/relay/preset/frontiersmen, /obj/machinery/door/window/southleft, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "jA" = ( @@ -833,7 +845,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, @@ -1026,6 +1037,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, /turf/open/floor/mineral/titanium, /area/ship/security/armory) "ml" = ( @@ -1303,6 +1317,9 @@ /area/ship/cargo) "oU" = ( /obj/structure/table, +/obj/item/grown/corncob{ + pixel_y = 8 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "oV" = ( @@ -1407,6 +1424,7 @@ icon_state = "0-10" }, /obj/item/stack/sheet/mineral/plasma/twenty, +/obj/effect/turf_decal/industrial/hatch, /turf/open/floor/pod/dark, /area/ship/maintenance/starboard) "qD" = ( @@ -1493,6 +1511,14 @@ }, /turf/open/floor/pod/dark, /area/ship/maintenance/starboard) +"sM" = ( +/obj/structure/table, +/obj/item/desk_flag/trans{ + pixel_x = 9; + pixel_y = -6 + }, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) "sQ" = ( /turf/closed/wall, /area/ship/maintenance/starboard) @@ -1555,6 +1581,7 @@ }, /obj/structure/curtain/cloth, /obj/item/bedsheet/dorms, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/carpet, /area/ship/crew) "tI" = ( @@ -1704,6 +1731,7 @@ reagent_id = /datum/reagent/fuel/oil; tank_volume = 3000 }, +/obj/effect/turf_decal/industrial/hatch, /turf/open/floor/pod/dark, /area/ship/maintenance/starboard) "va" = ( @@ -1791,6 +1819,10 @@ "wg" = ( /obj/machinery/blackbox_recorder, /obj/machinery/door/window/southright, +/obj/structure/sign/poster/retro/radio{ + pixel_y = 32 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "wp" = ( @@ -1818,6 +1850,13 @@ /area/ship/cargo) "wH" = ( /obj/machinery/light/directional/north, +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/effect/decal/cleanable/plasma{ + pixel_x = 18; + pixel_y = -5 + }, /turf/open/floor/pod/dark, /area/ship/maintenance/starboard) "wL" = ( @@ -1834,11 +1873,15 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, /turf/open/floor/pod/dark, /area/ship/maintenance/port) "wQ" = ( /obj/effect/turf_decal/box/corners, /obj/structure/closet/crate/bin, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/mono, /area/ship/cargo) "wY" = ( @@ -2014,6 +2057,16 @@ /obj/item/bedsheet/dorms, /turf/open/floor/carpet, /area/ship/crew) +"Av" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/structure/chair{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/plasteel, +/area/ship/crew/canteen) "Az" = ( /obj/structure/curtain/bounty, /obj/machinery/light_switch{ @@ -2050,9 +2103,9 @@ /turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "BF" = ( -/obj/structure/catwalk/over/plated_catwalk, -/obj/effect/turf_decal/industrial/warning/fulltile, -/turf/open/floor/plasteel/tech/grid, +/obj/effect/turf_decal/borderfloor, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo) "BG" = ( /obj/structure/cable/yellow{ @@ -2170,8 +2223,8 @@ /obj/structure/cable/yellow{ icon_state = "6-8" }, -/obj/structure/chair/plastic{ - dir = 4 +/obj/structure/chair/sofa/brown/old/left{ + dir = 1 }, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) @@ -2394,6 +2447,8 @@ /obj/structure/cable/yellow{ icon_state = "5-8" }, +/obj/structure/closet/secure_closet/engineering_welding, +/obj/effect/turf_decal/borderfloorblack/full, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) "Gr" = ( @@ -2428,6 +2483,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/effect/turf_decal/industrial/warning, /turf/open/floor/pod/dark, /area/ship/maintenance/starboard) "GM" = ( @@ -2510,6 +2566,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "HY" = ( @@ -2725,8 +2782,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/power/shieldwallgen/atmos{ - id = "watchdog_holo"; +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "tortuga_holo"; dir = 1 }, /obj/machinery/door/poddoor/shutters{ @@ -2759,6 +2816,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/retro/smile{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/ship/crew/canteen) "Lb" = ( @@ -2790,17 +2850,29 @@ icon_state = "plating_rust" }, /area/ship/maintenance) +"Lo" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/door_assembly/door_assembly_hatch{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/ship/maintenance) "Lt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/chair/plastic{ - dir = 8 - }, +/obj/structure/table, +/obj/item/storage/cans/sixbeer, +/obj/machinery/cell_charger, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "Lz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, /turf/open/floor/mineral/titanium, /area/ship/security/armory) "LG" = ( @@ -2830,6 +2902,16 @@ /turf/open/floor/plasteel/elevatorshaft, /area/ship/cargo) "Mb" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/structure/sign/warning/nosmoking{ + pixel_y = 32 + }, +/obj/item/cigbutt{ + pixel_x = -13; + pixel_y = -3 + }, /turf/open/floor/pod/dark, /area/ship/maintenance/starboard) "Mk" = ( @@ -2852,6 +2934,19 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/canteen) +"Ml" = ( +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/cargo) "Mn" = ( /obj/structure/catwalk/over/plated_catwalk, /obj/structure/railing{ @@ -2870,9 +2965,6 @@ /area/ship/cargo) "Mo" = ( /obj/structure/catwalk/over/plated_catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/industrial/stand_clear, /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2939,6 +3031,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/item/kirbyplants{ + icon_state = "plant-25"; + pixel_x = 8; + pixel_y = -5 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "MO" = ( @@ -2984,6 +3081,11 @@ icon_state = "computer-right" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/vomit/old{ + icon_state = "vomit_4"; + pixel_x = -9; + pixel_y = -6 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "Ol" = ( @@ -3060,6 +3162,20 @@ }, /turf/open/floor/plating/airless, /area/ship/maintenance) +"OH" = ( +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/industrial/stand_clear{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/cargo) "OI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -3073,6 +3189,19 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"OP" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/item/clothing/head/hardhat{ + pixel_x = 8; + pixel_y = -7 + }, +/turf/open/floor/plasteel/tech, +/area/ship/maintenance/port) "Pa" = ( /obj/structure/table/glass, /obj/effect/turf_decal/corner/opaque/blue/full, @@ -3179,6 +3308,7 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, +/obj/structure/tank_dispenser/oxygen, /turf/open/floor/plasteel/mono, /area/ship/cargo) "QM" = ( @@ -3215,7 +3345,7 @@ pixel_x = -3 }, /obj/machinery/button/shieldwallgen{ - id = "watchdog_holo"; + id = "tortuga_holo"; pixel_x = 8; pixel_y = 23 }, @@ -3251,6 +3381,7 @@ icon_state = "4-8" }, /obj/structure/closet/secure_closet/engineering_electrical, +/obj/effect/turf_decal/borderfloorblack/full, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) "RH" = ( @@ -3387,6 +3518,8 @@ }, /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/industrial/hatch, +/obj/structure/closet/firecloset, /turf/open/floor/pod/dark, /area/ship/maintenance/port) "SV" = ( @@ -3472,6 +3605,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/structure/closet/emcloset, /turf/open/floor/pod/dark, /area/ship/maintenance/port) "UE" = ( @@ -3498,6 +3632,14 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/plating/airless, /area/ship/maintenance) +"Vb" = ( +/obj/machinery/suit_storage_unit/industrial{ + suit_type = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "Vd" = ( /obj/structure/curtain/bounty, /turf/open/floor/plasteel, @@ -3587,9 +3729,6 @@ /area/ship/cargo) "VE" = ( /obj/structure/catwalk/over/plated_catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/industrial/stand_clear{ dir = 1 }, @@ -3694,6 +3833,16 @@ "Wx" = ( /turf/closed/wall/r_wall/rust, /area/ship/crew/canteen) +"WA" = ( +/obj/effect/turf_decal/borderfloor{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/ripped{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/cargo) "WF" = ( /turf/closed/wall/rust, /area/ship/cargo) @@ -3726,8 +3875,9 @@ /obj/structure/cable/yellow{ icon_state = "4-9" }, -/obj/structure/closet/secure_closet/engineering_welding, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/ship_gravity, +/obj/effect/turf_decal/borderfloorblack/full, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) "Xs" = ( @@ -3986,6 +4136,13 @@ }, /turf/open/floor/plating/airless, /area/ship/maintenance) +"ZY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/ship/security/armory) (1,1,1) = {" Ek @@ -4211,15 +4368,15 @@ oH Ek tq lh -Uo -EB +OH +Rn DG DG DG DG DG -uL -ld +Rn +Ml Td WF Ek @@ -4240,7 +4397,7 @@ Ek Ek Ek oH -HX +OP HX oH CG @@ -4253,7 +4410,7 @@ DG DG DG DG -BF +Rn Mo Td WF @@ -4288,7 +4445,7 @@ DG DG DG DG -BF +Rn ID Td Ko @@ -4420,7 +4577,7 @@ yl va Uw CG -VP +WA Uo OF tT @@ -4570,7 +4727,7 @@ wF uh nc nc -Td +BF Ko uQ GA @@ -4692,7 +4849,7 @@ QJ QJ QJ QJ -MI +Lo Ab rU Xc @@ -4745,7 +4902,7 @@ Yu qD jV Lz -dm +ZY mg qD qD @@ -4806,7 +4963,7 @@ Vg Ab jJ QT -oU +sM CE bD ng @@ -4852,7 +5009,7 @@ hU gD yH FP -hz +Vb qD MH Eb @@ -4945,7 +5102,7 @@ PV yd rU Lb -gQ +Av gQ LG YI @@ -5166,7 +5323,7 @@ oq SJ mB mw -MI +Lo QJ QJ QJ diff --git a/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm b/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm index 821918d660f2..d9c361701213 100644 --- a/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm +++ b/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm @@ -3,18 +3,15 @@ /obj/structure/cable/yellow{ icon_state = "4-9" }, -/obj/structure/cable/yellow{ - icon_state = "2-9" - }, /turf/open/floor/plasteel/patterned/ridged, /area/ship/bridge) "c" = ( /obj/machinery/door/poddoor/shutters{ id = "brawler_starboard" }, -/obj/machinery/power/shieldwallgen/atmos{ - id = "brawler_starboard_holo"; - dir = 8 +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "brawler_starboard_holo" }, /obj/structure/cable/yellow, /turf/open/floor/engine/hull/interior, @@ -73,6 +70,55 @@ "k" = ( /turf/template_noop, /area/template_noop) +"l" = ( +/obj/machinery/door/poddoor/shutters{ + id = "brawler_starboard" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "brawler_starboard_holo" + }, +/obj/structure/cable/yellow, +/obj/machinery/button/door{ + dir = 4; + pixel_y = 7; + pixel_x = -23; + id = "brawler_starboard" + }, +/obj/machinery/button/shieldwallgen{ + pixel_y = -7; + pixel_x = -23; + id = "brawler_starboard_holo"; + dir = 4 + }, +/turf/open/floor/engine/hull/interior, +/area/ship/bridge) +"m" = ( +/obj/machinery/button/door{ + pixel_x = -23; + pixel_y = -7; + id = "brawler_port"; + dir = 4 + }, +/obj/machinery/button/shieldwallgen{ + pixel_y = 7; + pixel_x = -23; + id = "brawler_port_holo"; + dir = 4 + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "brawler_port_holo" + }, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "brawler_port" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/engine/hull/interior, +/area/ship/bridge) "o" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -91,7 +137,6 @@ pixel_x = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/smes/engineering, /obj/effect/turf_decal/siding/thinplating/end{ dir = 8 }, @@ -112,10 +157,17 @@ /obj/structure/cable/yellow{ icon_state = "0-5" }, +/obj/structure/cable/yellow{ + icon_state = "1-10" + }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable/yellow{ + icon_state = "2-10" + }, /turf/open/floor/plasteel, /area/ship/bridge) "r" = ( -/obj/machinery/power/shieldwallgen/atmos{ +/obj/machinery/power/shieldwallgen/atmos/roundstart{ id = "brawler_aft_holo"; dir = 1 }, @@ -151,9 +203,6 @@ /obj/structure/cable/yellow{ icon_state = "4-10" }, -/obj/structure/cable/yellow{ - icon_state = "1-10" - }, /turf/open/floor/plasteel/patterned/ridged, /area/ship/bridge) "v" = ( @@ -186,9 +235,9 @@ dir = 1; id = "brawler_port" }, -/obj/machinery/power/shieldwallgen/atmos{ - id = "brawler_port_holo"; - dir = 8 +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "brawler_port_holo" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -219,29 +268,9 @@ dir = 1; id = "brawler_port" }, -/obj/machinery/power/shieldwallgen/atmos{ - id = "brawler_port_holo"; - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/button/door{ - pixel_x = -23; - pixel_y = -7; - id = "brawler_port"; - dir = 4 - }, -/obj/machinery/button/shieldwallgen{ - pixel_y = 7; - pixel_x = -23; - id = "brawler_port_holo"; - dir = 4 - }, /turf/open/floor/engine/hull/interior, /area/ship/bridge) "B" = ( -/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /obj/item/trash/can/food{ pixel_x = 7; @@ -263,6 +292,9 @@ pixel_y = 2 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/patterned/ridged, /area/ship/bridge) "D" = ( @@ -291,7 +323,7 @@ dir = 8; id = "brawler_aft" }, -/obj/machinery/power/shieldwallgen/atmos{ +/obj/machinery/power/shieldwallgen/atmos/roundstart{ id = "brawler_aft_holo" }, /obj/structure/cable/yellow{ @@ -323,6 +355,9 @@ /obj/effect/decal/cleanable/wrapping{ pixel_y = 25 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/patterned/ridged, /area/ship/bridge) "I" = ( @@ -336,9 +371,7 @@ dir = 1 }, /obj/machinery/power/smes/shuttle/precharged, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, +/obj/structure/cable, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "J" = ( @@ -366,6 +399,7 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/light/floor, /turf/open/floor/plasteel, /area/ship/bridge) "L" = ( @@ -388,23 +422,6 @@ /obj/machinery/door/poddoor/shutters{ id = "brawler_starboard" }, -/obj/machinery/power/shieldwallgen/atmos{ - id = "brawler_starboard_holo"; - dir = 4 - }, -/obj/structure/cable/yellow, -/obj/machinery/button/door{ - dir = 4; - pixel_y = 7; - pixel_x = -23; - id = "brawler_starboard" - }, -/obj/machinery/button/shieldwallgen{ - pixel_y = -7; - pixel_x = -23; - id = "brawler_starboard_holo"; - dir = 4 - }, /turf/open/floor/engine/hull/interior, /area/ship/bridge) "N" = ( @@ -431,7 +448,6 @@ /turf/open/floor/plasteel, /area/ship/bridge) "P" = ( -/obj/machinery/light/directional/south, /obj/structure/cable/yellow{ icon_state = "5-8" }, @@ -524,11 +540,11 @@ k "} (3,1,1) = {" k -W +m C p G -W +l k "} (4,1,1) = {" From d511dcff78b5d06fdaaff28411fa33efa562fdae Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 9 Jul 2024 15:11:03 -0500 Subject: [PATCH 22/41] Automatic changelog generation for PR #3114 [ci skip] --- html/changelogs/AutoChangeLog-pr-3114.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3114.yml diff --git a/html/changelogs/AutoChangeLog-pr-3114.yml b/html/changelogs/AutoChangeLog-pr-3114.yml new file mode 100644 index 000000000000..f16a9e33a544 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3114.yml @@ -0,0 +1,5 @@ +author: meemofcourse +changes: + - {rscadd: Minor changes to the Tortuga.} + - {bugfix: The holofields on the Tortuga-class and Brawler-class now work.} +delete-after: true From c6a2bc4b6bf3b32e73aeb620b353dbda22531ffa Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 10 Jul 2024 00:55:15 +0000 Subject: [PATCH 23/41] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-3114.yml | 5 ----- html/changelogs/AutoChangeLog-pr-3192.yml | 4 ---- html/changelogs/archive/2024-07.yml | 6 ++++++ 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-3114.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3192.yml diff --git a/html/changelogs/AutoChangeLog-pr-3114.yml b/html/changelogs/AutoChangeLog-pr-3114.yml deleted file mode 100644 index f16a9e33a544..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3114.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: meemofcourse -changes: - - {rscadd: Minor changes to the Tortuga.} - - {bugfix: The holofields on the Tortuga-class and Brawler-class now work.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3192.yml b/html/changelogs/AutoChangeLog-pr-3192.yml deleted file mode 100644 index ec307090ff54..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3192.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Cloudbreak -changes: - - {bugfix: A few clothing items now properly display again for Vox.} -delete-after: true diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index bc62e40c6188..02670bd6dd87 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -40,3 +40,9 @@ generalthrax: - rscdel: Removed some irrelevant old tips of the round - rscadd: Added 80+ new tips more relevant to Shiptest's gameplay loop +2024-07-10: + Cloudbreak: + - bugfix: A few clothing items now properly display again for Vox. + meemofcourse: + - rscadd: Minor changes to the Tortuga. + - bugfix: The holofields on the Tortuga-class and Brawler-class now work. From 90b5c11fd448b3cd14dc54c5009998eef9cddccb Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Wed, 10 Jul 2024 01:13:02 -0400 Subject: [PATCH 24/41] Fixes another singular typo within the code (#3188) ## About The Pull Request Fixes another typo within the code ## Why It's Good For The Game You have evaded my gaze for too long, Unqiue. You must perish for the sake of grammatical correctness. ## Changelog :cl: Cloudbreak code: Fixes a singular typo within the code. /:cl: --- code/modules/projectiles/guns/energy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 0341c04f2c06..07eb9a159897 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -331,7 +331,7 @@ . = ..() var/obj/item/ammo_casing/energy/shot = ammo_type[select] if(ammo_type.len > 1) - . += "You can switch firemodes by pressing the unqiue action key. By default, this is space" + . += "You can switch firemodes by pressing the unique action key. By default, this is space" if(cell) . += "\The [name]'s cell has [cell.percent()]% charge remaining." . += "\The [name] has [round(cell.charge/shot.e_cost)] shots remaining on [shot.select_name] mode." From 645b03d29042cab554575bb8ae092d6e0cfb4318 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 10 Jul 2024 00:24:09 -0500 Subject: [PATCH 25/41] Automatic changelog generation for PR #3188 [ci skip] --- html/changelogs/AutoChangeLog-pr-3188.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3188.yml diff --git a/html/changelogs/AutoChangeLog-pr-3188.yml b/html/changelogs/AutoChangeLog-pr-3188.yml new file mode 100644 index 000000000000..e6394ead8bc6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3188.yml @@ -0,0 +1,4 @@ +author: Cloudbreak +changes: + - {code_imp: Fixes a singular typo within the code.} +delete-after: true From 42c282d3cec9be428b55f5456f00230d74d0aef7 Mon Sep 17 00:00:00 2001 From: Martinpachu <86135885+Martinpachu@users.noreply.github.com> Date: Wed, 10 Jul 2024 02:13:55 -0300 Subject: [PATCH 26/41] Makes pizza cheaper. (#3163) ## About The Pull Request Makes the cargo pack for pizza cheaper, 6000-3000 ## Why It's Good For The Game a little snack for a reasonable price, still pricier than less tasty options (donks and rations) ## Changelog :cl: balance: Pizzas have become cheaper. (6000 cr - 3000 cr) /:cl: --- code/modules/cargo/packs/food.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm index 7abc0188f9d9..c7d8b77f46a5 100644 --- a/code/modules/cargo/packs/food.dm +++ b/code/modules/cargo/packs/food.dm @@ -25,7 +25,7 @@ /datum/supply_pack/food/pizza name = "Pizza Crate" desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99.5% anomaly-free!" - cost = 6000 // Best prices this side of the galaxy. + cost = 3000// Best prices this side of the galaxy. contains = list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, From 730a08079187afe317e8f2248ab17319e00acaca Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 10 Jul 2024 00:36:52 -0500 Subject: [PATCH 27/41] Automatic changelog generation for PR #3163 [ci skip] --- html/changelogs/AutoChangeLog-pr-3163.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3163.yml diff --git a/html/changelogs/AutoChangeLog-pr-3163.yml b/html/changelogs/AutoChangeLog-pr-3163.yml new file mode 100644 index 000000000000..ff5ef750fe62 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3163.yml @@ -0,0 +1,4 @@ +author: Martinpachu +changes: + - {balance: Pizzas have become cheaper. (6000 cr - 3000 cr)} +delete-after: true From 0ef5a0d9973459f9896a3473e83c2ab4111a5787 Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Tue, 9 Jul 2024 22:14:20 -0700 Subject: [PATCH 28/41] Removes tatortots and fixes recipe issues (#3175) ## About The Pull Request Potatoes no longer turn into tator tots when put into the food processor, instead becoming fries. The potato wedge to fries recipe was removed as well. ## Why It's Good For The Game Fixes: https://github.com/shiptest-ss13/Shiptest/issues/2693, and despite tator tots existing the sprite sucks ass big time, has a flavour profile that references validhunting, and is Straight Up the only use for potato wedges for an item that is never put on the table. This subsequently prevents potato wedges from infinitely being able to be cut into itself, and be used for normal potato recipes. ## Changelog :cl: del: Removed tator tots and raw potato wedges /:cl: --- .../food_and_drinks/food/snacks_other.dm | 13 ------------- .../recipes/processor_recipes.dm | 6 +----- code/modules/hydroponics/grown/potato.dm | 19 ------------------- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 3d5adf18e6fd..1eca7970a517 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -112,19 +112,6 @@ . = ..() AddElement(/datum/element/dunkable, 10) -/obj/item/reagent_containers/food/snacks/tatortot - name = "tator tot" - desc = "A large fried potato nugget that may or may not try to valid you." - icon_state = "tatortot" - list_reagents = list(/datum/reagent/consumable/nutriment = 4) - filling_color = "FFD700" - tastes = list("potato" = 3, "valids" = 1) - foodtype = FRIED | VEGETABLES - -/obj/item/reagent_containers/food/snacks/tatortot/Initialize() - . = ..() - AddElement(/datum/element/dunkable, 10) - /obj/item/reagent_containers/food/snacks/soydope name = "soy dope" desc = "Dope from a soy." diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm index 55db7cf06b84..98c5fa053c8f 100644 --- a/code/modules/food_and_drinks/recipes/processor_recipes.dm +++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm @@ -13,17 +13,13 @@ input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet output = /obj/item/reagent_containers/food/snacks/meat/rawbacon -/datum/food_processor_process/potatowedges - input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges - output = /obj/item/reagent_containers/food/snacks/fries - /datum/food_processor_process/sweetpotato input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet output = /obj/item/reagent_containers/food/snacks/yakiimo /datum/food_processor_process/potato input = /obj/item/reagent_containers/food/snacks/grown/potato - output = /obj/item/reagent_containers/food/snacks/tatortot + output = /obj/item/reagent_containers/food/snacks/fries /datum/food_processor_process/carrot input = /obj/item/reagent_containers/food/snacks/grown/carrot diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index 703df831552e..44a987dc86ac 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -29,25 +29,6 @@ juice_results = list(/datum/reagent/consumable/potato_juice = 0) distill_reagent = /datum/reagent/consumable/ethanol/vodka -/obj/item/reagent_containers/food/snacks/grown/potato/wedges - name = "potato wedges" - desc = "Slices of neatly cut potato." - icon_state = "potato_wedges" - filling_color = "#E9967A" - bitesize = 100 - - -/obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params) - if(W.get_sharpness()) - to_chat(user, "You cut the potato into wedges with [W].") - var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges - remove_item_from_storage(user) - qdel(src) - user.put_in_hands(Wedges) - else - return ..() - - // Sweet Potato /obj/item/seeds/potato/sweet name = "pack of sweet potato seeds" From 9e93b6a28613110cd351aef1775859b22e9f0cc5 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 10 Jul 2024 00:49:30 -0500 Subject: [PATCH 29/41] Automatic changelog generation for PR #3175 [ci skip] --- html/changelogs/AutoChangeLog-pr-3175.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3175.yml diff --git a/html/changelogs/AutoChangeLog-pr-3175.yml b/html/changelogs/AutoChangeLog-pr-3175.yml new file mode 100644 index 000000000000..aba432d7ce74 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3175.yml @@ -0,0 +1,4 @@ +author: generalthrax +changes: + - {rscdel: Removed tator tots and raw potato wedges} +delete-after: true From e46c1aaf5889c4a82acf30134135134778810641 Mon Sep 17 00:00:00 2001 From: Imaginos16 <77556824+Imaginos16@users.noreply.github.com> Date: Tue, 9 Jul 2024 22:25:55 -0700 Subject: [PATCH 30/41] The Ares Poster Now Correctly Calls The Planet Mars (#3193) ## About The Pull Request Does what it says on the title. ![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/dc713a4f-685f-44d5-a73b-3a4e3cc24da1) ## Why It's Good For The Game It was a weird misconception that for some reason SolCon decided to rename all the planets into their greek counterparts. This is very much not the case, especially since if it *was*, Terra would've been called Gaia and the moon would've been called Selene instead of Luna. This does however mean that Uranus is now called Caelus, though this will be depicted in a poster in another time. ## Changelog :cl: PositiveEntropy fix: Mars and Venus are now referred to by their correct names! /:cl: --- code/game/objects/effects/contraband.dm | 10 +++++----- icons/obj/contraband.dmi | Bin 95677 -> 95682 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index ccfd89363482..4177d8957965 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -875,10 +875,10 @@ desc = "Terra, or Earth as it's called by inhabitants, the third planet in the Sol system. Home to the only life as humans knew it, until contact with the outside universe. This poster in particular is trying to attract tourists to Terra, listing attractions like the Grand Orrery and Neue Waldstätte." icon_state = "poster-solgov-terra" -/obj/structure/sign/poster/solgov/ares - name = "Ares" - desc = "Ares, fourth planet in the Sol system. While evidence suggests that Aphrodite and Ares may have once had life, Terra was the only one that kept it. This poster in particular is trying to attract tourists to Ares, listing attractions like skiing resorts and ancient robot exhibits." - icon_state = "poster-solgov-ares" +/obj/structure/sign/poster/solgov/mars + name = "Mars" + desc = "Mars, fourth planet in the Sol system. While evidence suggests that Venus and Mars may have once had life, Terra was the only one that kept it. This poster in particular is trying to attract tourists to Mars, listing attractions like skiing resorts and ancient robot exhibits." + icon_state = "poster-solgov-mars" /obj/structure/sign/poster/solgov/luna name = "Luna" @@ -892,7 +892,7 @@ /obj/structure/sign/poster/solgov/skiing name = "Lo-Fly Skiing Advert" - desc = "An advertisement for some low-gravity skiing resort on Ares. \"Popular with SUNS groups!\"" + desc = "An advertisement for some low-gravity skiing resort on Mars. \"Popular with SUNS groups!\"" icon_state = "poster-solgov-loskiing" /obj/structure/sign/poster/solgov/recyle diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index b34b3777adace0605e4072c50a1806f989cdd002..20fe8abf2d5c77c5b196f89f073f28ef68db344b 100644 GIT binary patch delta 33187 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 G@c#jz51{G* delta 33203 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 Date: Wed, 10 Jul 2024 01:02:20 -0500 Subject: [PATCH 31/41] Automatic changelog generation for PR #3193 [ci skip] --- html/changelogs/AutoChangeLog-pr-3193.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3193.yml diff --git a/html/changelogs/AutoChangeLog-pr-3193.yml b/html/changelogs/AutoChangeLog-pr-3193.yml new file mode 100644 index 000000000000..8d7f7ad8e9de --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3193.yml @@ -0,0 +1,4 @@ +author: PositiveEntropy +changes: + - {bugfix: Mars and Venus are now referred to by their correct names!} +delete-after: true From 412d624ff78067cef679eec32cfac7693c88e88a Mon Sep 17 00:00:00 2001 From: Imaginos16 <77556824+Imaginos16@users.noreply.github.com> Date: Tue, 9 Jul 2024 23:11:54 -0700 Subject: [PATCH 32/41] SolCon/SolGov Hardsuits (And Its Subtypes) Can Now Stow Away Guns! (#3187) ## About The Pull Request Does what it says on the tin. You can now holster guns, ammo and such on the armor slot while equipping the hardsuit. ## Why It's Good For The Game I almost got shot because people got terrified at the fact I had a gun on my hand, when I couldn't holster due to this oversight. Amazing. ## Changelog :cl: PositiveEntropy fix: You can now store guns, ammunition, and melee weapons on the armor slot when equipping a SolCon/SolGov hardsuit, and its subtypes! /:cl: --- code/modules/clothing/spacesuits/hardsuit.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 4827186a95c5..02fbb162892b 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -1217,6 +1217,7 @@ item_state = "hardsuit_solgov" armor = list("melee" = 50, "bullet" = 45, "laser" = 40, "energy" = 30, "bomb" = 60, "bio" = 100, "rad" = 60, "fire" = 90, "acid" = 75) //intentionally the fucking strong, this is master chief-tier armor //is this really what you call the strong?? is this the best solgov has to offer?????? helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov + allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) slowdown = 0 supports_variations = DIGITIGRADE_VARIATION From d7e061afa1f21dd99681b60b73ae814fb4bc3ff9 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 10 Jul 2024 01:22:13 -0500 Subject: [PATCH 33/41] Automatic changelog generation for PR #3187 [ci skip] --- html/changelogs/AutoChangeLog-pr-3187.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3187.yml diff --git a/html/changelogs/AutoChangeLog-pr-3187.yml b/html/changelogs/AutoChangeLog-pr-3187.yml new file mode 100644 index 000000000000..3d686a578daa --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3187.yml @@ -0,0 +1,5 @@ +author: PositiveEntropy +changes: + - {bugfix: 'You can now store guns, ammunition, and melee weapons on the armor slot + when equipping a SolCon/SolGov hardsuit, and its subtypes!'} +delete-after: true From e018ee774f600ae3519622fc77a01b6c48389255 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 11 Jul 2024 00:55:17 +0000 Subject: [PATCH 34/41] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-3163.yml | 4 ---- html/changelogs/AutoChangeLog-pr-3175.yml | 4 ---- html/changelogs/AutoChangeLog-pr-3187.yml | 5 ----- html/changelogs/AutoChangeLog-pr-3188.yml | 4 ---- html/changelogs/AutoChangeLog-pr-3193.yml | 4 ---- html/changelogs/archive/2024-07.yml | 11 +++++++++++ 6 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-3163.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3175.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3187.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3188.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3193.yml diff --git a/html/changelogs/AutoChangeLog-pr-3163.yml b/html/changelogs/AutoChangeLog-pr-3163.yml deleted file mode 100644 index ff5ef750fe62..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3163.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Martinpachu -changes: - - {balance: Pizzas have become cheaper. (6000 cr - 3000 cr)} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3175.yml b/html/changelogs/AutoChangeLog-pr-3175.yml deleted file mode 100644 index aba432d7ce74..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3175.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: generalthrax -changes: - - {rscdel: Removed tator tots and raw potato wedges} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3187.yml b/html/changelogs/AutoChangeLog-pr-3187.yml deleted file mode 100644 index 3d686a578daa..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3187.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PositiveEntropy -changes: - - {bugfix: 'You can now store guns, ammunition, and melee weapons on the armor slot - when equipping a SolCon/SolGov hardsuit, and its subtypes!'} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3188.yml b/html/changelogs/AutoChangeLog-pr-3188.yml deleted file mode 100644 index e6394ead8bc6..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3188.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Cloudbreak -changes: - - {code_imp: Fixes a singular typo within the code.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3193.yml b/html/changelogs/AutoChangeLog-pr-3193.yml deleted file mode 100644 index 8d7f7ad8e9de..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3193.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: PositiveEntropy -changes: - - {bugfix: Mars and Venus are now referred to by their correct names!} -delete-after: true diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index 02670bd6dd87..92ee91ee5671 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -46,3 +46,14 @@ meemofcourse: - rscadd: Minor changes to the Tortuga. - bugfix: The holofields on the Tortuga-class and Brawler-class now work. +2024-07-11: + Cloudbreak: + - code_imp: Fixes a singular typo within the code. + Martinpachu: + - balance: Pizzas have become cheaper. (6000 cr - 3000 cr) + PositiveEntropy: + - bugfix: Mars and Venus are now referred to by their correct names! + - bugfix: You can now store guns, ammunition, and melee weapons on the armor slot + when equipping a SolCon/SolGov hardsuit, and its subtypes! + generalthrax: + - rscdel: Removed tator tots and raw potato wedges From 2a02ee20b74bcdee6a8803b11682274b9191649f Mon Sep 17 00:00:00 2001 From: meem <75212565+meemofcourse@users.noreply.github.com> Date: Thu, 11 Jul 2024 18:44:16 -0400 Subject: [PATCH 35/41] Valor Remap, Minor Inteq Code Tweaks (#3115) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/67b0dbfa-3b5a-45fa-b6ee-2dab27b8c755) ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/8a62c180-cc96-449c-95cb-194685a789fa) * Remaps certain parts of the Valor. The Haste has not been touched apart from a single handrail. * The Valor now has a Shuttle Pilot, and a Shuttle Corpsman. The Shuttle Pilot gets an office and an outfit. * The Vanguard basetype was changed to be consistent with the other outfits (e.g. empty subtype instead of being empty by default) ## Why It's Good For The Game * there was complaints that the valor sucked * born to map dmm is a fuck 地图 strongdmm 2019 i am maptainer 410,757,864,350 mapping sins ## Changelog :cl: balance: Remapped the Valor, with two extra jobs (Shuttle Corpsman, Shuttle Pilot). code: The Vanguard base outfit starts with gear. /:cl: --- _maps/configs/inteq_colossus.json | 2 +- _maps/configs/inteq_hound.json | 2 +- _maps/configs/inteq_talos.json | 2 +- _maps/configs/inteq_valor.json | 11 +- _maps/configs/inteq_vaquero.json | 2 +- _maps/shuttles/inteq/inteq_valor.dmm | 1276 ++++++++--------- _maps/shuttles/subshuttles/inteq_haste.dmm | 11 +- code/modules/antagonists/ert/inteq.dm | 2 +- .../clothing/outfits/factions/inteq.dm | 62 +- 9 files changed, 662 insertions(+), 708 deletions(-) diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json index 29337cb015a2..718ecb9f1295 100644 --- a/_maps/configs/inteq_colossus.json +++ b/_maps/configs/inteq_colossus.json @@ -18,7 +18,7 @@ "limit": 1, "job_slots": { "Vanguard": { - "outfit": "/datum/outfit/job/inteq/captain", + "outfit": "/datum/outfit/job/inteq/captain/empty", "officer": true, "slots": 1 }, diff --git a/_maps/configs/inteq_hound.json b/_maps/configs/inteq_hound.json index cad19884158f..3d3617263f61 100644 --- a/_maps/configs/inteq_hound.json +++ b/_maps/configs/inteq_hound.json @@ -17,7 +17,7 @@ "limit": 2, "job_slots": { "Vanguard": { - "outfit": "/datum/outfit/job/inteq/captain", + "outfit": "/datum/outfit/job/inteq/captain/empty", "officer": true, "slots": 1 }, diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json index 207b29eca77b..54f134964470 100644 --- a/_maps/configs/inteq_talos.json +++ b/_maps/configs/inteq_talos.json @@ -18,7 +18,7 @@ "limit": 1, "job_slots": { "Vanguard": { - "outfit": "/datum/outfit/job/inteq/captain", + "outfit": "/datum/outfit/job/inteq/captain/empty", "officer": true, "slots": 1 }, diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json index 92162ac1a5da..1a3c957cc7b9 100644 --- a/_maps/configs/inteq_valor.json +++ b/_maps/configs/inteq_valor.json @@ -23,9 +23,18 @@ "officer": true, "slots": 1 }, + "Shuttle Pilot": { + "outfit": "/datum/outfit/job/inteq/warden/pilot", + "officer": true, + "slots": 1 + }, + "Shuttle Corpsman": { + "outfit": "/datum/outfit/job/inteq/paramedic/empty", + "slots": 1 + }, "Corpsman": { "outfit": "/datum/outfit/job/inteq/paramedic/empty", - "slots": 3 + "slots": 2 }, "Enforcer": { "outfit": "/datum/outfit/job/inteq/security/empty", diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json index e8d790a526dc..459b7353d292 100644 --- a/_maps/configs/inteq_vaquero.json +++ b/_maps/configs/inteq_vaquero.json @@ -15,7 +15,7 @@ "limit": 1, "job_slots": { "Vanguard": { - "outfit": "/datum/outfit/job/inteq/captain", + "outfit": "/datum/outfit/job/inteq/captain/empty", "officer": true, "slots": 1 }, diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index b98d0f2f13cd..1d0c4910e49e 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -81,27 +81,8 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "aW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/grunge{ - name = "Medbay" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/turf/open/floor/plasteel/dark, -/area/ship/medical) +/turf/open/floor/plasteel/patterned/grid, +/area/ship/hallway/port) "bh" = ( /obj/structure/railing{ dir = 6 @@ -115,34 +96,15 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "bv" = ( -/obj/effect/turf_decal/box/white/corners, -/obj/effect/turf_decal/box/white/corners{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/closet/secure_closet{ - icon_state = "med_secure"; - name = "corpsman's locker"; - req_access = list(5) - }, -/obj/item/clothing/under/syndicate/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, -/obj/item/clothing/suit/armor/inteq/corpsman, -/obj/item/clothing/head/soft/inteq/corpsman, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/medic, -/obj/item/pinpointer/crew, -/obj/item/storage/belt/medical/webbing, -/obj/item/storage/firstaid/regular, -/turf/open/floor/plasteel/patterned/ridged, +/obj/machinery/suit_storage_unit/inherit, +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plasteel, /area/ship/crew/office) "bx" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 4 - }, -/obj/structure/closet/firecloset/wall/directional/north, -/turf/open/floor/plasteel/patterned, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "bB" = ( /turf/closed/wall/mineral/plastitanium, @@ -262,14 +224,10 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/port) "cE" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plasteel/patterned, +/obj/machinery/autolathe, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "cI" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ icon_state = "4-8" }, @@ -279,8 +237,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/tech/grid, +/obj/machinery/light_switch{ + pixel_y = 20 + }, +/turf/open/floor/plasteel/stairs{ + dir = 8 + }, /area/ship/cargo) "cW" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ @@ -389,6 +351,7 @@ /obj/effect/turf_decal/trimline/opaque/brown/line{ dir = 1 }, +/obj/structure/chair, /turf/open/floor/plasteel/dark, /area/ship/medical) "dG" = ( @@ -457,6 +420,10 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "ec" = ( @@ -508,7 +475,6 @@ /area/ship/bridge) "el" = ( /obj/docking_port/mobile{ - can_move_docking_ports = 1; dir = 2; name = "valor docking port"; port_direction = 8; @@ -532,10 +498,16 @@ /obj/item/storage/box/zipties, /obj/item/reagent_containers/spray/pepper, /obj/item/megaphone/sec, -/obj/item/clothing/suit/armor/vest/alt, -/obj/item/clothing/suit/armor/vest/alt, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/suit/armor/vest, /obj/item/kitchen/knife/combat/survival, /obj/item/kitchen/knife/combat/survival, +/obj/machinery/recharger{ + pixel_x = -16; + pixel_y = 5 + }, +/obj/item/clothing/mask/gas/sechailer/balaclava/inteq, +/obj/item/clothing/mask/gas/sechailer/balaclava/inteq, /turf/open/floor/plasteel/dark, /area/ship/security) "ey" = ( @@ -558,21 +530,28 @@ "eU" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = -2; - pixel_y = 7 + pixel_x = -7; + pixel_y = 10 }, /obj/item/reagent_containers/medigel/sterilizine{ - pixel_x = 8; + pixel_x = -1; pixel_y = 3 }, /obj/effect/turf_decal/borderfloorwhite, +/obj/machinery/button/door{ + id = "valor_surgery"; + name = "Privacy Shutters"; + pixel_y = 8; + dir = 1; + pixel_x = 8 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "eV" = ( -/obj/structure/closet/firecloset/wall/directional/south, /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/closet/firecloset/wall/directional/south, /turf/open/floor/plating, /area/ship/maintenance/port) "eZ" = ( @@ -600,14 +579,19 @@ /obj/effect/spawner/lootdrop/ration, /obj/effect/spawner/lootdrop/ration, /obj/item/storage/ration/crayons, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "fj" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/structure/closet/secure_closet/medical2, /obj/machinery/airalarm/directional/north, +/obj/machinery/vending/medical/syndicate_access{ + name = "\improper InteqMed Plus" + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "fE" = ( @@ -630,7 +614,8 @@ /area/ship/cargo) "fK" = ( /obj/machinery/computer/crew{ - dir = 8 + dir = 8; + icon_state = "computer-middle" }, /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/turf_decal/corner/opaque/brown{ @@ -642,33 +627,43 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "fN" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/hallway/port) "fO" = ( /obj/structure/closet/secure_closet{ - icon_state = "med_secure"; - name = "corpsman's locker"; - req_access = list(5) + icon_state = "prisoner"; + name = "shuttle pilot locker"; + req_access = list(3); + icon_door = "prisoner" }, -/obj/item/clothing/under/syndicate/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, -/obj/item/clothing/suit/armor/inteq/corpsman, -/obj/item/clothing/head/soft/inteq/corpsman, -/obj/effect/turf_decal/siding/thinplating, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/medic, -/obj/item/pinpointer/crew, -/obj/item/storage/belt/medical/webbing, -/obj/item/storage/firstaid/regular, -/turf/open/floor/plasteel/patterned/ridged, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/item/clothing/suit/armor/vest/alt, +/obj/item/radio/headset/inteq, +/obj/item/clothing/gloves/fingerless, +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/clothing/head/helmet/swat/inteq, +/obj/item/clothing/mask/gas/sechailer, +/turf/open/floor/plasteel, /area/ship/crew/office) "gb" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 10 }, +/obj/machinery/light/directional/west, +/obj/structure/chair/sofa/brown/left{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "gh" = ( @@ -678,14 +673,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/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/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "2-8" }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) @@ -740,14 +735,7 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "gq" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/machinery/light/small/directional/east, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20 - }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "gt" = ( /obj/effect/decal/cleanable/dirt, @@ -767,11 +755,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/medical) "gZ" = ( @@ -796,6 +785,9 @@ "hl" = ( /obj/effect/turf_decal/siding/thinplating, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/chair/sofa/brown/right{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "hm" = ( @@ -870,7 +862,7 @@ dir = 8; pixel_x = 12 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) "id" = ( /obj/structure/cable{ @@ -897,6 +889,7 @@ }, /obj/structure/chair/sofa/brown/left/directional/west, /obj/structure/closet/firecloset/wall/directional/south, +/obj/machinery/computer/helm/viewscreen/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "ix" = ( @@ -912,13 +905,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"iI" = ( -/obj/effect/turf_decal/industrial/traffic{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/traffic/corner, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "iN" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 5 @@ -971,7 +957,11 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plasteel/patterned/cargo_one, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "jk" = ( /obj/structure/cable{ @@ -1017,15 +1007,9 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "jG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/traffic{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/stand_clear{ - dir = 4 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/obj/machinery/rnd/server, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/medical) "jL" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, @@ -1036,12 +1020,13 @@ /turf/open/floor/plating, /area/ship/medical) "jN" = ( -/obj/structure/chair/office/light, +/obj/structure/chair/office, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/corner/transparent/inteqbrown/half, +/turf/open/floor/plasteel, /area/ship/crew/office) "jQ" = ( /obj/structure/catwalk/over/plated_catwalk, @@ -1068,14 +1053,18 @@ /turf/closed/wall/mineral/plastitanium, /area/ship/bridge) "jT" = ( -/obj/structure/sign/poster/contraband/cardinal_port_starboard{ - pixel_y = 32 +/obj/structure/rack, +/obj/item/roller, +/obj/item/roller{ + pixel_x = -1; + pixel_y = 8 }, -/obj/effect/turf_decal/techfloor{ - dir = 8 +/obj/item/roller{ + pixel_x = 1; + pixel_y = 16 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/medical) "jU" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 10 @@ -1130,20 +1119,11 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"ky" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/ship/hallway/port) "kG" = ( /obj/effect/turf_decal/techfloor{ dir = 8 }, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "kH" = ( @@ -1186,19 +1166,20 @@ "kL" = ( /obj/machinery/light/directional/south, /obj/structure/rack, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "kW" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 }, -/obj/structure/closet/crate/bin, -/obj/item/trash/chips, -/obj/item/trash/energybar, -/obj/item/trash/cheesie, -/obj/item/trash/pistachios, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/door/airlock/grunge{ + name = "Medbay" + }, +/turf/open/floor/plasteel/dark, +/area/ship/medical) "lc" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable{ @@ -1278,10 +1259,6 @@ /area/ship/crew/canteen) "lN" = ( /obj/structure/table, -/obj/machinery/computer/med_data/laptop{ - dir = 1; - pixel_y = 8 - }, /obj/machinery/door/window/southleft, /obj/structure/window/reinforced{ dir = 8 @@ -1290,6 +1267,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/turf_decal/corner/transparent/inteqbrown/full, /turf/open/floor/plasteel/patterned, /area/ship/crew/office) "lW" = ( @@ -1361,8 +1339,11 @@ /turf/open/floor/plasteel/tech, /area/ship/medical) "mt" = ( -/obj/machinery/autolathe, -/turf/open/floor/plasteel/patterned/ridged, +/obj/structure/rack, +/obj/item/tank/internals/plasmaman/full, +/obj/item/tank/internals/plasmaman/full, +/obj/item/tank/internals/plasmaman/full, +/turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "mw" = ( /obj/effect/turf_decal/trimline/opaque/brown/warning{ @@ -1412,30 +1393,19 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "mG" = ( -/obj/structure/closet/secure_closet{ - icon_state = "med_secure"; - name = "corpsman's locker"; - req_access = list(5) - }, -/obj/item/clothing/under/syndicate/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, -/obj/item/clothing/suit/armor/inteq/corpsman, -/obj/item/clothing/head/soft/inteq/corpsman, -/obj/effect/turf_decal/box/white/corners{ +/obj/effect/turf_decal/corner/transparent/inteqbrown/border{ dir = 1 }, -/obj/effect/turf_decal/box/white/corners{ - dir = 8 +/obj/structure/table, +/obj/item/book/manual/wiki/piloting{ + pixel_x = 7; + pixel_y = 7 }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 10 +/obj/item/flashlight/lamp{ + pixel_x = -8; + pixel_y = 11 }, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/medic, -/obj/item/pinpointer/crew, -/obj/item/storage/belt/medical/webbing, -/obj/item/storage/firstaid/regular, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel, /area/ship/crew/office) "mH" = ( /obj/machinery/power/apc/auto_name/directional/east, @@ -1537,7 +1507,7 @@ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ - name = "Surgical Bay #2" + name = "Surgical Bay" }, /turf/open/floor/plasteel/white, /area/ship/medical) @@ -1601,13 +1571,6 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "oz" = ( -/obj/structure/railing{ - dir = 4; - layer = 2.9 - }, -/obj/effect/turf_decal/borderfloor/corner{ - dir = 4 - }, /obj/structure/cable{ icon_state = "6-8" }, @@ -1615,8 +1578,8 @@ /area/ship/cargo) "oC" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/head/helmet/space/orange, /obj/effect/turf_decal/techfloor{ dir = 1 }, @@ -1754,10 +1717,8 @@ /area/ship/crew/cryo) "pC" = ( /obj/structure/table/optable, -/obj/machinery/defibrillator_mount/loaded{ - pixel_x = -28 - }, -/turf/open/floor/plasteel/white, +/obj/structure/curtain, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) "pL" = ( /obj/machinery/power/terminal{ @@ -1801,22 +1762,44 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "qe" = ( -/obj/effect/turf_decal/industrial/traffic, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"qk" = ( -/obj/machinery/light/small/directional/west, -/obj/effect/turf_decal/techfloor{ +/obj/structure/closet/secure_closet{ + icon_state = "med_secure"; + name = "corpsman's locker"; + req_access = list(5) + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/belt/medical/webbing, +/obj/item/pinpointer/crew, +/obj/item/storage/backpack/medic, +/obj/item/storage/backpack/messenger/med, +/obj/item/clothing/head/soft/inteq/corpsman, +/obj/item/clothing/suit/armor/inteq/corpsman, +/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman, +/obj/effect/turf_decal/siding/thinplating{ dir = 4 }, -/obj/structure/closet/emcloset, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/medical) +"qk" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/hatch, +/turf/open/floor/plasteel/patterned, +/area/ship/medical) "qt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "qA" = ( @@ -1859,6 +1842,9 @@ "qR" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "valor_surgery" + }, /turf/open/floor/plating, /area/ship/medical) "qW" = ( @@ -1913,11 +1899,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-8" }, /turf/open/floor/plasteel/dark, /area/ship/medical) @@ -1971,7 +1956,6 @@ "sc" = ( /obj/structure/rack, /obj/machinery/firealarm/directional/east, -/obj/item/radio/intercom/directional/south, /obj/item/defibrillator/loaded{ pixel_x = 3; pixel_y = 10 @@ -1980,6 +1964,10 @@ pixel_x = -2; pixel_y = 2 }, +/obj/machinery/smartfridge/bloodbank/preloaded{ + density = 0; + pixel_y = -32 + }, /turf/open/floor/plasteel/mono/white, /area/ship/medical) "se" = ( @@ -2004,27 +1992,24 @@ /obj/effect/turf_decal/borderfloorwhite{ dir = 1 }, -/obj/machinery/door/airlock/medical/glass{ - name = "Surgical Bay #1" +/obj/machinery/door/airlock/medical{ + name = "Morgue" }, /turf/open/floor/plasteel/white, /area/ship/medical) "ss" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel/patterned, +/obj/structure/rack, +/obj/item/pickaxe/emergency, +/obj/item/pickaxe/emergency, +/obj/item/pickaxe/emergency, +/turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "su" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/brown/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/chair, -/obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel/dark, /area/ship/medical) "sy" = ( @@ -2059,7 +2044,6 @@ /obj/item/ammo_box/magazine/co9mm, /obj/item/ammo_box/magazine/co9mm, /obj/item/ammo_box/magazine/co9mm, -/obj/machinery/recharger, /turf/open/floor/plasteel/dark, /area/ship/security) "sz" = ( @@ -2118,10 +2102,6 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "te" = ( -/obj/structure/railing{ - dir = 1; - layer = 2.9 - }, /obj/effect/turf_decal/borderfloor{ dir = 1 }, @@ -2137,6 +2117,9 @@ /obj/item/target/syndicate{ pixel_y = 5 }, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "tf" = ( @@ -2163,20 +2146,8 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "tj" = ( -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_y = 20 - }, -/turf/open/floor/plasteel/tech/grid, +/obj/effect/turf_decal/industrial/traffic, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "tk" = ( /obj/structure/reagent_dispensers/watertank, @@ -2218,25 +2189,17 @@ "tS" = ( /obj/effect/turf_decal/siding/thinplating, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "tZ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/office) "ua" = ( -/obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "un" = ( @@ -2261,16 +2224,16 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "ux" = ( -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/trimline/opaque/brown/warning{ + dir = 1 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) +/turf/open/floor/plasteel/dark, +/area/ship/medical) "uA" = ( /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 4 @@ -2293,19 +2256,16 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/noticeboard{ pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "uS" = ( @@ -2329,12 +2289,10 @@ /turf/open/floor/plating, /area/ship/cargo) "vh" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/turf/open/floor/plating, +/area/ship/hallway/port) "vi" = ( /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 8 @@ -2481,7 +2439,8 @@ dir = 10 }, /obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/corner/transparent/inteqbrown/half, +/turf/open/floor/plasteel, /area/ship/crew/office) "wS" = ( /obj/machinery/power/terminal{ @@ -2506,18 +2465,12 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "xg" = ( -/obj/machinery/light/directional/south, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/turf/open/floor/plasteel/dark, +/area/ship/medical) "xj" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) @@ -2530,6 +2483,9 @@ dir = 1; pixel_y = -20 }, +/obj/structure/chair{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "xp" = ( @@ -2554,24 +2510,16 @@ "xr" = ( /obj/structure/table, /obj/item/paper_bin, -/obj/item/folder/white{ - pixel_x = -15; - pixel_y = -1 - }, /obj/item/pen, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/toy/figure/paramedic{ - name = "Corpsman action figure"; - pixel_x = -13; - pixel_y = 14 - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/turf_decal/corner/transparent/inteqbrown/full, /turf/open/floor/plasteel/patterned, /area/ship/crew/office) "xs" = ( @@ -2672,19 +2620,15 @@ dir = 4 }, /obj/structure/rack, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "yK" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/industrial/traffic{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/ship/medical) +/obj/effect/turf_decal/industrial/traffic/corner, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "yN" = ( /obj/structure/chair/office/dark, /obj/effect/turf_decal/corner/opaque/brown{ @@ -2717,7 +2661,8 @@ /area/ship/maintenance/port) "zi" = ( /obj/machinery/computer/helm{ - dir = 8 + dir = 8; + icon_state = "computer-middle" }, /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/turf_decal/corner/opaque/brown{ @@ -2741,15 +2686,17 @@ }, /obj/machinery/airalarm/directional/south, /obj/machinery/fax/inteq{ - pixel_y = 3 + pixel_y = 6 }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "zs" = ( -/obj/effect/turf_decal/siding/thinplating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, +/obj/effect/turf_decal/siding/thinplating/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "zA" = ( @@ -2767,23 +2714,18 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "zC" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 }, -/obj/machinery/smartfridge/bloodbank/preloaded{ - density = 0; - pixel_y = 32 +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 }, -/obj/structure/table, -/obj/machinery/cell_charger, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/plasteel/dark, /area/ship/medical) "zD" = ( -/obj/machinery/computer/operating{ - dir = 4 - }, -/obj/effect/turf_decal/borderfloorwhite, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/borderfloorblack, +/obj/structure/bodycontainer/morgue, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) "zE" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -2823,34 +2765,20 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "zI" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/grunge{ - name = "Cargo Bay" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/borderfloorblack, +/obj/machinery/door/airlock/hatch, /turf/open/floor/plasteel/patterned, /area/ship/medical) "zK" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/public/glass{ - name = "Supply Storage" - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 5 +/obj/docking_port/stationary{ + dir = 4; + dwidth = 15; + height = 15; + name = "valor airlock dock"; + width = 15 }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/turf/template_noop, +/area/template_noop) "zL" = ( /obj/structure/chair{ dir = 1 @@ -2868,22 +2796,10 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "zS" = ( -/obj/structure/table, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 }, -/obj/item/storage/box/masks{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/storage/box/gloves{ - pixel_x = 8; - pixel_y = 10 - }, -/obj/structure/sign/poster/official/walk{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/plasteel/dark, /area/ship/medical) "zT" = ( /obj/structure/railing, @@ -2932,24 +2848,19 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "Au" = ( -/obj/structure/rack, -/obj/item/roller, -/obj/item/roller{ - pixel_x = -1; - pixel_y = 8 - }, -/obj/item/roller{ - pixel_x = 1; - pixel_y = 16 - }, +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/blood/universal, +/obj/item/reagent_containers/blood/universal, +/obj/item/reagent_containers/blood/universal, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/area/ship/medical) "Av" = ( /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) @@ -2958,17 +2869,25 @@ /area/ship/maintenance/starboard) "AE" = ( /obj/structure/table, +/obj/machinery/airalarm/directional/east, +/obj/item/storage/box/gloves{ + pixel_x = -6; + pixel_y = 4 + }, /obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = -2; - pixel_y = 7 + pixel_x = 4; + pixel_y = 14 }, -/obj/item/reagent_containers/medigel/sterilizine{ - pixel_x = 8; - pixel_y = 3 +/obj/effect/turf_decal/borderfloorblack, +/obj/item/reagent_containers/glass/bottle/formaldehyde{ + pixel_x = 9; + pixel_y = 4 }, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/borderfloorwhite, -/turf/open/floor/plasteel/white, +/obj/item/reagent_containers/syringe{ + pixel_y = -4; + pixel_x = -7 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) "AG" = ( /obj/structure/bed, @@ -3069,7 +2988,10 @@ /obj/structure/sign/poster/official/help_others{ pixel_y = 32 }, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/corner/transparent/inteqbrown/border{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/ship/crew/office) "BL" = ( /obj/effect/turf_decal/corner/opaque/brown{ @@ -3090,14 +3012,11 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "BV" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "valor_external" +/obj/effect/turf_decal/techfloor{ + dir = 8 }, -/obj/structure/closet/crate/bin, -/turf/open/floor/plating, +/obj/structure/closet/emcloset, +/turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Cb" = ( /obj/effect/turf_decal/industrial/traffic{ @@ -3134,14 +3053,28 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "CC" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/closet/secure_closet{ + icon_state = "med_secure"; + name = "corpsman's locker"; + req_access = list(5) }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ship/hallway/port) +/obj/item/storage/firstaid/regular, +/obj/item/storage/belt/medical/webbing, +/obj/item/pinpointer/crew, +/obj/item/storage/backpack/medic, +/obj/item/storage/backpack/messenger/med, +/obj/item/clothing/head/soft/inteq/corpsman, +/obj/item/clothing/suit/armor/inteq/corpsman, +/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman, +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 5 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/medical) "CF" = ( /obj/structure/table/optable, /obj/machinery/defibrillator_mount/loaded{ @@ -3309,22 +3242,15 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "DR" = ( -/obj/machinery/door/airlock/hatch{ - name = "Cargo Bay" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/turf_decal/borderfloorblack{ - dir = 1 +/obj/effect/turf_decal/borderfloorblack, +/obj/machinery/door/airlock/hatch{ + name = "Port Hallway" }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "DT" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -3393,18 +3319,16 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "EE" = ( -/obj/effect/turf_decal/trimline/opaque/brown/line{ - dir = 5 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 5 - }, -/obj/structure/chair, -/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/light_switch{ dir = 8; pixel_x = 20 }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/brown/line{ + dir = 5 + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "EJ" = ( @@ -3467,6 +3391,10 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ff" = ( @@ -3490,18 +3418,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) -"Ft" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "FF" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -3545,9 +3461,8 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "FY" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/stairs, -/area/ship/cargo) +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/medical) "FZ" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 1 @@ -3571,7 +3486,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/corner/transparent/inteqbrown/half, +/turf/open/floor/plasteel, /area/ship/crew/office) "Go" = ( /obj/effect/turf_decal/corner/opaque/brown{ @@ -3625,8 +3541,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) @@ -3640,18 +3559,14 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Hw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/door/airlock/public/glass{ - name = "EVA Storage" - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 +/obj/machinery/door/airlock/hatch{ + name = "Port Hallway" }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "HA" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -3759,10 +3674,8 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "Io" = ( -/obj/machinery/rnd/server, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/turf/open/floor/plasteel/patterned, +/area/ship/medical) "IA" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 @@ -3791,15 +3704,12 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "IL" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -20 +/obj/effect/turf_decal/techfloor{ + dir = 8 }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "IM" = ( /obj/effect/turf_decal/corner/opaque/brown{ dir = 4 @@ -3851,6 +3761,15 @@ "Jn" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/structure/table, +/obj/item/storage/box/masks{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/storage/box/gloves{ + pixel_x = 8; + pixel_y = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/medical) "Jt" = ( @@ -3875,19 +3794,11 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "JS" = ( -/obj/structure/railing{ - dir = 9; - layer = 2.9 - }, -/obj/effect/turf_decal/borderfloor{ - dir = 1 - }, -/obj/effect/turf_decal/box/corners{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plasteel/patterned/cargo_one, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "JT" = ( /obj/docking_port/stationary{ @@ -3937,6 +3848,10 @@ /area/ship/crew/canteen) "Kn" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Ko" = ( @@ -3962,6 +3877,10 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Kz" = ( @@ -3999,18 +3918,9 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "KU" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "KV" = ( @@ -4096,12 +4006,14 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Ls" = ( -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/industrial/traffic{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/stand_clear{ dir = 4 }, -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "LH" = ( /obj/machinery/light/floor, /obj/structure/cable{ @@ -4121,20 +4033,38 @@ }, /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/borderfloorwhite, +/obj/machinery/button/door{ + id = "valor_surgery"; + name = "Privacy Shutters"; + pixel_y = -23; + dir = 1; + pixel_x = -7 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "LL" = ( -/obj/structure/rack, -/obj/item/pickaxe/emergency, -/obj/item/pickaxe/emergency, -/obj/item/pickaxe/emergency, -/obj/machinery/airalarm/directional/east, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -20 +/obj/structure/closet/secure_closet{ + icon_state = "med_secure"; + name = "corpsman's locker"; + req_access = list(5) + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/belt/medical/webbing, +/obj/item/pinpointer/crew, +/obj/item/storage/backpack/medic, +/obj/item/storage/backpack/messenger/med, +/obj/item/clothing/head/soft/inteq/corpsman, +/obj/item/clothing/suit/armor/inteq/corpsman, +/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/under/syndicate/inteq/corpsman, +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 6 }, /turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/area/ship/medical) "LR" = ( /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 @@ -4189,9 +4119,6 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "ME" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medical Office" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -4201,6 +4128,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/airlock/grunge{ + req_access = list(3) + }, /turf/open/floor/plasteel/patterned, /area/ship/crew/office) "MK" = ( @@ -4213,13 +4143,16 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "MR" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/obj/structure/sign/poster/official/safety_internals{ - pixel_y = 32 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/patterned/ridged, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "Nh" = ( /turf/closed/wall/mineral/plastitanium, @@ -4369,11 +4302,13 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Oj" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 8 +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/head/helmet/space/inteq, +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/obj/structure/closet/emcloset/wall/directional/north, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Ok" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -4412,40 +4347,40 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "OK" = ( -/obj/machinery/iv_drip/saline, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/obj/effect/turf_decal/borderfloorblack, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/medical) "OM" = ( /turf/open/floor/pod, /area/ship/cargo) "OR" = ( -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/hallway/port) "OT" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "OV" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/ship/medical) +/turf/open/floor/plasteel/patterned/grid, +/area/ship/hallway/port) "Pb" = ( /obj/machinery/power/terminal{ dir = 8 @@ -4505,7 +4440,8 @@ dir = 1; pixel_y = -20 }, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/corner/transparent/inteqbrown/half, +/turf/open/floor/plasteel, /area/ship/crew/office) "PL" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -4539,19 +4475,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) -"Qd" = ( -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) "Qk" = ( /obj/structure/table, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -4583,7 +4506,8 @@ dir = 4 }, /obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/corner/transparent/inteqbrown/half, +/turf/open/floor/plasteel, /area/ship/crew/office) "Qw" = ( /obj/effect/turf_decal/siding/thinplating{ @@ -4605,6 +4529,12 @@ /obj/structure/sign/warning/vacuum{ pixel_x = 32 }, +/obj/structure/table/glass, +/obj/machinery/computer/med_data/laptop{ + dir = 8; + pixel_y = 7; + pixel_x = 3 + }, /turf/open/floor/plasteel/tech, /area/ship/medical) "QG" = ( @@ -4648,20 +4578,11 @@ dir = 10 }, /obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/sign/warning/incident{ - pixel_y = 32 - }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Re" = ( -/obj/structure/closet/crate/freezer, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood/universal, -/obj/item/reagent_containers/blood/universal, -/obj/item/reagent_containers/blood/universal, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/turf/open/floor/plasteel/dark, +/area/ship/medical) "Rh" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/security) @@ -4721,6 +4642,9 @@ "Sd" = ( /obj/effect/turf_decal/siding/thinplating, /obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "Sf" = ( @@ -4736,12 +4660,15 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "Sh" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 4 +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/ship/hallway/central) "Sl" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -4870,17 +4797,9 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 4 - }, /obj/effect/turf_decal/trimline/opaque/brown/warning{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/medical) "Uj" = ( @@ -4939,7 +4858,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/light/directional/south, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "UO" = ( @@ -4955,6 +4873,8 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Ve" = ( +/obj/structure/table, +/obj/machinery/cell_charger, /turf/open/floor/plasteel/tech, /area/ship/medical) "Vp" = ( @@ -4985,8 +4905,7 @@ /obj/effect/turf_decal/techfloor{ dir = 4 }, -/obj/structure/closet/firecloset, -/turf/open/floor/plasteel/tech, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/hallway/central) "VB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -5121,6 +5040,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/firealarm/directional/west, +/obj/structure/chair, /turf/open/floor/plasteel/dark, /area/ship/medical) "WQ" = ( @@ -5148,11 +5068,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/machinery/vending/medical/syndicate_access{ - name = "\improper InteqMed Plus" - }, /obj/machinery/light/directional/north, -/turf/open/floor/plasteel/mono/dark, +/obj/structure/closet/secure_closet/medical2, +/turf/open/floor/plasteel/dark, /area/ship/medical) "Xi" = ( /obj/structure/chair{ @@ -5177,8 +5095,8 @@ /area/ship/crew/dorm) "Xu" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/head/helmet/space/orange, /obj/effect/turf_decal/techfloor{ dir = 1 }, @@ -5200,9 +5118,23 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Xx" = ( -/obj/structure/closet/secure_closet/medical1, /obj/machinery/light/small/directional/north, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/corner/transparent/inteqbrown/border{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/toolbox/emergency/shuttle{ + pixel_y = 9; + pixel_x = -1 + }, +/obj/item/gps{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/gps{ + pixel_x = 2 + }, +/turf/open/floor/plasteel, /area/ship/crew/office) "XD" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ @@ -5254,12 +5186,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/canteen) -"XU" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 8 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "Yd" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -5297,11 +5223,9 @@ /turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/canteen) "Yt" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 4 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/obj/machinery/rnd/production/techfab/department/medical, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/medical) "Yu" = ( /obj/effect/turf_decal/techfloor, /obj/structure/closet/firecloset, @@ -5314,9 +5238,11 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/medical) "Yx" = ( -/obj/machinery/rnd/production/techfab/department/medical, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) +/obj/structure/noticeboard{ + pixel_y = 28 + }, +/turf/open/floor/plasteel/patterned, +/area/ship/medical) "YF" = ( /obj/machinery/power/terminal{ dir = 8 @@ -5329,14 +5255,14 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "YL" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "valor_external" +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/dark, +/area/ship/medical) "YM" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -5403,12 +5329,8 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "Zf" = ( -/obj/structure/railing{ - dir = 4; - layer = 2.9 - }, -/obj/effect/turf_decal/borderfloor{ - dir = 4 +/obj/structure/sign/warning/incident{ + pixel_y = 32 }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) @@ -5556,7 +5478,7 @@ Td Nh xj qG -iI +yK Cb Cb Cb @@ -5589,7 +5511,7 @@ Td xj og FI -qe +tj OM OM OM @@ -5622,7 +5544,7 @@ Td xj rL uS -qe +tj OM OM OM @@ -5655,7 +5577,7 @@ Td xj sZ uS -qe +tj OM OM OM @@ -5669,7 +5591,7 @@ Td bB LI ns -qR +LI pC zD LI @@ -5688,13 +5610,13 @@ Td xj GF uS -qe +tj OM OM OM OM Kz -rL +cE xj Td Td @@ -5702,9 +5624,9 @@ Td WC WO gp -qR -Yi -bI +LI +FY +OK LI "} (9,1,1) = {" @@ -5721,7 +5643,7 @@ Td xj Ch FI -qe +tj OM OM OM @@ -5754,7 +5676,7 @@ DU HC Zf oz -qe +tj OM OM OM @@ -5780,25 +5702,25 @@ Rh Zu uB ua -Wp -CC -ky -CC +OV +aW +aW +aW DR -Qd -FY +ZF +ZF kH Mn Ea -jG +Ls Mn de KU zI -yK -OV -yK -aW +Re +Re +xg +Re Ui gU nK @@ -5813,11 +5735,11 @@ jN lN gh zs -HC -HC -HC -HC -HC +fN +OR +OR +OR +Wp OT JS jj @@ -5826,13 +5748,13 @@ Kp Kn dQ Fa -Ft -LI -LI -LI -LI -LI +MR +qk su +su +YL +su +ux rO qR Yi @@ -5847,11 +5769,11 @@ xr Hg tS HC -MR vh -fN -xj -tj +vh +vh +HC +cI te fe Ok @@ -5859,11 +5781,11 @@ Xf as HL ec -xg -xj -Au -Re -OK +Md +LI +LI +LI +LI LI EE oy @@ -5880,11 +5802,11 @@ tZ An Sd HC -Oj -XU -XU +ss +bx +mt xj -cI +nX Jd qA UQ @@ -5892,11 +5814,11 @@ hm Cc JJ zT -Md -xj -XU -XU -cE +nX +LI +jG +Io +Au LI LI dN @@ -5913,11 +5835,11 @@ tZ Qc AP HC -bx -ss -Sh +gq +gq +gq Hw -ux +nX ct TB AM @@ -5926,10 +5848,10 @@ dO yy bh nX -zK -Yt +LI Yt -IL +Io +jT LI zS pt @@ -5946,10 +5868,10 @@ ME iN xl HC -OR gq -LL -Nh +gq +gq +xj Rc bF Hi @@ -5959,11 +5881,11 @@ tH Ff jQ qX -xj +LI Yx Io -mt -LI +Io +kW zC Ye mw @@ -5979,9 +5901,9 @@ tZ VD Um DT -DT -DT -DT +Oj +Oj +Oj DT DT DT @@ -5990,13 +5912,13 @@ NE DT nz DT -Tw -Tw -DT -DT -DT DT DT +LI +CC +qe +LL +LI Xg Uj dl @@ -6013,8 +5935,8 @@ ty dp DT Vy -qk -Ls +Vy +Vy DT fE sJ @@ -6026,8 +5948,8 @@ zG Qw jU DT -kW -qk +Vy +Vy Vy DT fj @@ -6046,7 +5968,7 @@ ma CH jk lc -lc +Sh lc ht jw @@ -6060,7 +5982,7 @@ GR hj id lc -lc +Sh lc bR XD @@ -6078,8 +6000,8 @@ mI gn qZ DT -kG -kG +IL +BV kG Tw Lb @@ -6092,9 +6014,9 @@ zO lE WX DT -jT -kG kG +BV +IL DT zA mx @@ -6111,9 +6033,9 @@ uA Pk Ei DT -YL -YL -BV +DT +DT +DT DT mZ Yd @@ -6125,9 +6047,9 @@ Ik Od ie DT -YL -YL -YL +DT +DT +DT DT LI zE @@ -6526,7 +6448,7 @@ Td Td Td Td -Td +zK Td Td Td diff --git a/_maps/shuttles/subshuttles/inteq_haste.dmm b/_maps/shuttles/subshuttles/inteq_haste.dmm index 74144c3fe930..25324d952a5e 100644 --- a/_maps/shuttles/subshuttles/inteq_haste.dmm +++ b/_maps/shuttles/subshuttles/inteq_haste.dmm @@ -54,16 +54,15 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/light_switch{ - pixel_y = 22; - pixel_x = 10 - }, /obj/effect/turf_decal/techfloor{ dir = 1 }, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, +/obj/structure/chair/handrail{ + pixel_y = 7 + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "F" = ( @@ -221,6 +220,10 @@ /obj/structure/cable/yellow{ icon_state = "4-10" }, +/obj/machinery/light_switch{ + pixel_y = 22; + pixel_x = 10 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) diff --git a/code/modules/antagonists/ert/inteq.dm b/code/modules/antagonists/ert/inteq.dm index 591ad684cc1d..f4636487da5f 100644 --- a/code/modules/antagonists/ert/inteq.dm +++ b/code/modules/antagonists/ert/inteq.dm @@ -20,5 +20,5 @@ /datum/antagonist/ert/inteq/leader name = "Inteq Mercenary Leader" - outfit = /datum/outfit/job/inteq/captain + outfit = /datum/outfit/job/inteq/captain/empty role = "Vanguard" diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm index ee48b1872854..6ad58203e2e6 100644 --- a/code/modules/clothing/outfits/factions/inteq.dm +++ b/code/modules/clothing/outfits/factions/inteq.dm @@ -29,31 +29,40 @@ ///captains /datum/outfit/job/inteq/captain - name = "IRMG - Vanguard (Naked)" + name = "IRMG - Vanguard" id_assignment = "Vanguard" jobtype = /datum/job/captain job_icon = "captain" + id = /obj/item/card/id/gold + head = /obj/item/clothing/head/beret/sec/hos/inteq + glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq + mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq + suit = /obj/item/clothing/suit/armor/hos/inteq + dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq + belt = /obj/item/storage/belt/security/webbing/inteq + gloves = /obj/item/clothing/gloves/combat ears = /obj/item/radio/headset/inteq/alt/captain shoes = /obj/item/clothing/shoes/combat + r_pocket = /obj/item/assembly/flash/handheld l_pocket = /obj/item/restraints/handcuffs - jobtype = /datum/job/captain - id = /obj/item/card/id/gold backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) -/datum/outfit/job/inteq/captain/geared - name = "IRMG - Vanguard" +/datum/outfit/job/inteq/captain/empty + name = "IRMG - Vanguard (Naked)" - head = /obj/item/clothing/head/beret/sec/hos/inteq - glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq - mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq - belt = /obj/item/storage/belt/security/webbing/inteq - suit = /obj/item/clothing/suit/armor/hos/inteq - dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq - gloves = /obj/item/clothing/gloves/combat - accessory = null + head = null + glasses = null + mask = null + belt = null + suit = null + dcoat = null + gloves = null + + r_pocket = null + l_pocket = null /datum/outfit/job/inteq/captain/honorable name = "IRMG - Honorable Vanguard" @@ -140,6 +149,14 @@ satchel = /obj/item/storage/backpack/messenger/inteq courierbag = /obj/item/storage/backpack/messenger/inteq +/datum/outfit/job/inteq/security/empty + name = "IRMG - Enforcer (Naked)" + head = null + suit = null + belt = null + mask = null + gloves = null + /datum/outfit/job/inteq/security/beluga name = "IRMG - Enforcer (Beluga)" @@ -156,14 +173,6 @@ satchel = /obj/item/storage/backpack/messenger/inteq courierbag = /obj/item/storage/backpack/messenger/inteq -/datum/outfit/job/inteq/security/empty - name = "IRMG - Enforcer (Naked)" - head = null - suit = null - belt = null - mask = null - gloves = null - ///engineers /datum/outfit/job/inteq/engineer @@ -201,6 +210,17 @@ courierbag = /obj/item/storage/backpack/messenger/inteq backpack_contents = list(/obj/item/melee/classic_baton=1) +/datum/outfit/job/inteq/warden/pilot + name = "IRMG - Shuttle Pilot" + job_icon = "securityofficer" + id_assignment = "Shuttle Pilot" + + head = /obj/item/clothing/head/soft/inteq + suit = /obj/item/clothing/suit/armor/vest/alt + belt = null + mask = /obj/item/clothing/mask/breath + gloves = /obj/item/clothing/gloves/fingerless + // cmo /datum/outfit/job/inteq/cmo From b377a11e6616dc384aa6372994a4b1e1da38c761 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 11 Jul 2024 18:02:56 -0500 Subject: [PATCH 36/41] Automatic changelog generation for PR #3115 [ci skip] --- html/changelogs/AutoChangeLog-pr-3115.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3115.yml diff --git a/html/changelogs/AutoChangeLog-pr-3115.yml b/html/changelogs/AutoChangeLog-pr-3115.yml new file mode 100644 index 000000000000..cab3ff1ea29c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3115.yml @@ -0,0 +1,6 @@ +author: meemofcourse +changes: + - {balance: 'Remapped the Valor, with two extra jobs (Shuttle Corpsman, Shuttle + Pilot).'} + - {code_imp: The Vanguard base outfit starts with gear.} +delete-after: true From 97d91e9182d0a0d7a3455d0f92ca2f8058d8a134 Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:44:26 -0700 Subject: [PATCH 37/41] broad cringe removal (#3142) ## About The Pull Request - Removes the ability for ghosts to click on mice and take control of them - Removes a vast majority of forcesays from the game (gibbering I've left untouched for now but if theres interest in axing it I will) - Removes char from the game (only made you spout forcesays) - Spraytan overdose no longer exists and will no longer turn you into a surfer - Removes every gibbering line - Removes Chav, Swedish, and Elvis mutations - Misc forcesay removals ## Why It's Good For The Game No more White Sands jank and no more unfunny forcesay leftovers from tg ## Changelog :cl: del: Removed mice possession del: Broad removal of forcesays from most reagents and items del: Removed char reagent and spraytan overdose del: Removed gibbering lines del: Removed Chav, Swedish, Elvis mutations /:cl: --- code/__DEFINES/DNA.dm | 3 - code/__HELPERS/roundend.dm | 19 +- code/datums/brain_damage/mild.dm | 2 - code/datums/mutations/speech.dm | 123 ------------- code/game/objects/items/dna_injector.dm | 24 --- code/modules/clothing/masks/miscellaneous.dm | 7 - .../kitchen_machinery/grill.dm | 1 - code/modules/mob/dead/observer/observer.dm | 70 +------- .../living/simple_animal/friendly/mouse.dm | 3 - .../chemistry/reagents/food_reagents.dm | 16 -- .../chemistry/reagents/medicine_reagents.dm | 3 - .../chemistry/reagents/other_reagents.dm | 50 ------ .../chemistry/reagents/toxin_reagents.dm | 10 +- code/modules/surgery/organs/vocal_cords.dm | 8 - strings/boomer.json | 33 ---- strings/traumas.json | 164 ------------------ 16 files changed, 5 insertions(+), 531 deletions(-) delete mode 100644 strings/boomer.json diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 8b05ccacd1fe..1d08e1ab4868 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -24,9 +24,6 @@ #define MUT_MUTE /datum/mutation/human/mute #define STONER /datum/mutation/human/stoner #define UNINTELLIGIBLE /datum/mutation/human/unintelligible -#define SWEDISH /datum/mutation/human/swedish -#define CHAV /datum/mutation/human/chav -#define ELVIS /datum/mutation/human/elvis #define RADIOACTIVE /datum/mutation/human/radioactive #define GLOWY /datum/mutation/human/glow #define ANTIGLOWY /datum/mutation/human/glow/anti diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 5d96dc8af34c..5301f0ec9d3e 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -280,14 +280,9 @@ //Medals parts += medal_report() - //WS Begin - CHECK_TICK - - //Mouse - parts += mouse_report() CHECK_TICK - //WS End + //Station Goals parts += goal_report() @@ -459,17 +454,7 @@ parts += com return "
[parts.Join("
")]
" return "" -//WS Begin -/datum/controller/subsystem/ticker/proc/mouse_report() - if(GLOB.mouse_food_eaten) - var/list/parts = list() - parts += "Mouse stats:" - parts += "Mouse Born: [GLOB.mouse_spawned]" - parts += "Mouse Killed: [GLOB.mouse_killed]" - parts += "Trash Eaten: [GLOB.mouse_food_eaten]" - return "
[parts.Join("
")]
" - return "" -//WS End + /datum/controller/subsystem/ticker/proc/antag_report() var/list/result = list() var/list/all_teams = list() diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 069d89f0e7e7..9c10c6f1fd7d 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -50,8 +50,6 @@ owner.derpspeech = min(owner.derpspeech + 5, 25) if(prob(3)) owner.emote("drool") - else if(owner.stat == CONSCIOUS && prob(3)) - owner.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"), forced = "brain damage") ..() /datum/brain_trauma/mild/dumbness/on_lose() diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 5545c4efde53..afd4e83cfe34 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -68,129 +68,6 @@ return REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION) -/datum/mutation/human/swedish - name = "Swedish" - desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037." - quality = MINOR_NEGATIVE - text_gain_indication = "You feel Swedish, however that works." - text_lose_indication = "The feeling of Swedishness passes." - -/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner) - if(..()) - return - RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - -/datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner) - if(..()) - return - UnregisterSignal(owner, COMSIG_MOB_SAY) - -/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args) - SIGNAL_HANDLER - - var/message = speech_args[SPEECH_MESSAGE] - if(message) - message = replacetext(message,"w","v") - message = replacetext(message,"j","y") - message = replacetext(message,"a",pick("å","ä","æ","a")) - message = replacetext(message,"bo","bjo") - message = replacetext(message,"o",pick("ö","ø","o")) - if(prob(30)) - message += " Bork[pick("",", bork",", bork, bork")]!" - speech_args[SPEECH_MESSAGE] = trim(message) - -/datum/mutation/human/chav - name = "Chav" - desc = "Unknown" - quality = MINOR_NEGATIVE - text_gain_indication = "Ye feel like a reet prat like, innit?" - text_lose_indication = "You no longer feel like being rude and sassy." - -/datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner) - if(..()) - return - RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - -/datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner) - if(..()) - return - UnregisterSignal(owner, COMSIG_MOB_SAY) - -/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args) - var/message = speech_args[SPEECH_MESSAGE] - if(message) - message = " [message] " - message = replacetext(message," looking at "," gawpin' at ") - message = replacetext(message," great "," bangin' ") - message = replacetext(message," man "," mate ") - message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin ")) - message = replacetext(message," what "," wot ") - message = replacetext(message," drink "," wet ") - message = replacetext(message," get "," giz ") - message = replacetext(message," what "," wot ") - message = replacetext(message," no thanks "," wuddent fukken do one ") - message = replacetext(message," i don't know "," wot mate ") - message = replacetext(message," no "," naw ") - message = replacetext(message," robust "," chin ") - message = replacetext(message," hi "," how what how ") - message = replacetext(message," hello "," sup bruv ") - message = replacetext(message," kill "," bang ") - message = replacetext(message," murder "," bang ") - message = replacetext(message," windows "," windies ") - message = replacetext(message," window "," windy ") - message = replacetext(message," break "," do ") - message = replacetext(message," your "," yer ") - message = replacetext(message," security "," coppers ") - speech_args[SPEECH_MESSAGE] = trim(message) - - -/datum/mutation/human/elvis - name = "Elvis" - desc = "A terrifying mutation named after its 'patient-zero'." - quality = MINOR_NEGATIVE - locked = TRUE - text_gain_indication = "You feel pretty good, honeydoll." - text_lose_indication = "You feel a little less conversation would be great." - -/datum/mutation/human/elvis/on_life() - switch(pick(1,2)) - if(1) - if(prob(15)) - var/list/dancetypes = list("swinging", "fancy", "stylish", "20'th century", "jivin'", "rock and roller", "cool", "salacious", "bashing", "smashing") - var/dancemoves = pick(dancetypes) - owner.visible_message("[owner] busts out some [dancemoves] moves!") - if(2) - if(prob(15)) - owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!") - -/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner) - if(..()) - return - RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - -/datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner) - if(..()) - return - UnregisterSignal(owner, COMSIG_MOB_SAY) - -/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args) - SIGNAL_HANDLER - - var/message = speech_args[SPEECH_MESSAGE] - if(message) - message = " [message] " - message = replacetext(message," i'm not "," I aint ") - message = replacetext(message," girl ",pick(" honey "," baby "," baby doll ")) - message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo ")) - message = replacetext(message," out of "," outta ") - message = replacetext(message," thank you "," thank you, thank you very much ") - message = replacetext(message," thanks "," thank you, thank you very much ") - message = replacetext(message," what are you "," whatcha ") - message = replacetext(message," yes ",pick(" sure", "yea ")) - message = replacetext(message," muh valids "," my kicks ") - speech_args[SPEECH_MESSAGE] = trim(message) - - /datum/mutation/human/stoner name = "Stoner" desc = "A common mutation that severely decreases intelligence." diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index a11539595805..113a72fb8d8d 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -247,30 +247,6 @@ name = "\improper DNA injector (Anti-Unintelligible)" remove_mutations = list(UNINTELLIGIBLE) -/obj/item/dnainjector/swedishmut - name = "\improper DNA injector (Swedish)" - add_mutations = list(SWEDISH) - -/obj/item/dnainjector/antiswedish - name = "\improper DNA injector (Anti-Swedish)" - remove_mutations = list(SWEDISH) - -/obj/item/dnainjector/chavmut - name = "\improper DNA injector (Chav)" - add_mutations = list(CHAV) - -/obj/item/dnainjector/antichav - name = "\improper DNA injector (Anti-Chav)" - remove_mutations = list(CHAV) - -/obj/item/dnainjector/elvismut - name = "\improper DNA injector (Elvis)" - add_mutations = list(ELVIS) - -/obj/item/dnainjector/antielvis - name = "\improper DNA injector (Anti-Elvis)" - remove_mutations = list(ELVIS) - /obj/item/dnainjector/lasereyesmut name = "\improper DNA injector (Laser Eyes)" add_mutations = list(LASEREYES) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 725764a10b04..d2b573711051 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -154,13 +154,6 @@ clothing_flags = VOICEBOX_TOGGLABLE modifies_speech = TRUE -/obj/item/clothing/mask/frog/handle_speech(datum/source, list/speech_args) //whenever you speak - if(!(clothing_flags & VOICEBOX_DISABLED)) - if(prob(5)) //sometimes, the angry spirit finds others words to speak. - speech_args[SPEECH_MESSAGE] = pick("HUUUUU!!","SMOOOOOKIN'!!","Hello my baby, hello my honey, hello my rag-time gal.", "Feels bad, man.", "GIT DIS GUY OFF ME!!" ,"SOMEBODY STOP ME!!", "NORMIES, GET OUT!!") - else - speech_args[SPEECH_MESSAGE] = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish, - /obj/item/clothing/mask/frog/cursed clothing_flags = NONE diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index f76bdb462539..c349c7511752 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -82,7 +82,6 @@ smoke.start() if(grilled_item) grill_time += 1 - grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 1) grill_fuel -= 10 grilled_item.AddComponent(/datum/component/sizzle) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 6fffc48e76a1..c15c4a1af835 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -68,8 +68,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) add_verb(src, list( /mob/dead/observer/proc/dead_tele, /mob/dead/observer/proc/open_spawners_menu, - /mob/dead/observer/proc/tray_view, - /mob/dead/observer/proc/possess_mouse_verb)) + /mob/dead/observer/proc/tray_view)) if(icon_state in GLOB.ghost_forms_with_directions_list) ghostimage_default = image(src.icon,src,src.icon_state + "_nodir") @@ -962,70 +961,3 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp client.images += t_ray_images else client.images -= stored_t_ray_images - -//WS Begin -/mob/dead/observer/proc/possess_mouse_verb() - set category = "Ghost" - set name = "Possess a mouse" - set desc = "Possess a mouse to haunt the station.... and their food!" - - var/list/possessible = list() - - for(var/mob/living/simple_animal/mouse/M in GLOB.alive_mob_list) - if(M.stat != CONSCIOUS) - continue - if(M.key) - continue - if(M in GLOB.player_list) - continue - if(M.mind) - continue - - possessible += M - - if(!possessible.len) - to_chat(src, "There are currently no mice able to be possessed!") - return FALSE - - var/mob/living/simple_animal/mouse/M = pick(possessible) - - possess_mouse(M) - - -/mob/dead/observer/proc/possess_mouse(mob/living/simple_animal/mouse/M) - if(!M) - return FALSE - - if(!SSticker.HasRoundStarted()) - to_chat(usr, "The round hasn't started yet!") - return FALSE - - if(is_banned_from(key, ROLE_SENTIENCE)) - to_chat(src, "You are job banned!") - return FALSE - - if(alert("Are you sure you want to become a mouse? (Warning, you can no longer be cloned!)",,"Yes","No") != "Yes") - return FALSE - - if(M.key || (M.stat != CONSCIOUS) || (M in GLOB.player_list) || M.mind || QDELETED(src) || QDELETED(M)) - to_chat(src, "This mouse is unable to be controlled, please try again!") - return FALSE - - log_game("[key_name(src)] has became a mouse") - - M.key = key - M.faction = list("neutral") - M.chew_probability = 0 //so they cant pull off a big brain play by ghosting somewhere or idk - M.layer = BELOW_OPEN_DOOR_LAYER //ENGAGE ADVANCED HIDING BRAIN FUNCTIONS - M.language_holder = new /datum/language_holder/mouse(M) - M.pass_flags |= PASSDOORHATCH - M.sentience_act() - M.maxHealth = 15 - M.health = M.maxHealth - - to_chat(M , "You are now possessing a mouse. \ - You do not remember your previous life. You can eat trash and \ - food on the floor to gain health and help create new mice. Mouse traps will hurt your fragile body \ - and so will any kind of weapons. You can control click food and trash items in order to eat them. Get. That. Cheese.") - return TRUE -//WS End diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index f2fbf6e5b262..7b11d05bcf2c 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -145,9 +145,6 @@ GLOBAL_VAR_INIT(mouse_killed, 0) else return ..() -/mob/living/simple_animal/mouse/attack_ghost(mob/dead/observer/user) - user.possess_mouse(src) - /mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force, supress_message) return FALSE diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 09812ef20cf3..6a69ef38e6cd 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -770,22 +770,6 @@ taste_description = "caramel" reagent_state = SOLID -/datum/reagent/consumable/char - name = "Char" - description = "Essence of the grill. Has strange properties when overdosed." - reagent_state = LIQUID - nutriment_factor = 5 * REAGENTS_METABOLISM - color = "#C8C8C8" - taste_mult = 6 - taste_description = "smoke" - overdose_threshold = 15 - -/datum/reagent/consumable/char/overdose_process(mob/living/M) - if(prob(25)) - M.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/char) - ..() - return - /datum/reagent/consumable/bbqsauce name = "BBQ Sauce" description = "Sweet, smoky, savory, and gets everywhere. Perfect for grilling." diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 6084311b3507..11a930efda30 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1310,8 +1310,6 @@ M.adjustStaminaLoss(-3 * REM, 0) M.jitteriness = min(max(0, M.jitteriness + 3), 30) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM, 150) - if(prob(10)) - M.say(pick("Yeah, well, you know, that's just, like, uh, your opinion, man.", "Am I glad he's frozen in there and that we're out here, and that he's the sheriff and that we're frozen out here, and that we're in there, and I just remembered, we're out here. What I wanna know is: Where's the caveman?", "It ain't me, it ain't me...", "Make love, not war!", "Stop, hey, what's that sound? Everybody look what's going down...", "Do you believe in magic in a young girl's heart?"), forced = /datum/reagent/medicine/earthsblood) M.druggy = min(max(0, M.druggy + 10), 15) //See above ..() . = 1 @@ -2073,7 +2071,6 @@ bp.receive_damage(0, 0, 200) else //SUCH A LUST FOR REVENGE!!! to_chat(M, "A phantom limb hurts!") - M.say("Why are we still here, just to suffer?", forced = /datum/reagent/medicine/lavaland_extract) return ..() /datum/reagent/medicine/skeletons_boon diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 9b6243358acb..24db5dd524d8 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -410,7 +410,6 @@ description = "A substance applied to the skin to darken the skin." color = "#FFC080" // rgb: 255, 196, 128 Bright orange metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly. But this changes on an overdose - overdose_threshold = 11 //Slightly more than one un-nozzled spraybottle. taste_description = "sour oranges" /datum/reagent/spraytan/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1) @@ -470,41 +469,11 @@ N.dna.features["mcolor"] = newcolor N.regenerate_icons() - - if(method == INGEST) if(show_message) to_chat(M, "That tasted horrible.") ..() - -/datum/reagent/spraytan/overdose_process(mob/living/M) - metabolization_rate = 1 * REAGENTS_METABOLISM - - if(ishuman(M)) - var/mob/living/carbon/human/N = M - if(!HAS_TRAIT(N, TRAIT_BALD)) - N.hairstyle = "Spiky" - N.facial_hairstyle = "Shaved" - N.facial_hair_color = "000" - N.hair_color = "000" - if(!(HAIR in N.dna.species.species_traits)) //No hair? No problem! - N.dna.species.species_traits += HAIR - if(N.dna.species.use_skintones) - N.skin_tone = "orange" - else if(MUTCOLORS in N.dna.species.species_traits) //Aliens with custom colors simply get turned orange - N.dna.features["mcolor"] = "f80" - N.regenerate_icons() - if(prob(7)) - if(N.w_uniform) - M.visible_message(pick("[M]'s collar pops up without warning.", "[M] flexes [M.p_their()] arms.")) - else - M.visible_message("[M] flexes [M.p_their()] arms.") - if(prob(10)) - M.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Don???t be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you."), forced = /datum/reagent/spraytan) - ..() - return - /datum/reagent/mulligan name = "Mulligan Toxin" description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change." @@ -1538,20 +1507,6 @@ name = "Royal Carpet?" description = "For those that break the game and need to make an issue report." -/datum/reagent/carpet/royal/on_mob_life(mob/living/carbon/M) - . = ..() - if(!M.mind?.assigned_role) - return - switch(M.mind.assigned_role) - if("Chief Medical Officer", "Captain", "Chief Engineer", "Research Director", "Head of Personnel") - if(prob(10)) - to_chat(M, "You feel like royalty.") - if(prob(5)) - M.say(pick("Peasants..","This carpet is worth more than your contracts!","I could fire you at any time..."), forced = "royal carpet") - if("Quartermaster") - if(prob(15)) - to_chat(M, "You feel like an impostor...") - /datum/reagent/carpet/royal/black name = "Royal Black Carpet" description = "For those that feel the need to show off their timewasting skills." @@ -1865,11 +1820,6 @@ color = "#00ff80" taste_description = "strange honey" -/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/M) - if(prob(2)) - M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."), forced = "royal bee jelly") - ..() - //Misc reagents /datum/reagent/romerol diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 498017191179..6045779f6030 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -974,18 +974,13 @@ taste_description = "bone hurting" overdose_threshold = 50 -/datum/reagent/toxin/bonehurtingjuice/on_mob_add(mob/living/carbon/M) - M.say("oof ouch my bones", forced = /datum/reagent/toxin/bonehurtingjuice) - /datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/M) M.adjustStaminaLoss(7.5, 0) if(prob(20)) - switch(rand(1, 3)) + switch(rand(1, 2)) if(1) - M.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice) - if(2) M.manual_emote(pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt.")) - if(3) + if(2) to_chat(M, "Your bones hurt!") return ..() @@ -1000,7 +995,6 @@ bp.receive_damage(0, 0, 200) else //SUCH A LUST FOR REVENGE!!! to_chat(M, "A phantom limb hurts!") - M.say("Why are we still here, just to suffer?", forced = /datum/reagent/toxin/bonehurtingjuice) return ..() /datum/reagent/toxin/bungotoxin diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index c0313adb2539..6a5a344b177e 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -439,14 +439,6 @@ var/mob/living/L = V L.emote("flip") - //SPEAK - else if((findtext(message, speak_words))) - cooldown = COOLDOWN_MEME - for(var/V in listeners) - var/mob/living/L = V - addtimer(CALLBACK(L, TYPE_PROC_REF(/atom/movable, say), pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")), 5 * i) - i++ - //GET UP else if((findtext(message, getup_words))) cooldown = COOLDOWN_DAMAGE //because stun removal diff --git a/strings/boomer.json b/strings/boomer.json deleted file mode 100644 index 4fb2f733f795..000000000000 --- a/strings/boomer.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "boomer": [ - "@pick(kids) these days have it too easy!", - "Do I look like I know what a @pick(file) is!?", - "Listen here Jack, how do I open @pick(file)?", - "How do I open a @pick(file) again?", - "Unlike you snowflakes, I'm not offended so easily.", - "Back in my day...", - "When I was your age...", - "This generation can't take a joke.", - "Why are @pick(kids) these days so @pick(sad) all the time?", - "These damn @pick(kids) need to get a @pick(impossible) for once!", - "It's simply a matter of showing up, looking the manager in the eye, giving him a firm handshake and telling him you want the job.", - "You'll never get anywhere in life without a degree.", - "@pick(expense) isn't really that expensive.", - "When I was a kid I had to walk to school uphill both ways!", - "I hate my wife.", - "I just want to grill for God's sake.", - "I wish I could just go on my lawnmower and cut the grass.", - "Yep, Quake. That was a good game...", - "Yeah, my PDA has wi-fi. A wife I hate." - ], - - "expense": ["Healthcare", "College", "A car", "A house", "Food"], - - "kids": ["kids", "millenials", "snowflakes"], - - "file": ["JPEG", "PDF", "DMI", "JSON"], - - "sad": ["sad", "depressed", "sad and depressed"], - - "impossible": ["job", "house", "job and a house", "life"] -} diff --git a/strings/traumas.json b/strings/traumas.json index f6bd9b589553..1d1e98581d4f 100644 --- a/strings/traumas.json +++ b/strings/traumas.json @@ -1,168 +1,4 @@ { - "brain_damage": [ - "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH", - "without oxigen blob don't evoluate?", - "@pick(semicolon)CAPTAINS A COMDOM", - "can u give me @pick(mutations)?", - "THe saiyans screwed", - "Bi is THE BEST OF BOTH WORLDS>", - "@pick(semicolon)I WANNA PET TEH monkeyS", - "stop grifing me!!!!", - "SOTP IT#", - "shiggey diggey!!", - "@pick(semicolon)A PIRATE APPEAR", - "FUS RO DAH", - "stat me", - ">my face", - "roll it easy!", - "lol2cat", - "dem dwarfs man, dem dwarfs", - "hwee did eet fhor khayosss", - "lifelike texture ;_;", - "luv can bloooom", - "PACKETS!!!", - "port ba@pick(y_replacements) med!!!!", - "youed call her a toeugh bithc", - "closd for merbegging", - "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???", - "GEY AWAY FROM ME U GREIFING PRICK!!!!", - "@pick(semicolon)HELP INTEG MURDERIN MEE!!!", - "hwat dose tha @pick(random_gibberish) mean?????", - "@pick(semicolon)DO A BLUP SPEaS JUMP!!!!!", - "wearnig siNGUARLTY is.... FINE haHAAA", - "@pick(semicolon)AI laW 22 Open door", - "@pick(semicolon)this SI mY sHip......", - "who the HELL do u thenk u r?!!!!", - "geT THE FUCK OUTTTT", - "@pick(semicolon)CRASHING THIS SHIMP WITH NIO SURVIVROS", - "PSHOOOM", - "REMOVE SINGULARITY", - "INSTLL TEG", - "TURBIN IS BEST ENGIENE", - "SOLIRS CAN POWER THE HOLE FLEEHT ANEWAY @pick(bug)", - "parasteng was best", - "@pick(semicolon)I'VE GOT BALLS OF STEEL", - "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE", - "i will snatch erry motherfucker birthday", - "u just did the world a little bit more sad place for someone", - "@pick(semicolon)N-NYAAAAAA~", - "@pick(bug)", - "@pick(semicolon)wtf??????????? @pick(bug)", - "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)", - "DON'T EVER TUCH ME", - "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????", - "AMOGN US IS FUNNY!!", - "DID YOU FUCKING.", - "i DEMAND!!! APOGEE-DEV BE DEOMTED!!!", - "@pick(semicolon)I don't ndED tEARPAHY.", - "@pick(semicolon)an,d CIOCK.", - "TUWN ME INoT A CAT!!", - "WHY WAES THE PEILL REMOVED???", - "work on the wiki please", - "ahelp SPAWN @pick(aspawnships) PLS", - "Am i allowd to kil l people if thye piss me off", - "IS THIS LIEK VOIDCREW???", - "UNiT PANICKING.", - "HIII!! HI!! <3 <3 <3", - "I LOOK LKIE BEAN,S,,, CRINGE!!!", - "SEET TH shIP TO kOS!!!!!", - "IM SynDCIATe, I ANTag, I CAN KOS......", - "ahelp ADMIN CAN I BE PIRTA", - "DOCTOR YUO DO DISCETIONS!!!", - "RESERCH NANIYES", - "REVSRSE A NY WALLS!!!", - "*monch", - "Amonger", - "Live mas", - "top ten goliath funny moments", - "put me... in a stew... then buryy mee...", - "@pick(semicolon)GTT AWYA FROM HER YOU BITHC!!", - "@pick(semicolon)IS TATH A FUCKIGN,, MOTH.", - "@pick(semicolon)BRAZIL NUMEOR UNO...!!!!", - "@pick(semicolon)blbue hair??? I'M GOIgN TO KILL THDT FUIKNG COW!", - "@pick(semicolon)HOW DO I @pick(ghetto)?????", - "ough", - "ourgh", - "ouughghnnnn", - "hrrnggg", - "HE IS BALD!!!", - "I AM NORMAL. I CAN BE TRUSTED WITH INDUSTRIAL CHEMICALS", - "Welcome to the bathroom", - "THE AMOUNGS BROKE ALL MY BONES", - "HOLY SHIT IT'S @pick(john) @pick(factions)!!", - "BLrobo BLEEBUS.....", - "drugs are funny because they add new rp elements", - "ANOTHER SHIP... STERALIZED...", - "HOpeLes WAsN'T ALwAYS NaMeD HoPelESs BeFORE THe incIDENST...", - "@pick(semicolon)HopeLSS WAS ACTUAL. Ly a LIVIng WaePON....", - "@pick(semicolon)WHEN SHIPQUEST????? PANEL NEW??????", - "WHER.E SHIPQUEST???,???", - "ei,,ither wAy... It Is WHt ti is", - "butT ShIPPtSt nEVER was a WrAZnOe liKE thaEt!!", - "A deEoP-setED dISEuire... fuR pERfECTiOsM...", - "HUMORER IS A DECLIAT THINGE!!", - "who's the asshole flying the pill class", - "IVOR@pick(y_replacements) WHAT THE FOUCKE ARE U DUING!!!??", - "RESIEST BIG MOETH", - "WE MUSTE RIASE UOP AGANST BEEG MOTNH", - "Luckily, I passed high school physics", - "I WANT NOTHING MORE IN THIS LIFE THAN TO CUDDLE UP WITH A CUTE MOTH WAIFU!!", - "GO TO HORNY JAIL!!" - ], - - "mutations": [ - "telikesis", - "halk", - "eppilapse", - "kamelien", - "eksrey", - "glowey skin", - "fungal tb", - "stun gloves" - ], - - "john": ["joehn", "jonn", "jouhn", "jeeoun"], - - "factions": ["SYNDICT", "NATOSASEN", "EEMTEQ", "MIENUTMEN", "SOMLGOVM"], - - "random_gibberish": ["g", "squid", "r", "carbon dioxide"], - - "y_replacements": ["y", "i", "e"], - - "create_verbs": ["spawn", "MAke me", "creat", "tc trade me", "gib"], - - "create_nouns": [ - "zenomorfs", - "ayleins", - "treaitors", - "sheadow lings", - "abdoocters", - "revinent", - "deval", - "deth squads", - "bleb", - "cock cult", - "anteg" - ], - - "aspawnships": [ - "BUblBUE", - "RoUBE", - "PeEL", - "TWInkLRE", - "MAYONEISE", - "raEDIO", - "joUPITR", - "HAELR TROCK", - "BEYOO", - "TID" - ], - - "bug": ["", "IS TIS A BUG??", "SI IST A BUGG/", "BUG!!!"], - - "semicolon": ["", ";", ".h"], - - "ghetto": ["ghetcheom", "ghettoghemc", "gahttochem"], "god_foe": [ "MORTALS", From ee7283eafa5b8e6264cb788671ecdb472adbd80e Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 11 Jul 2024 18:15:57 -0500 Subject: [PATCH 38/41] Automatic changelog generation for PR #3142 [ci skip] --- html/changelogs/AutoChangeLog-pr-3142.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3142.yml diff --git a/html/changelogs/AutoChangeLog-pr-3142.yml b/html/changelogs/AutoChangeLog-pr-3142.yml new file mode 100644 index 000000000000..fbb642293eca --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3142.yml @@ -0,0 +1,8 @@ +author: generalthrax +changes: + - {rscdel: Removed mice possession} + - {rscdel: Broad removal of forcesays from most reagents and items} + - {rscdel: Removed char reagent and spraytan overdose} + - {rscdel: Removed gibbering lines} + - {rscdel: 'Removed Chav, Swedish, Elvis mutations'} +delete-after: true From c2a1d8a7dc0f06e14f858cf68487fc92566adc34 Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:55:22 -0700 Subject: [PATCH 39/41] Mine Defusal Outpost Missions (#3147) ## About The Pull Request There's now an outpost mission to deliver defused landmines for money. Descriptions subject to change ## Why It's Good For The Game I imagine several organizations would definitely offer bounties to collect leftover landmines. Cute little flavour and some more variety in outpost missions (with some danger). ## Changelog :cl: add: The outpost is now offering bounties to defuse landmines to Frontier vessels. /:cl: --------- Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com> Co-authored-by: rye-rice <58402542+rye-rice@users.noreply.github.com> Co-authored-by: Theos --- code/game/objects/items/storage/toolbox.dm | 12 ++++++++++++ code/modules/overmap/missions/acquire_mission.dm | 15 +++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 88eb493626d2..c68252845c83 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -312,6 +312,18 @@ new /obj/item/clothing/mask/infiltrator(src) new /obj/item/clothing/shoes/combat/sneakboots(src) +/obj/item/storage/toolbox/bounty + name = "defused explosives case" + desc = "Store defused landmines in here." + icon_state = "infiltrator_case" + item_state = "infiltrator_case" + +/obj/item/storage/toolbox/bounty/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_combined_w_class = 8 + STR.max_items = 4 + //floorbot assembly /obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency, //which toolboxes can be made into floorbots diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm index de60174081db..7a389fa1655a 100644 --- a/code/modules/overmap/missions/acquire_mission.dm +++ b/code/modules/overmap/missions/acquire_mission.dm @@ -211,6 +211,21 @@ Acquire: Anomaly weight = 1 objective_type = /mob/living/simple_animal/bot/firebot/rockplanet +/* + Acquire: Landmines +*/ + +/datum/mission/acquire/landmine/rusted + name = "Defuse rusted landmines" + desc = "We've been issued a bounty to make the Frontier a safer place by disarming dated landmines. Mind your fingers." + weight = 6 + value = 2000 + duration = 80 MINUTES + dur_mod_range = 0.4 + container_type = /obj/item/storage/toolbox/bounty + objective_type = /obj/item/mine/pressure/explosive + num_wanted = 4 + /* Acquire: Fishing */ From 9c5d0840e9e078eca02696e679cc863d16c9a8ed Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 11 Jul 2024 18:28:44 -0500 Subject: [PATCH 40/41] Automatic changelog generation for PR #3147 [ci skip] --- html/changelogs/AutoChangeLog-pr-3147.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3147.yml diff --git a/html/changelogs/AutoChangeLog-pr-3147.yml b/html/changelogs/AutoChangeLog-pr-3147.yml new file mode 100644 index 000000000000..12d00c85473f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3147.yml @@ -0,0 +1,5 @@ +author: generalthrax +changes: + - {rscadd: The outpost is now offering bounties to defuse landmines to Frontier + vessels.} +delete-after: true From 0644edbe906423971948d15a5aabc7afb0b35695 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 12 Jul 2024 00:54:11 +0000 Subject: [PATCH 41/41] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-3115.yml | 6 ------ html/changelogs/AutoChangeLog-pr-3142.yml | 8 -------- html/changelogs/AutoChangeLog-pr-3147.yml | 5 ----- html/changelogs/archive/2024-07.yml | 11 +++++++++++ 4 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-3115.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3142.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3147.yml diff --git a/html/changelogs/AutoChangeLog-pr-3115.yml b/html/changelogs/AutoChangeLog-pr-3115.yml deleted file mode 100644 index cab3ff1ea29c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3115.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: meemofcourse -changes: - - {balance: 'Remapped the Valor, with two extra jobs (Shuttle Corpsman, Shuttle - Pilot).'} - - {code_imp: The Vanguard base outfit starts with gear.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3142.yml b/html/changelogs/AutoChangeLog-pr-3142.yml deleted file mode 100644 index fbb642293eca..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3142.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: generalthrax -changes: - - {rscdel: Removed mice possession} - - {rscdel: Broad removal of forcesays from most reagents and items} - - {rscdel: Removed char reagent and spraytan overdose} - - {rscdel: Removed gibbering lines} - - {rscdel: 'Removed Chav, Swedish, Elvis mutations'} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3147.yml b/html/changelogs/AutoChangeLog-pr-3147.yml deleted file mode 100644 index 12d00c85473f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3147.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: generalthrax -changes: - - {rscadd: The outpost is now offering bounties to defuse landmines to Frontier - vessels.} -delete-after: true diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index 92ee91ee5671..b29e8aedd9e0 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -57,3 +57,14 @@ when equipping a SolCon/SolGov hardsuit, and its subtypes! generalthrax: - rscdel: Removed tator tots and raw potato wedges +2024-07-12: + generalthrax: + - rscdel: Removed mice possession + - rscdel: Broad removal of forcesays from most reagents and items + - rscdel: Removed char reagent and spraytan overdose + - rscdel: Removed gibbering lines + - rscdel: Removed Chav, Swedish, Elvis mutations + - rscadd: The outpost is now offering bounties to defuse landmines to Frontier vessels. + meemofcourse: + - balance: Remapped the Valor, with two extra jobs (Shuttle Corpsman, Shuttle Pilot). + - code_imp: The Vanguard base outfit starts with gear.