Skip to content

Commit

Permalink
upstreamOps (#161)
Browse files Browse the repository at this point in the history
* Automatic changelog update

* babyproof arrivals shuttle (#33284)

* babyproof arrivals shuttle

* always powered lights

* uncuttable cables from terminal PR.

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Add delay to AutoOrient (#33479)

It functions identically to how V1 of orientation worked and it's incredibly annoying.

* Automatic changelog update

* Draw muzzle flash below mobs (#33465)

* Draw muzzle flash below mobs

* Better naming

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Automatic changelog update

* Allow shuttles on planets to make FTL jump (#33507)

This check conflicts with an attempt to FTL from the planet before expedition ends

* Automatic changelog update

* fix exped caves generation (#32890)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* various material & ore inhands (#33342)

* begin

* bones + pyrotten + goliath hide inhands

* Update Resources/Prototypes/Entities/Objects/Materials/materials.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* pyrottOn

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Delete HOS headset from warden's locker (#33234)

* add headset

* Add icons

* Meta change

* fix

* Revert + delete headset from locker

* fix airlocks inconsistently auto-closing after unbolting (#33524)

fix door auto close timer

* Automatic changelog update

* [BUGFIX] "Ghost" in the lobby lets you see the whole chat (#33529)

* fix bug, in ghost command lobby

* fix

* Fix build

* removed obsolete netmessage creator (#33542)

removed opsolete netmessage createor

* Fix RA0003 warning for ChatBox (#33531)

* Shark plushies now goes rawr on hit. (#33540)

Shark goes rawr more

* Automatic changelog update

* Turn off PointLights on VendingMachines when broken or off. (#33513)

The light itself should already turn off due to `LitOnPowered`
component, but the broken state of a VendingMachine did not.

Fixes  #33382

* Automatic changelog update

* Adds more diona names (#33066)

* adds more diona names

* more stuff

* AHHHHHHHHHHHHHHHHHHHHHHH

* further additions

* removes depression + adds comment

* fixes + remove some weird stuff + more stuff

* remove haste

* minor AI cleanup (#33555)

* minor cleanup

* to

* Simplify separated screen top menu (#33047)

* Automatic changelog update

* Ghost role drop-down alignment (#33397)

* dropdown shares margin width with children

* removed dependency that rider added for some reason

* reduced vertical margin from 8 to 2

* Greytide Virus station event (#33547)

* proof of concept

* full implementation

* I commited a crime

* t

* min players increase

* Make shuttle airlocks not snapcardinals (#33557)

* Make shuttle airlocks not snapcardinals

* Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Fix space ambient music (#33594)

* Automatic changelog update

* Fix windoor and high security door not showing electrocution HUD (#33551)

* Automatic changelog update

* Removes burnt tiles (#33422)

remove burnt tiles

* Added Oppenhopper poster to the game. (#33588)

* o7

* -

* oppenhopper v2

* Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

* Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fix version for electril_grill meta.json (#33611)

fix

fixing the version thing in meta json for electril grill textures

Co-authored-by: Arthur Kustenko <arthur.kustenko@learnet.se>

* Fix gauze eyepatch flying pixel (#33564)

boo

* Fix swapped uniform printer east/west sprites (#33442)

Fix uniform printer sprites rotating the wrong way

* Makes knives fly straight when thrown (#33615)

Gives knives a thrown angle

* Light verb is now predicted (#33622)

Fix

* Automatic changelog update

* Update `Content.PatreonParser` to use `net8.0` `TargetFramework` (#33559)

Update Content.PatreonParse to use net8.0 targetframework

* Fix gender, maybe (#33631)

Co-authored-by: Alpha-Two <alpha2.5232@gmail.com>

* Display GPS coordinates on their own line (#33625)

* Automatic changelog update

* Add admin log for ghost warping (#33636)

* Automatic changelog update

* Rename nitrogen internals crate (#33545)

* rename nitrogen internals crate

* nitrogen internals crate description

* migrate CrateNitrogenInternals ID

* Automatic changelog update

* Cleanup some Client atmos systems (#33634)

* Cleanup `ScrubberControl.xaml.cs`

* Minor cleanups

* Another pile of minor cleanups

* Apply requested changes

* Rename "which" into "bound". Add whitespace after "if"

* Fix for arrivals deleting nuke (#33659)

Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing
Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked

Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>

* Automatic changelog update

* add locale to Shuttle Console Map tab (#33651)

fixed

* Automatic changelog update

* fix PermanentBlindnessComponent to be not so permanent (#33292)

* adjust min blindness back to 0 when PermanentBlindnessComponent is removed

* mapinit changes

* remove OnRemove, move changes to OnShutdown

* goodbye event

* dependency removal

* final adjustment

---------

Co-authored-by: lunarcomets <luanrcomets2@gmail,com>

* Automatic changelog update

* Fix for handcuffing someone more than once (#33646)

* Fix for over-cuffing someone

* comment

* Automatic changelog update

* Fix for inspecting entities in hand (#33642)

Actually inspect entity in hands

* Automatic changelog update

* Fix for inspecting entities in the stripping window (#33644)

Handle it

* Automatic changelog update

* Fix borgs not getting names on roundstart (#33578)

* Fix borgs not getting names on roundstart

* Glory to the NT

* Allow riggable to take in multiple reagents

* Revert

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Automatic changelog update

* Require Wield To Activate Double-bladed ESword (#32869)

* Add MeleeRequiresWield component

* Prevent world activation

* Automatic changelog update

* Fix makeghostroleraffle command where 4 arguments (#31836)

Fix makeghostroleraffle command with 4 arguments

* Automatic changelog update

* this isnt needed anymore

* Fix formatting IDE0055 warnings in VS Code (#33669)

* Replace obsolete GetTilesIntersecting methods (#32455)

* Remove usage of obsolete GetTilesIntersecting round 1

* Oop wrong uids

* Remove usage of obsolete GetLocalTilesIntersecting round 2

* Remove usage of obsolete GetLocalTilesIntersecting final round

* weh

* Fix using `SharedMapSystem` in `StencilOverlay`

* Automatic changelog update

* Fix wrong system usage (#33679)

Fix wrong system using

* Fix BuckleSystem always marking InteractHandEvent as Handled (#33602)

* Add check before marking event as handled

* Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Fixed ghost role rules for some syndicate familiars (#32457)

* fix ghost role rules for some syndicate familiars

* change from monkey rules to Team Antag rules.

* Resolve reviews + Fix rules for LoneOp and Xenos

* ghostrole rules

---------

Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Automatic changelog update

* Fix lobby countdown not showing hours (#33685)

* Automatic changelog update

* Makes kukri not use combat knife's storage sprite (#33661)

* Adds a morgue locked maints airlock (#33693)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Juiceable slimeballs (#33660)

adds extractable component to slimeball prototype

* Add missing nacho recipes (#33637)

* Nacho recipes, nutrition, and trash

In meal_recipes.yml: Add recipes for Nachos, Cheesy Nachos, and Cuban Nachos.

In meals.yml: Add a solutions container to regular nachos so it lines up with the others, and add a small plate as trash to each one.

* Volumes, nutritional tweaks, and flavor

In meals.yml: Lowered maxVol on nachos to leave 5 units of space. Nachos nutriment and vitamin lowered for costing so little. A cheese wedge is 3.75 nutriment, so cheesy having 4 more total nutritional value lines up nicely to me.

Cuban nachos had too little volume to fit its reagents in the first place, so increased maxVol by 10. Chili peppers are 4 nutri / 4 vitamin and ketchup has a touch of tomato, so bumped to 8 and 5. Capsaicin lowered partly to make it an even 20u. Ketchup dilutes I guess. Also they don't have cheese so I changed the flavor profile to tomato instead.

In meal_recipes.yml: Cuban Nachos recipe tweaked to require one less pepper. Given above numbers, this fits the nutritional value imo.

* Automatic changelog update

* Fix sinks and toilets not draining (#33691)

* Fix AutoDrain

Per the system comments, AutoDrain is designed to automatically move
puddles into the drain (like a floor drain). Drains without AutoDrain
are still supposed to gradually empty the buffer, but not remove puddles
(like sinks and toilets).

However, a logic error in the original implementation causes drains with
AutoDrain set to false to simply not work. Hence sinks never emptied.

* Update documentation

* Automatic changelog update

* Fix layout on wires UI (#33714)

Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead.

Lights with less than 4 characters of text weren't aligned right, now they are.

* Automatic changelog update

* Fix for towels not having a cooldown for cleaning (#33700)

Added a delay to cleaning with the towel

* Add cooldown to buttons in borg's laws UI (#31490)

* Adds Store on Collide and Wand of the Locker (#33710)

* Adds wand of locker and locker projectile

* Adds IsOpen method to check if storage is open

* Adds store on collide

* Adds Store On Collide to Wizard Locker

* Adds Lock API

* Adds locking support

* Adds resist override and custom visual layers

* Fixes decursed states, adds comment for a future visualizer

* adds locker wand visuals and descriptions

* shrinks locker radius, moves TODO for throw support

* Adds whitelist and moves storage and lock logic into their own methods

* Adds support to disable store on collide after the first open. Fixes prediction issues with disabling.

* Adds wand of locker to the grimoire

* Adds wizard access prototype

* Adds Wizard to universal access

* Moves Lock on collide to on collide method

* Comments

* Changes layer order

* Fixes prediction issues when locking.

* Adds Wiz access to universal ID

* Automatic changelog update

* More device configurator serialization fixes (#33664)

More device configurator invalid entity serialization fixes

* Fix meteor's ArithmeticException (#33556)

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Give vox health regen for poison below 20 damage (#33722)

* Automatic changelog update

* set n2 survival box sprite layers (#33733)

* Automatic changelog update

* fix a station event weighting bug (#33584)

* fractional weights dont work in StationEvents

* force-int

* sure why not, we can keep floats I guess.

* Automatic changelog update

* Adds Station Anchor Beacon (#33711)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Fix name duplications (#33740)

* Fix name duplication

* Apply requested changes

* Add a maintenance panel to bar signs (#33467)

* Add a maintenance panel to bar signs

* Update Resources/Locale/en-US/wires/wire-names.ftl

* AI interactions

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Derelict Borg Revival (#33433)

* Derelictn'tn't Borg!

* Clean *sparkles*

* Removed "S: Awaiting Changes"

* Automatic changelog update

* vox guidebook update poison regen (#33739)

* vox guidebook regen update

* damage number

* skreee

* Revert "fix debris having nothing (DeltaV-Station#2280)"

This reverts commit 3a27784.

* Fix debris chunks loot spawning (#33747)

Update DungeonJob.PostGenBiome.cs

* Automatic changelog update

* Added several variables to make ClumsyComponent more modular for developers. (#33715)

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Add Sprite changes to Logic Gates to show the input/output state (#33277)

* Samurai dogi is now major contraband (#33699)

* snake_case to PascalCase for name datasets

* clean up random lathe recipes (#31525)

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Make unknown shuttle events trigger an announcement (#33450)

* Make unknown shuttle events trigger an announcement

* Call base at the end

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Predicted gas pumps (#33717)

* Predicted gas pumps

I wanted to try out atmos and first thing I found.

* a

* Remove details range

* Automatic changelog update

* Christmas Nuke Song (#33752)

* 圣诞歌曲

* Update Resources/Audio/StationEvents/attributions.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* infiltrator update (#33759)

* Organize the Sandbox Panel window (#33684)

* Organize Sandbox Panel

* Map Editing -> Editing

* Unset ToggleMode on Suicide button. Can hardly un-suicide, no?

* Remove 'Link machines' button that has done nothing for 3 years

* Remember Sandbox window's position instead of forcing to center

* Shows Spawns -> Show Spawns

* Remove SandboxSystem.MachineLinking

* Grey & Wooden Railings (DeltaV-Station#2379)

* initial commit

* double parent

* will this work...

* fine.

* abstract & suffix & newline

* :trollface:

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

* Automatic changelog update

* Add Reinforced Directional Tinted Window (DeltaV-Station#2376)

* initial commit

* oops

* Update tinted_windows.yml

* Automatic changelog update

* Update Credits (DeltaV-Station#2392)

Co-authored-by: DeltaV-Bot <github@delta-v.org>

* change up and add ninja objectives (DeltaV-Station#2359)

* change up and add ninja objectives

* make cloak stealable

* formatting

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* Randomizes the appearance of Fugitives (DeltaV-Station#2383)

* Adds RandomHumanoidAppearance to both and does not randomize their names

* LPO is now back to being clones of station members

* Automatic changelog update

* Build Diona Different (DeltaV-Station#2204)

* meow

* meow

* meow

* meow

* meow

* Automatic changelog update

* aac tablet refactor (DeltaV-Station#2401)

* another thing nobody asked for

* just.. why? who did this, and why?

* Derotates Micro (DeltaV-Station#2402)

Update default.yml

* Automatic changelog update

* Automatic ACO procedure (DeltaV-Station#2351)

* Add events for player updating jobs

* Add NoCaptainComponent

* add and remove NoCaptainComponent logic

* Gernalized to CaptainStateComponent

* Generalized CaptainStateComponent

* Add requesting aco vote

* Add auto unlock aa

* Remove hardcodecd strings

* Add localization

* // DeltaV

* pro fix

* fax cc please

* move captain detection to CaptainStateSystem

* track spareidsafe with comp instead

* little bit of movement

* fix broken formating

Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com>

* pls

* Remove unused method

* subscribe captainstatecomponent for job events

* Cvars, Disabled AA on peri

* temp fix for intergration test bug

* :3

* format fix

* spelling ops

* nameing ops

* done final real this time (1) (1)

* remove has an out very nice

---------

Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com>

* Automatic changelog update

* make lathe items worthless (DeltaV-Station#2406)

* shutting down the money printer

* fix ore processor

* Automatic changelog update

* Update CODEOWNERS (DeltaV-Station#2403)

* fix diona speed (DeltaV-Station#2413)

i swear this fucking codebase was designed to hate me

* Automatic changelog update

* add lavaland real (DeltaV-Station#2380)

* fix not being able to make catwalk over lava

* add planet prototypes

* StationSurface -> StationPlanetSpawner

* spawn lavaland for all stations

* remove reclaimer wrecks muahaha

* add mining shuttle

* add lavaland map

* convert glacier surface to a grid (still unusable)

* update glacier comment

* add docking shuttle/console systems

* fix test

* make glacier use a lavaland base reskin

* -m actually set the atmosphere

* :trollface:

* fix test

* address most reviews

* add no shuttle warning

* remove unnecessary usings

* 80C and higher pressure

* lock the shuttle docks to external access

* correct comment pressure

* add salvage access to the console

* lock supply room to salv, add a cooler

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Milon <plmilonpl@gmail.com>

* Automatic changelog update

* pda messaging real (DeltaV-Station#2362)

* the shiny new toy that breaks everything else

* privacy 😌

* janky shit

* real??

* :trollface:

* ALL HAIL DUCT TAPE SOLUTION

* FUCK

* commented every shit

* Automatic changelog update

* Make the shadow cat a ghost role (DeltaV-Station#2417)

* SHADOW CATO!

* Spawner!

* MobCombat added as a parent

* Automatic changelog update

* fix "teach person a lesson" (DeltaV-Station#2412)

* "when you code it" but i already fucking did

* FUCK

* ok thats a thing apparently

* Automatic changelog update

* Allow jetpacks to fit in the suit storage slot (DeltaV-Station#2400)

* Allow jetpacks to fit in the suit storage slot

* Not fucking asleep version

* Automatic changelog update

* Map Edits: Arena, Hive, Hammurabi (DeltaV-Station#2357)

* Map Edits: Arena, Hive, Hammurabi

* Fix disconnected vent

* How!?

* add superweapon spawners

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Auto ACO Procedure bug fixes (DeltaV-Station#2424)

* bug fixes and safty improvments

* remove unsued useings

* this is dumb but ok

* removed global annoucement

* why does my ide keep doing this shit

* remove unessesary stuff

* Modify clown and mime sexy masks and add them to the autodrobe (DeltaV-Station#2346)

* Changed names

* Add to the AutoDrobe

* Indent changes

* Automatic changelog update

* Make LO know at least the basics of cargo tech. (DeltaV-Station#2399)

Restored cargo tech time

* Automatic changelog update

* CentCom Map HotFix (DeltaV-Station#2396)

* meow

* meow

* meow

* fix mining shuttle not docking on small stations (DeltaV-Station#2430)

fix bug and add log

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* fix auto aco timing (DeltaV-Station#2431)

* add mining points (DeltaV-Station#2419)

* add mining points

* add claim points button to oreproc

* funny

* its over

* :trollface:

* xml fail

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>

* Reduce RE time (DeltaV-Station#2394)

* Meow

* Update ReverseEngineeringMachineComponent.cs

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

---------

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

* Automatic changelog update

* Change Overlord Law so no RDM (DeltaV-Station#2375)

* meow

* meow

* meow

* Revert "meow"

This reverts commit 7b8cdb3.

* meow

* Update silicon-laws.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* meow

* whitespace noob

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* morewhitespace

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update silicon-laws.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update silicon-laws.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

---------

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Delta-V Specific Posters! (DeltaV-Station#2303)

* Posters!~

Adds four new posters.

* Help

* Cooking

* More Poster

* Again

* Randoms

* Correction

* Update Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml

Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>

* Fixes?

* Test Removed

* Meta.json Fixes

* More changes???-

* Update meta.json

* Update meta.json

---------

Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>

* fix lavaland shuttle for real (DeltaV-Station#2434)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* glacier surface update (DeltaV-Station#2414)

* add glacier-specific console and airlock

* add glacier surface shuttle

* dock glacier surface shuttle at arrivals

* remake old surface outpost but good

* nvidia

* med curtains, public ordering console

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Automatic changelog update

* Asterisk and Chibi updates (DeltaV-Station#2416)

* Added lavaland stuff

* shielding and req consoles

* lighthouse lavaland update (DeltaV-Station#2415)

* lighthouse lavaland update

* public ordering console + flap windoor

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Modified djstation and added random intercom (DeltaV-Station#2390)

* Modified djstation and added random intercom

* Indentation!

* AAAAAAAAAAAAA

* Modified the ruin

* Make space ruins dirty! (DeltaV-Station#2423)

* Added trash, scrap and general dirt

* Nuke those lights

* Forgor atmos

* Forgot atmos on old AI + minor details

* Atmos added to derelict

* Automatic changelog update

* Map Edits: X-Mas (DeltaV-Station#2433)

* Map Edits: X-Mas

* Needed a FGA

* Tortuga

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Ion storm refactor (#33311)

* Edge Fixes + Minor Updates (DeltaV-Station#2420)

* mapupdate

* Updates YML

* oops

* Update edge.yml

* reenable greytide virus with changed announcement

* move gun execution system to deltav folder, fix it

* epic fail

* Edge Christmas Update, but fixed (DeltaV-Station#2436)

teehee

* Colin Xmas Map update (DeltaV-Station#2435)

Adds festive flair

...to Chibi and Asterisk

* uncurse energy gun laser

* localize AI names

* add automatic panic bunker (DeltaV-Station#2437)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* Update Synth Specialist rules (DeltaV-Station#2391)

meow

* Add order access to cargo technicians (DeltaV-Station#2356)

* Automatic changelog update

* add cameras to service courtyard area, add scrubbers to justiceroid

* use cargo access instead of external for surface shuttle

* glacier christmas update

* Clarify Sec/Command/Justice Following IC documents (DeltaV-Station#2442)

* meow

* Update C1_CommandSecurityJustice.xml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

---------

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Automatic changelog update

* check ban flag for auto panic bunker (DeltaV-Station#2443)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* fix vox gladiators not getting nitrogen tanks (DeltaV-Station#2446)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* make mining shuttle console ui 1% better (DeltaV-Station#2447)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Add a new janitor PDA - Hygiene technician (DeltaV-Station#2448)

* Add the hygiene tech PDA + ID + locale

* Add loadout

* Untouch

* Wrong star

* Automatic changelog update

* Make Security Jetpacks Not Be Empty (DeltaV-Station#2449)

make the jetpacks filled :3

* Automatic changelog update

* Add service access to mime and clown (DeltaV-Station#2388)

Added services access to mime and clown

* Automatic changelog update

* Update Credits (DeltaV-Station#2444)

Co-authored-by: DeltaV-Bot <github@delta-v.org>

* Change bounty skip access to Orders (DeltaV-Station#2454)

Changed bounty skip access to Orders

* Automatic changelog update

* Remove additional DoafterEvent (DeltaV-Station#2455)

* Adds empty AI core to Centcom (DeltaV-Station#2428)

Adds AI core to Centcom

* Automatic changelog update

* Shoukou Christmas Update (2024) (DeltaV-Station#2451)

Christmas Update

* Make stocks trading require LO access. (DeltaV-Station#2456)

Orders to Quartermaster

* Automatic changelog update

* Revert "Removes burnt tiles (#33422)"

This reverts commit 8980440.

* Automatic changelog update

* lighthouse christmas update (DeltaV-Station#2439)

* lighthouse christmas update

* nuke GroupExamine

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Add Atmos alert computer board to lathe recipes and research (DeltaV-Station#2452)

* Automatic changelog update

* fix

* Revert "Integrate Modern HWID into content"

This reverts commit 26b36db.

* fix2

* fixROBO

* Add the psychologist's locker (DeltaV-Station#2372)

* Add the locker + fill

* In DeltaV folder

* Generic!

* Remove appearance

* Fix meta.json

* Add Interdyne clothes + contraband to the chemdrobe (DeltaV-Station#2355)

* Add Interdyne clothes

* Fix pixels

* Typo + chemdrobe contraband

* Eh, we don't need containers.

* We do like containers

* Automatic changelog update

* okay boomer

* Flower Bushes (DeltaV-Station#2382)

* initial commit

* oops

* Update flora.yml

* Update flora.yml

* Automatic changelog update

* Barrels & Kegs (DeltaV-Station#2378)

* initial commit

* fixes

* Automatic changelog update

* sex

* dick

* 20cm

* Update pebble.yml

* попроьбую

* imposter

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: mubururu_ <139181059+muburu@users.noreply.github.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com>
Co-authored-by: Ben <benjaminevanownby@gmail.com>
Co-authored-by: Nikolai Korolev <CrafterKolyan@mail.ru>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Niels Huylebroeck <red15@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: AlexUm <159550239+AlexUm418@users.noreply.github.com>
Co-authored-by: Arthur Kustenko <arthur.kustenko@learnet.se>
Co-authored-by: Mifia <xzx._@outlook.com>
Co-authored-by: SpaceManiac <tad@platymuus.com>
Co-authored-by: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Alpha-Two <92269094+Alpha-Two@users.noreply.github.com>
Co-authored-by: Alpha-Two <alpha2.5232@gmail.com>
Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: MossyGreySlope <mossygreyslope@gmail.com>
Co-authored-by: Gansu <68031780+GansuLalan@users.noreply.github.com>
Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: lunarcomets <luanrcomets2@gmail,com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: Preston Smith <92108534+thetolbean@users.noreply.github.com>
Co-authored-by: Token <56667933+TokenStyle@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Nikolai Korolev <korolevns98@gmail.com>
Co-authored-by: JIPDawg <51352440+JIPDawg@users.noreply.github.com>
Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Luiz Costa <33888056+luizwritescode@users.noreply.github.com>
Co-authored-by: CheddaCheez <cheddacheezy@gmail.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Tap <tapiocaphobe@gmail.com>
Co-authored-by: Hreno <hrenor@gmail.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
Co-authored-by: 0tito <147736056+0tito@users.noreply.github.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Piras314 <p1r4s@proton.me>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DeltaV-Bot <github@delta-v.org>
Co-authored-by: Mono <182929384+Monotheonist@users.noreply.github.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com>
Co-authored-by: Milon <plmilonpl@gmail.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: therealDLondon <162949166+therealDLondon@users.noreply.github.com>
Co-authored-by: ConstantlyConfused <67894661+Eternally-Confused@users.noreply.github.com>
Co-authored-by: GeneralGaws <limonmessi@mail.ru>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Emily <182209267+Emily9031@users.noreply.github.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 755 changed files with 54,177 additions and 25,708 deletions.
8 changes: 8 additions & 0 deletions Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ protected override void Open()
_window.OnNameChanged += OnNameChanged;
_window.OnJobChanged += OnJobChanged;
_window.OnJobIconChanged += OnJobIconChanged;
_window.OnNumberChanged += OnNumberChanged; // DeltaV
}

// DeltaV - Add number change handler
private void OnNumberChanged(uint newNumber)
{
SendMessage(new AgentIDCardNumberChangedMessage(newNumber));
}

private void OnNameChanged(string newName)
Expand Down Expand Up @@ -56,6 +63,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
_window.SetCurrentName(cast.CurrentName);
_window.SetCurrentJob(cast.CurrentJob);
_window.SetAllowedIcons(cast.CurrentJobIconId);
_window.SetCurrentNumber(cast.CurrentNumber); // DeltaV
}
}
}
4 changes: 4 additions & 0 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
<LineEdit Name="NameLineEdit" />
<Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
<LineEdit Name="JobLineEdit" />
<!-- DeltaV - Add NanoChat number field -->
<Label Name="CurrentNumber" Text="{Loc 'agent-id-card-current-number'}" />
<LineEdit Name="NumberLineEdit" PlaceHolder="#0000" />
<!-- DeltaV end -->
<Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
<GridContainer Name="IconGrid" Columns="10">
<!-- Job icon buttons are generated in the code -->
Expand Down
35 changes: 35 additions & 0 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ public sealed partial class AgentIDCardWindow : DefaultWindow

private const int JobIconColumnCount = 10;

private const int MaxNumberLength = 4; // DeltaV - Same as NewChatPopup

public event Action<string>? OnNameChanged;
public event Action<string>? OnJobChanged;

public event Action<uint>? OnNumberChanged; // DeltaV - Add event for number changes

public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;

public AgentIDCardWindow()
Expand All @@ -37,6 +41,37 @@ public AgentIDCardWindow()

JobLineEdit.OnTextEntered += e => OnJobChanged?.Invoke(e.Text);
JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);

// DeltaV - Add handlers for number changes
NumberLineEdit.OnTextEntered += OnNumberEntered;
NumberLineEdit.OnFocusExit += OnNumberEntered;

// DeltaV - Filter to only allow digits
NumberLineEdit.OnTextChanged += args =>
{
if (args.Text.Length > MaxNumberLength)
{
NumberLineEdit.Text = args.Text[..MaxNumberLength];
}

// Filter to digits only
var newText = string.Concat(args.Text.Where(char.IsDigit));
if (newText != args.Text)
NumberLineEdit.Text = newText;
};
}

// DeltaV - Add number validation and event
private void OnNumberEntered(LineEdit.LineEditEventArgs args)
{
if (uint.TryParse(args.Text, out var number) && number > 0)
OnNumberChanged?.Invoke(number);
}

// DeltaV - Add setter for current number
public void SetCurrentNumber(uint? number)
{
NumberLineEdit.Text = number?.ToString("D4") ?? "";
}

public void SetAllowedIcons(string currentJobIconId)
Expand Down
12 changes: 6 additions & 6 deletions Content.Client/Actions/ActionsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,13 @@ public void UnlinkAllActions()

public void LinkAllActions(ActionsComponent? actions = null)
{
if (_playerManager.LocalEntity is not { } user ||
!Resolve(user, ref actions, false))
{
return;
}
if (_playerManager.LocalEntity is not { } user ||
!Resolve(user, ref actions, false))
{
return;
}

LinkActions?.Invoke(actions);
LinkActions?.Invoke(actions);
}

public override void Shutdown()
Expand Down
1 change: 1 addition & 0 deletions Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ private void OnTypeChanged(OptionButton.ItemSelectedEventArgs args)
SecretCheckBox.Pressed = false;
SeverityOption.Disabled = false;
PermanentCheckBox.Pressed = true;
SubmitButton.Disabled = true;
UpdatePermanentCheckboxFields();
break;
case (int) NoteType.Message: // Message: these are shown to the player when they log on
Expand Down
6 changes: 1 addition & 5 deletions Content.Client/Atmos/Components/PipeColorVisualsComponent.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using Robust.Shared.GameObjects;

namespace Content.Client.Atmos.Components;

[RegisterComponent]
public sealed partial class PipeColorVisualsComponent : Component
{
}
public sealed partial class PipeColorVisualsComponent : Component;
3 changes: 1 addition & 2 deletions Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<BoxContainer xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Content.Client.Stylesheets"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Orientation="Vertical" HorizontalExpand ="True" Margin="0 0 0 3">
Expand Down Expand Up @@ -62,7 +61,7 @@
</PanelContainer>
</BoxContainer>

<!-- If the alarm is inactive, this is label is diplayed instead -->
<!-- If the alarm is inactive, this is label is displayed instead -->
<Label Name="NoDataLabel" Text="{Loc 'atmos-alerts-window-no-data-available'}" HorizontalAlignment="Center" Margin="0 15" FontColorOverride="#a9a9a9" ReservesSpace="False" Visible="False"></Label>

<!-- Silencing progress bar -->
Expand Down
11 changes: 5 additions & 6 deletions Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
GasGridContainer.RemoveAllChildren();

var gasData = focusData.Value.GasData.Where(g => g.Key != Gas.Oxygen);
var keyValuePairs = gasData.ToList();

if (gasData.Count() == 0)
if (keyValuePairs.Count == 0)
{
// No other gases
var gasLabel = new Label()
Expand All @@ -158,13 +159,11 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
else
{
// Add an entry for each gas
foreach ((var gas, (var mol, var percent, var alert)) in gasData)
foreach ((var gas, (var mol, var percent, var alert)) in keyValuePairs)
{
var gasPercent = (FixedPoint2)0f;
gasPercent = percent * 100f;
FixedPoint2 gasPercent = percent * 100f;

if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
gasShorthand = "X";
var gasShorthand = _gasShorthands.GetValueOrDefault(gas, "X");

var gasLabel = new Label()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ protected override void Open()
_menu = new AtmosAlertsComputerWindow(this, Owner);
_menu.OpenCentered();
_menu.OnClose += Close;

EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
}

protected override void UpdateState(BoundUserInterfaceState state)
Expand All @@ -24,9 +22,6 @@ protected override void UpdateState(BoundUserInterfaceState state)

var castState = (AtmosAlertsComputerBoundInterfaceState) state;

if (castState == null)
return;

EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
_menu?.UpdateUI(xform?.Coordinates, castState.AirAlarms, castState.FireAlarms, castState.FocusData);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:ui="clr-namespace:Content.Client.Pinpointer.UI"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
Title="{Loc 'atmos-alerts-window-title'}"
Resizable="False"
SetSize="1120 750"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
using Content.Shared.Atmos.Piping;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.ResourceManagement;
using Robust.Shared.Serialization.TypeSerializers.Implementations;

namespace Content.Client.Atmos.EntitySystems;

Expand All @@ -19,7 +17,7 @@ public override void Initialize()
base.Initialize();

SubscribeLocalEvent<PipeAppearanceComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<PipeAppearanceComponent, AppearanceChangeEvent>(OnAppearanceChanged, after: new[] { typeof(SubFloorHideSystem) });
SubscribeLocalEvent<PipeAppearanceComponent, AppearanceChangeEvent>(OnAppearanceChanged, after: [typeof(SubFloorHideSystem)]);
}

private void OnInit(EntityUid uid, PipeAppearanceComponent component, ComponentInit args)
Expand Down Expand Up @@ -84,7 +82,8 @@ private void OnAppearanceChanged(EntityUid uid, PipeAppearanceComponent componen

layer.Visible &= visible;

if (!visible) continue;
if (!visible)
continue;

layer.Color = color;
}
Expand Down
23 changes: 23 additions & 0 deletions Content.Client/Atmos/EntitySystems/GasPressurePumpSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using Content.Client.Atmos.UI;
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.EntitySystems;
using Content.Shared.Atmos.Piping.Binary.Components;

namespace Content.Client.Atmos.EntitySystems;

public sealed class GasPressurePumpSystem : SharedGasPressurePumpSystem
{
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<GasPressurePumpComponent, AfterAutoHandleStateEvent>(OnPumpUpdate);
}

private void OnPumpUpdate(Entity<GasPressurePumpComponent> ent, ref AfterAutoHandleStateEvent args)
{
if (UserInterfaceSystem.TryGetOpenUi<GasPressurePumpBoundUserInterface>(ent.Owner, GasPressurePumpUiKey.Key, out var bui))
{
bui.Update();
}
}
}
9 changes: 2 additions & 7 deletions Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
using System.Collections.Generic;
using Content.Shared.Atmos.Monitor;
using Content.Shared.Power;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Serialization.Manager.Attributes;

namespace Content.Client.Atmos.Monitor;

Expand All @@ -27,7 +22,7 @@ protected override void OnAppearanceChange(EntityUid uid, AtmosAlarmableVisualsC
{
foreach (var visLayer in component.HideOnDepowered)
{
if (args.Sprite.LayerMapTryGet(visLayer, out int powerVisibilityLayer))
if (args.Sprite.LayerMapTryGet(visLayer, out var powerVisibilityLayer))
args.Sprite.LayerSetVisible(powerVisibilityLayer, powered);
}
}
Expand All @@ -36,7 +31,7 @@ protected override void OnAppearanceChange(EntityUid uid, AtmosAlarmableVisualsC
{
foreach (var (setLayer, powerState) in component.SetOnDepowered)
{
if (args.Sprite.LayerMapTryGet(setLayer, out int setStateLayer))
if (args.Sprite.LayerMapTryGet(setLayer, out var setStateLayer))
args.Sprite.LayerSetState(setStateLayer, new RSI.StateId(powerState));
}
}
Expand Down
7 changes: 2 additions & 5 deletions Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
using Content.Shared.Atmos.Monitor.Components;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;

namespace Content.Client.Atmos.Monitor.UI;

Expand Down Expand Up @@ -78,6 +74,7 @@ protected override void Dispose(bool disposing)
{
base.Dispose(disposing);

if (disposing) _window?.Dispose();
if (disposing)
_window?.Dispose();
}
}
21 changes: 8 additions & 13 deletions Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.Temperature;
using Robust.Client.AutoGenerated;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

Expand Down Expand Up @@ -59,7 +58,7 @@ public AirAlarmWindow()
AirAlarmMode.Fill => "air-alarm-ui-mode-fill",
AirAlarmMode.Panic => "air-alarm-ui-mode-panic",
AirAlarmMode.None => "air-alarm-ui-mode-none",
_ => "error"
_ => "error",
};
_modes.AddItem(Loc.GetString(text));
}
Expand All @@ -70,7 +69,7 @@ public AirAlarmWindow()
AirAlarmModeChanged!.Invoke((AirAlarmMode) args.Id);
};

_autoMode.OnToggled += args =>
_autoMode.OnToggled += _ =>
{
AutoModeChanged!.Invoke(_autoMode.Pressed);
};
Expand Down Expand Up @@ -176,22 +175,18 @@ public void UpdateDeviceData(string addr, IAtmosDeviceData device)

public static Color ColorForThreshold(float amount, AtmosAlarmThreshold threshold)
{
threshold.CheckThreshold(amount, out AtmosAlarmType curAlarm);
threshold.CheckThreshold(amount, out var curAlarm);
return ColorForAlarm(curAlarm);
}

public static Color ColorForAlarm(AtmosAlarmType curAlarm)
{
if(curAlarm == AtmosAlarmType.Danger)
return curAlarm switch
{
return StyleNano.DangerousRedFore;
}
else if(curAlarm == AtmosAlarmType.Warning)
{
return StyleNano.ConcerningOrangeFore;
}

return StyleNano.GoodGreenFore;
AtmosAlarmType.Danger => StyleNano.DangerousRedFore,
AtmosAlarmType.Warning => StyleNano.ConcerningOrangeFore,
_ => StyleNano.GoodGreenFore,
};
}


Expand Down
8 changes: 2 additions & 6 deletions Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
using System;
using Content.Shared.Atmos.Monitor;
using Content.Shared.Atmos.Monitor.Components;
using Content.Shared.Atmos.Piping.Unary.Components;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Localization;

namespace Content.Client.Atmos.Monitor.UI.Widgets;

Expand All @@ -25,7 +21,7 @@ public sealed partial class PumpControl : BoxContainer
private OptionButton _pressureCheck => CPressureCheck;
private FloatSpinBox _externalBound => CExternalBound;
private FloatSpinBox _internalBound => CInternalBound;
private Button _copySettings => CCopySettings;
private Button _copySettings => CCopySettings;

public PumpControl(GasVentPumpData data, string address)
{
Expand Down Expand Up @@ -86,7 +82,7 @@ public PumpControl(GasVentPumpData data, string address)
_data.PressureChecks = (VentPressureBound) args.Id;
PumpDataChanged?.Invoke(_address, _data);
};

_copySettings.OnPressed += _ =>
{
PumpDataCopied?.Invoke(_data);
Expand Down
Loading

0 comments on commit 089f3af

Please sign in to comment.