From a64fda912b032d11299cc314b3b01f46698dc2c0 Mon Sep 17 00:00:00 2001 From: shayoki <96078776+shayoki@users.noreply.github.com> Date: Wed, 11 Mar 2026 11:25:39 -0500 Subject: [PATCH] maps ci V --- .../SpaceRuins/skyrat/scrapheap.dmm | 2 +- _maps/RandomZLevels/blackmesa.dmm | 19 ++++++----------- _maps/RandomZLevels/maintsroom.dmm | 21 +++++++------------ .../wawastation/wawastation_kiosk.dmm | 2 +- _maps/custom/wawastation.dmm | 6 +++--- _maps/map_files/Blueshift/Blueshift.dmm | 15 +++++++------ _maps/map_files/KiloStation/KiloStation.dmm | 2 +- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 10 ++++----- tgstation.dme | 2 +- .../tgui/interfaces/FishingBubbers.tsx | 12 +++++------ 10 files changed, 39 insertions(+), 52 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm index 5f11487144f..dbc17b1866d 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm @@ -1027,7 +1027,7 @@ /area/ruin/space/has_grav/powered/skyrat/scrapheap) "CF" = ( /obj/machinery/door/airlock/glass, -/obj/effect/spawner/random/structure/barricade, +/obj/structure/barricade/wooden/crude, /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/scrapheap) "CH" = ( diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index 3f60040c85d..5f3b8516be8 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -5909,7 +5909,7 @@ /area/awaymission/black_mesa/xen/lost_camp_hallway) "eAz" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/awaymission/black_mesa/high_security_surgery) "eAA" = ( @@ -6208,7 +6208,7 @@ "ffD" = ( /obj/machinery/door/airlock/science/glass, /obj/effect/mapping_helpers/airlock/locked, -/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/high_security_surgery) "ffW" = ( @@ -14997,13 +14997,6 @@ /obj/effect/baseturf_helper/black_mesa, /turf/closed/wall/r_wall, /area/awaymission/black_mesa/black_ops_armory) -"wxU" = ( -/obj/machinery/door/airlock/multi_tile/public/glass{ - dir = 4 - }, -/obj/structure/barricade/wooden, -/turf/open/floor/iron/smooth_large, -/area/awaymission/black_mesa/hecu_zone_atrium) "wye" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner, /obj/structure/alien/weeds/xen, @@ -51484,10 +51477,10 @@ oib oib gdr uKX -bzF -wxU -bzF -wxU +xaN +vTj +xaN +vTj uKX gdr oSj diff --git a/_maps/RandomZLevels/maintsroom.dmm b/_maps/RandomZLevels/maintsroom.dmm index 546f0ecddd0..8ce82198758 100644 --- a/_maps/RandomZLevels/maintsroom.dmm +++ b/_maps/RandomZLevels/maintsroom.dmm @@ -638,7 +638,6 @@ /area/awaymission/caves/maintsroom) "cp" = ( /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/awaymission/caves/maintsroom) @@ -934,7 +933,6 @@ "dm" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /obj/structure/holosign/barrier/atmos, /turf/open/floor/plating, /area/awaymission/caves/maintsroom) @@ -2451,6 +2449,12 @@ /obj/structure/spacevine, /turf/open/misc/grass/jungle, /area/awaymission/caves/maintsroom) +"hU" = ( +/obj/structure/barricade/wooden/crude, +/obj/structure/barricade/wooden/crude, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/awaymission/caves/maintsroom) "hW" = ( /obj/structure/sign/poster/abductor/ayy_recruitment/directional/north, /turf/open/floor/plating/abductor, @@ -6061,7 +6065,6 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /obj/machinery/door/airlock/science, /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /turf/open/floor/sepia, /area/awaymission/caves/maintsroom) "tO" = ( @@ -6221,7 +6224,6 @@ "um" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /obj/effect/mapping_helpers/airlock/welded, /turf/open/floor/mineral/plastitanium/red, /area/awaymission/caves/maintsroom) @@ -7333,8 +7335,8 @@ /obj/machinery/door/airlock{ name = "Maintenance" }, -/obj/effect/spawner/random/structure/barricade, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/spawner/random/structure/barricade/crude, /turf/open/floor/plating, /area/awaymission/caves/maintsroom) "yh" = ( @@ -8626,7 +8628,6 @@ "Cz" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /turf/open/misc/grass/jungle, /area/awaymission/caves/maintsroom) "CA" = ( @@ -9088,7 +9089,6 @@ "Eg" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /turf/open/floor/plating, /area/awaymission/caves/maintsroom) "Eh" = ( @@ -10205,7 +10205,6 @@ /area/awaymission/caves/maintsroom) "HG" = ( /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /obj/structure/trap/stun, /turf/open/floor/plating, /area/awaymission/caves/maintsroom) @@ -11103,7 +11102,6 @@ /area/awaymission/caves/maintsroom) "KT" = ( /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /obj/structure/trap/stun, /obj/machinery/door/airlock/engineering{ name = "Engineering Auxiliary Power" @@ -11136,7 +11134,6 @@ /obj/machinery/door/airlock/vault, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_or_captain, -/obj/structure/barricade/wooden, /obj/structure/barricade/wooden/crude, /obj/machinery/scanner_gate/luxury_shuttle{ name = "Insurance" @@ -13120,7 +13117,6 @@ /obj/machinery/door/airlock/cult, /obj/structure/barricade/wooden/crude, /obj/effect/spawner/random/structure/grille, -/obj/structure/barricade/wooden, /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/engine/cult, /area/awaymission/caves/maintsroom) @@ -15155,7 +15151,6 @@ "Ys" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, /turf/open/floor/wood, /area/awaymission/caves/maintsroom) "Yt" = ( @@ -35161,7 +35156,7 @@ VF GS GS cp -cp +hU GS GS cp diff --git a/_maps/bubber/automapper/templates/wawastation/wawastation_kiosk.dmm b/_maps/bubber/automapper/templates/wawastation/wawastation_kiosk.dmm index 86714027b00..f8c5c6eae43 100644 --- a/_maps/bubber/automapper/templates/wawastation/wawastation_kiosk.dmm +++ b/_maps/bubber/automapper/templates/wawastation/wawastation_kiosk.dmm @@ -226,7 +226,7 @@ /area/station/commons/kiosk) "P" = ( /obj/machinery/door/airlock/maintenance/external, -/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/misc/asteroid, /area/station/commons/kiosk) "R" = ( diff --git a/_maps/custom/wawastation.dmm b/_maps/custom/wawastation.dmm index d1caf6dcbc8..1a6f0d83780 100644 --- a/_maps/custom/wawastation.dmm +++ b/_maps/custom/wawastation.dmm @@ -5577,10 +5577,10 @@ /turf/open/floor/iron, /area/station/engineering/main) "bWn" = ( -/obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/effect/mapping_helpers/airlock/locked, +/obj/effect/spawner/random/structure/barricade/crude, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "bWp" = ( @@ -20634,10 +20634,10 @@ "hgB" = ( /obj/machinery/door/airlock/maintenance/external, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/structure/barricade/wooden, /obj/effect/mapping_helpers/airlock/unres/delayed{ dir = 8 }, +/obj/effect/spawner/random/structure/barricade/crude, /turf/open/floor/plating, /area/station/science/lobby) "hgN" = ( @@ -51084,7 +51084,7 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/effect/landmark/navigate_destination, /obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/wooden, +/obj/effect/spawner/random/structure/barricade/crude, /turf/open/floor/iron, /area/station/construction/mining/aux_base) "rBZ" = ( diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index e2d3dc5dd7f..7c44213662d 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -24497,7 +24497,7 @@ /area/station/command/gateway) "eHc" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/abandon_diner) "eHi" = ( @@ -73589,8 +73589,8 @@ /area/station/common/wrestling/arena) "oek" = ( /obj/structure/door_assembly/door_assembly_hatch, -/obj/structure/barricade/wooden, /obj/structure/cable, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating/airless, /area/space/nearstation) "oem" = ( @@ -76853,8 +76853,8 @@ /obj/machinery/door/airlock/grunge{ name = "Forbidden Chapel" }, -/obj/structure/barricade/wooden, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/structure/barricade/wooden/crude, /turf/open/floor/iron/dark, /area/station/maintenance/cult_chapel_maint) "oIq" = ( @@ -108659,8 +108659,8 @@ /area/station/security/execution/education) "uJQ" = ( /obj/machinery/door/airlock/hatch, -/obj/structure/barricade/wooden, /obj/structure/cable, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/department/science/lower) "uJT" = ( @@ -108670,7 +108670,6 @@ /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, -/obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch" }, @@ -108681,6 +108680,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/abandon_art_studio) "uJZ" = ( @@ -112178,12 +112178,12 @@ /obj/machinery/door/airlock/maintenance{ name = "Abandoned Art Studio" }, -/obj/structure/barricade/wooden, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/barricade/wooden/crude, /turf/open/floor/iron, /area/station/service/electronic_marketing_den) "vtW" = ( @@ -117477,7 +117477,6 @@ "wry" = ( /obj/structure/window/reinforced/tinted/spawner/directional/north, /obj/structure/grille, -/obj/structure/barricade/wooden, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) @@ -118205,11 +118204,11 @@ /obj/machinery/door/airlock/command{ name = "Auxiliary E.V.A. Storage" }, -/obj/structure/barricade/wooden, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/command/eva, /obj/structure/cable, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/aux_eva) "wyF" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index de94195f936..80f692a064e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -30763,8 +30763,8 @@ /turf/closed/wall, /area/station/hallway/primary/port) "jQR" = ( -/obj/structure/barricade/wooden, /obj/effect/spawner/structure/window, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/port/fore) "jQT" = ( diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 7b5a6fdade7..0118cb56d65 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -8856,7 +8856,7 @@ /area/station/medical/chemistry) "cGZ" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/department/engine) "cHc" = ( @@ -37806,7 +37806,7 @@ /area/station/tcommsat/computer) "kKX" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "kLc" = ( @@ -51610,8 +51610,8 @@ /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch" }, -/obj/effect/spawner/random/structure/barricade, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/barricade/crude, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine) "owG" = ( @@ -59232,7 +59232,6 @@ /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch" }, -/obj/effect/spawner/random/structure/barricade, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -59241,6 +59240,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/structure/barricade/crude, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos) "qyv" = ( @@ -77582,7 +77582,7 @@ /area/station/security/prison/mess) "vBb" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/science/research/abandoned) "vBd" = ( diff --git a/tgstation.dme b/tgstation.dme index d93a2042ea4..df70dcd86f4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8809,12 +8809,12 @@ #include "modular_skyrat\modules\synths\code\reagents\reagents.dm" #include "modular_skyrat\modules\synths\code\species\prefsmenu.dm" #include "modular_skyrat\modules\synths\code\species\screen.dm" +#include "modular_skyrat\modules\synths\code\species\synthetic.dm" #include "modular_skyrat\modules\synths\code\species\subsystem_upgrades\_subsystem_upgrades.dm" #include "modular_skyrat\modules\synths\code\species\subsystem_upgrades\circulation.dm" #include "modular_skyrat\modules\synths\code\species\subsystem_upgrades\cortex.dm" #include "modular_skyrat\modules\synths\code\species\subsystem_upgrades\ligaments.dm" #include "modular_skyrat\modules\synths\code\species\subsystem_upgrades\nerves.dm" -#include "modular_skyrat\modules\synths\code\species\synthetic.dm" #include "modular_skyrat\modules\synths\code\surgery\operations\operation_mechanical_tending.dm" #include "modular_skyrat\modules\synths\code\surgery\operations\operation_organ_repair.dm" #include "modular_skyrat\modules\synths\code\surgery\operations\operation_revival.dm" diff --git a/tgui/packages/tgui/interfaces/FishingBubbers.tsx b/tgui/packages/tgui/interfaces/FishingBubbers.tsx index 93988858ea8..61200b13d21 100644 --- a/tgui/packages/tgui/interfaces/FishingBubbers.tsx +++ b/tgui/packages/tgui/interfaces/FishingBubbers.tsx @@ -1,5 +1,5 @@ + import { Component } from 'react'; -import { useDispatch } from 'tgui/backend'; import { Icon, KeyListener } from 'tgui-core/components'; import { globalEvents, type KeyEvent } from 'tgui-core/events'; import { KEY_CTRL } from 'tgui-core/keycodes'; @@ -12,7 +12,7 @@ import { } from 'tgui-core/random'; import { resolveAsset } from '../assets'; -import { backendSuspendStart, useBackend } from '../backend'; +import { useBackend } from 'tgui/backend'; import { Window } from '../layouts'; type Bait = { @@ -143,7 +143,7 @@ class FishingMinigame extends Component< this.updateAnimation = this.updateAnimation.bind(this); this.moveFish = this.moveFish.bind(this); this.moveBait = this.moveBait.bind(this); - this.updateCompletion = this.updateCompletion.bind(this); + // this.updateCompletion = this.updateCompletion.bind(this); } componentDidMount() { @@ -173,7 +173,7 @@ class FishingMinigame extends Component< let newState: FishingMinigameState = { ...this.state }; newState = this.moveFish(newState, delta, timestamp); newState = this.moveBait(newState, delta); - newState = this.updateCompletion(newState, delta); + // newState = this.updateCompletion(newState, delta); this.setState(newState); // wait for next frame this.last_frame = timestamp; @@ -366,7 +366,7 @@ class FishingMinigame extends Component< return newState; } - updateCompletion( +/* updateCompletion( currentState: FishingMinigameState, delta: number, ): FishingMinigameState { @@ -400,7 +400,7 @@ class FishingMinigame extends Component< } return newState; - } + } */ fishOnBait(fish: Fish, bait: Bait): boolean { const upperBoundCheck = fish.position >= bait.position;