Commit Graph

4111 Commits

Author SHA1 Message Date
metalgearsloth f5a6a11ebd
Fix FTLToDock (#25803)
* Fix FTLToDock

- Removed Enabled coz unneeded really.
- Fixed SetCoordinates call that got dumped at some point oop.

* Fix this docking check

(cherry picked from commit 92872e546ad5c281980ab8f56fea970c1921f8e4)
2024-03-08 12:54:53 +01:00
metalgearsloth f102e8ff75
Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup

(cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082)
2024-03-08 12:54:53 +01:00
metalgearsloth fa61952f51
Add trade stations (#23863) 2024-03-08 09:52:50 +01:00
exincore d4d8898496
fix(emag): Emagging a lock properly unlocks the component (#25858)
* fix(emag): Emagging a lock properly unlocks the component

Fixes #24860

* fix(emag): Emagging a lock no longer duplicates the unlock sound

(cherry picked from commit 370a79fbc847c75aca4d733e1cac2bb56a19776b)
2024-03-07 01:52:55 +01:00
Tayrtahn 549d4f18cd
Add SharedPopupSystem.PopupPredicted (#25811)
* Added SharedPopupSystem.PopupPredicted

* Documentation improvement

(cherry picked from commit 0738829510d823bf0f22eaf197f6f5cc3744bbc3)
2024-03-07 01:52:38 +01:00
Tayrtahn c255822389
Add prediction to hand labeler labels (#25869)
Added prediction to labels

(cherry picked from commit f4976a32886850df2033e7866d0c9a5df37be1af)
2024-03-07 01:27:58 +01:00
exincore 31a4cdab4c
Fixed Emag wiping door access without bolting open (#25836)
(cherry picked from commit 68bb57bbaf41b84544ccdeb683ad356e2b344cc6)
2024-03-07 01:25:19 +01:00
deltanedas c0bfa9fc96
fishops nerf real (#25148)
* refactor ops

* inherit dna and fiber when fish hydrated

* :trollface:

* kid named finger

* :trollface:

* move rehydrating to shared :trollface:

* nobody noticed the popup being missing all this time

* method ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 550612a37f4fd61088c994b289c833ed3d564855)
2024-03-07 01:24:59 +01:00
Ed da5758ba4e
Mineshaft (#25733)
* content

* catwalks

* fix fucking icons

* finish PR

* +1 room

* fix

(cherry picked from commit ace82854406631bad58cd731899fc8e20ef21e65)
2024-03-07 01:24:40 +01:00
Plykiya 38719830b6
Syringe QoL improvements (#25480)
Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 4f7ff56e87d78a2acc0936466f83a6b841ee8fea)
2024-03-07 01:24:05 +01:00
Nemanja 026f5305cd
patch QSI container issues (#25700)
* patch QSI exception

* fuck don't die

(cherry picked from commit 9a795b35adba4575f2674f937f8b4bb566b3cb15)
2024-03-07 01:19:42 +01:00
LordCarve 297c97d556
Make `ItemSlots` more verbose + AME proof of concept (#25779)
* Make itemslots more verbose with AME proof of concept.

* Remove unnecessary [DataField] strings and use null coalescing in whitelist checks.

* Change optional popup fields into LocId.

(cherry picked from commit 06d755a860fa60dd393bfece6495109af8b60c21)
2024-03-07 01:19:38 +01:00
Tayrtahn b97afd8346
Add prediction for puddle and spillable examines (#25794)
Prediction for puddle and spillable examines

(cherry picked from commit 4943151111c8db9ac94701128b08f857b3abd3e6)
2024-03-07 01:19:36 +01:00
Fildrance 426b208c1d
fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) (#25530)
* fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore)

* refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished.

* refactor: incapsulated info on current lobby track in simple record

* refactor: fixed inconsistent naming between song and soundtrack for lobbymusic

* refactor: xml-doc for LobbyPlaylistChangedEvent

* fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
(cherry picked from commit 4c87dcd3cb92855df1fa01dea52d2ddd09f2adce)
2024-03-07 01:18:33 +01:00
Errant 63e45f9532
Alerts for breathing plasma/tritium (#24484)
* Alert autoremove v0

* Code cleanup and timing

* comment

* Tritium, code compression

* not resolving manually

* reduced lookups, new comp

* fix-fix yes

* use RemCompDeferred, handle OnUnpaused

* missed a todo

* entitysystem resolve

* remove unnecessary component updates

* remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan

* Code cleanup

* comments

* combines AutoRemove input into Clear

* minor logic adjustment that does not really change anything but is less ambiguous

(cherry picked from commit ecd2d5a644540c6ad28903ee4fb2af87876e3030)
2024-03-07 01:17:31 +01:00
Krunklehorn 1fb8bad18f
Weight based AreaInsert and Dumpable delay, a janitor qol tweak (#24899)
Weight based delay, retuned average, fixed comments

(cherry picked from commit c775410370a650aa51a1feda99f45cefda0c811e)
2024-03-07 01:17:27 +01:00
DrSmugleaf 56dd39497a
Make the round end sound collection a cvar (#25741)
* Make the round end sound collection a cvar

* Fix comment

* Clarity

(cherry picked from commit 30ccde0a47f65d0f6b0641f5bf92d95650c4fb87)
2024-03-07 01:13:37 +01:00
deltanedas 2ffd042e9b
make suicide actions require confirming (#24609)
* add ActionAttemptEvent

* add ConfirmableAction compsys

* make suicide actions confirmable

* use new trolling techniques

* better query and dirty them

* death

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit ad3f3a5d360be6f7c8acb9c7753b45653a28cc0f)
2024-03-07 01:12:21 +01:00
Nemanja f2beed936c
remove doorslam sound (#25737)
(cherry picked from commit 2852483b5caf02c9f6688395fc97b170e6d84e82)
2024-03-07 01:11:56 +01:00
LordCarve ba36e5195f
Refactor AME to use ItemSlot for Fuel (#25558)
* Using wrench on AME doesn't first try to put it in.

* Refactor AME to use ItemSlot for fuel.

* Apparently these names want to match.

(cherry picked from commit c47391011d0f7f56dfcba8e4db348f0dc0d58c09)
2024-03-07 01:08:04 +01:00
Rainfey b9d2f5a409
Refactor antag rule code (#23445)
* Initial Pass, Rev, Thief

* Zombie initial pass

* Rebase, Traitor

* Nukeops, More overloads

* Revert RevolutionaryRuleComponent

* Use TryRoundStartAttempt, Rewrite nukie spawning

* Comments, Add task scheduler to GameRuleSystem

* Zombie initial testing done

* Sort methods, rework GameRuleTask

* Add CCVar, Initial testing continues

* Might as well get rid of the obsolete logging

* Oops, i dont know how to log apparently

* Suggested formatting fixes

* Suggested changes

* Fix merge issues

* Minor optimisation

* Allowed thief to choose other antags

* Review changes

* Spawn items on floor first, then inserting

* minor tweaks

* Shift as much as possible to ProtoId<>

* Remove unneeded

* Add exclusive antag attribute

* Fix merge issues

* Minor formatting fix

* Convert to struct

* Cleanup

* Review cleanup (need to test a lot)

* Some fixes, (mostly) tested

* oop

* Pass tests (for real)

---------

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>

(cherry picked from commit 4e6c59cfe51211064d79a727cc2d37c2a2f55a2c)
2024-03-07 01:06:59 +01:00
metalgearsloth adf3a95292
Add anchorable flags (#25667)
Added it to cargo pallet and the ATS puter. Small steps. Also moved the log until the anchoring is actually confirmed to prevent dummy logs.

(cherry picked from commit 542574261731a91483d0bdca82abb7a3f81c05fd)
2024-03-07 01:05:18 +01:00
Menshin 37c7ac7931
Add space heaters (#25250)
(cherry picked from commit 98843511014e1b5fce34b7e1215179dd3d0f94c8)
2024-03-07 01:05:02 +01:00
metalgearsloth 444801f137
Fix gun cycling ammo count update (#25635)
Doesn't update correctly when cycling.

(cherry picked from commit fc0ff8fb313d8dfddf803c19a19bf2629ce89e90)
2024-03-07 01:04:01 +01:00
metalgearsloth 0c65749187
Fix projectiles (#25636)
(cherry picked from commit d204896bf57fe6a9e90ae276d16c282bf0037126)
2024-03-07 01:03:19 +01:00
Krunklehorn 1456ed8c0b
Revert "Fix ItemSlots prediction" (#25610)
Revert "Fix ItemSlots prediction (#25552)"

This reverts commit ad29dbe302ac921b9e3f6cbd3ded79788db27b46.

(cherry picked from commit 6485dd4f4de1167523c38d2aa7ffe79f440b4386)
2024-03-07 01:02:33 +01:00
Julian Giebel c9f4910cb9
News UI overhaul and PDA notifications (#19610)
(cherry picked from commit 0752acdc2ca2db43581e2c0d95a5d96041247bc9)
2024-03-07 01:02:24 +01:00
LankLTE b5e4b7049f
Zombie Diona Fixes (#25404)
No reform, zombie nymphs

(cherry picked from commit cc865c547ba9c313b7573155759d34cd750f549f)
2024-03-07 00:59:50 +01:00
Whisper e0d84f2db2
Whisper bleed update v3 (#25434)
* Whisper bleed update v3

* missed a few

* Add bleeding message to health analyzer.

* Fix bleed notification not updating.

* Apparently this either doesnt exist

(cherry picked from commit ff65cb7b0caaeb9edd9461eff942bdc6f5eb7f50)
2024-03-07 00:59:34 +01:00
Ed 64ccfc1afb
Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix

(cherry picked from commit 7a5f81ddb46e47078b983bfc9ba015ee67752ee3)
2024-03-07 00:59:22 +01:00
SlamBamActionman ecdef48ce4
Add nose customization to humans & dwarves (#25557)
Initial commit

(cherry picked from commit 3af2928a25c4cbc0ee6e8edabf317d060b652b06)
2024-03-07 00:59:12 +01:00
Whisper da5b4ee627
handcuff replacements are faster to escape from (#25601)
makeshift handcuffs are easier to escape from

(cherry picked from commit 74232f983129b97d6c2564b904eb7ad7f2a49cf5)
2024-03-07 00:58:59 +01:00
Pieter-Jan Briers e7a3b82a8d
Use new ComponentPauseGenerator (#25183)
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.

(cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)
2024-03-07 00:57:05 +01:00
SlamBamActionman c7d16b4c6b
Remove self-uncuff spam suicide, damage changes (#25161)
* Initial commit

* Remove damage from cuffs entirely

* Changed from Action uncuffing cooldown to UseDelay cooldown

* Minor merge conflict fix

* Edit the actual correct line

* Submodule fix

(cherry picked from commit 485fb4cb652793ab4f9cbe90bb2cbf555fbf5540)
2024-03-07 00:56:26 +01:00
Pieter-Jan Briers 5d93d35fdf
Character profile sanitization improvements (#25579)
Validate that job and antag prototypes can actually be set in character profiles, rather than just checking if the prototype exists.

Make preferences system just call existing validation code when loading prototype from database, instead of some hacked-together stuff.

Also I made the character profile validation logic take dependencies in via parameter because fuck resolves.

(cherry picked from commit 8d244f7b76ba881253eb94611acaab31865c3920)
2024-03-07 00:56:04 +01:00
Tayrtahn f40668818b
Add a container display to dispenser UI (#25391)
* Implemented contents display for dispenser UI

* Update Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Resolve the netent into a euid first

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 100ece2e2078ab2fe99f4ce1ab36b2cd05319772)
2024-03-07 00:53:04 +01:00
metalgearsloth 398bbde497
Fix ItemSlots prediction (#25552)
IDK what this arg is for but seems okay with guns. Without it it always thinks the insertion can work.

(cherry picked from commit ad29dbe302ac921b9e3f6cbd3ded79788db27b46)
2024-03-07 00:52:44 +01:00
MilenVolf bea2046baf
Toggleable items shape change on toggle state (#25392)
* Toggleable items now can change their shape depends on toggle state

* Update Content.Shared/Item/SharedItemSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 1a5f7c39b2a2c244d5d947d8ff8f09250f21450b)
2024-03-07 00:52:34 +01:00
metalgearsloth 2b5aef7764
Fix cuffs popup prediction (#25553)
(cherry picked from commit a440ccfc7c0d9dcaa68a419cac50f71bde1e42a1)
2024-03-07 00:52:30 +01:00
Krunklehorn a8d9ddd53e
Fix candy bowls (#25514)
* Before SharedItemSystem

* Fixes mispredict, removed unused

* Fix physics

(cherry picked from commit 902198d7e0c85f62ac91a0ff2cd275c0e7e77d56)
2024-03-07 00:52:26 +01:00
Debug b1958e9ac6
Revert "Cleanup ExecutionSystem (#24382)"
This reverts commit dc56c5992f.
2024-03-07 00:51:07 +01:00
nikthechampiongr dc56c5992f
Cleanup ExecutionSystem (#24382) 2024-03-05 09:55:50 +01:00
metalgearsloth 8910a98a3f
Selectively revert gun penetration (#25551)
The collision layer check doesn't work and I don't have time to fix it.

(cherry picked from commit ec5edc362656440373cba7aa8ef63c87af85911b)
2024-03-05 09:51:21 +01:00
metalgearsloth cd8b5b96b5
Optimise DecalOverlay (#25266)
ChunkSize is still 32 so doesn't cut down on heaps of decals atm though we avoid passing many decals to drawing with the coordinates bounds check now.

(cherry picked from commit d8e5f5c24b88bf8096ddaec11e80f1af2953637b)
2024-03-05 09:49:43 +01:00
Pieter-Jan Briers 905bb83a2d
Make department / job list sorting consistent. (#25486)
* Make department / job list sorting consistent.

This makes late join, crew manifest and character profile all apply consistent sorting for jobs and departments.

We use the already-defined weights for departments (so command, then sec, then station specific, then just sort by prototype ID). Jobs also use weight (so heads are always at the top) then prototype ID, then character name (for manifest).

Removed the crewmanifest.ordering CVar as doing it via prototype weight is just easier, and that CVar was already a mess anyways.

* Fix jittery job icons in lists.

They were set to KeepCentered in TextureRect. This has issues because the allocated space is actually an odd number of pixels, so it tries to position the draw at a half pixel offset.

Now, yes, fixing this in TextureRect would make much more sense, but get off my back. (Ok seriously we need better helper functions for doing that in the engine. Don't wanna deal with that right now and I already have this patch made.)

Instead I'm just gonna fix the issue by using VerticalAlignment in all these places instead which ends up doing exactly the same thing YIPPEE.

Also gave a margin next to the icon on the crew manifest. Margins people!

(cherry picked from commit 715794dd414c5d4b794cd6f2201983ecbc5d4f17)
2024-03-05 09:49:19 +01:00
Pieter-Jan Briers 324ea7fbc8
Switch project files to C# 12. (#25487)
Just unlocks new language features like primary constructors.

(cherry picked from commit b1de6dd6017f4f56045df409db59fb7d303bde5d)
2024-03-05 09:49:02 +01:00
Tayrtahn 164c06f6ed
Add prediction to Openable (#25477)
* Fix formatting problem with FullOpened

* Moved to Shared and networked

* Revert "Fix formatting problem with FullOpened"

This reverts commit f8353403da830a4402bdd457bcf24a2432a5f566.

(cherry picked from commit 381bb9020aeba82e9cad111c77c34bee29d52c68)
2024-03-05 09:48:52 +01:00
Nemanja 384c060ea5
Predict doors and airlocks (#25419)
* predict doors and airlocks

* prying, too

* ack

* eek

(cherry picked from commit ce0a51fc29675b3b0afb90296b6a8ce90c3f9cd3)
2024-03-05 09:48:41 +01:00
J. Brown 29cfc13d7e
Fix #22933 - Job-specific Uplink items leaking to non-job minds (#23179)
Fix for 22933 - SharedMindSystem now checks for VisitingMindComponent too.

(cherry picked from commit b26e9a9a325070323fe9475275ceaf4ed079cb76)
2024-03-05 09:48:01 +01:00
keronshb fd4445253d
Moves muted to shared (#25374)
* moves muted to shared

* fixes usings

* Update MutedComponent.cs

funny webedit

* Update MutedComponent.cs

oops using statement webedit

(cherry picked from commit 046c874daeb60609d8880fe27617836d37de1a94)
2024-03-05 09:45:27 +01:00