Upstream 6-25-25#34
Merged
EmoGarbage404 merged 216 commits intoEphemeralSpace:masterfrom Jun 26, 2025
Merged
Conversation
* Cache regexes * Convert static LocManager to resolved * Use Any instead of Count > 0 * Use var instead of explicit types * Make _highlights readonly
* fix: only show pipe layer popups to the user changing them * fix: don't show pipe layer subfloor popup when not using a screwdriver * fix: properly pass down user and used for serverside pipe layer changes Technically this doesn't matter as the Shared codepath for this method doesn't actually use these on the server: only the user is used for a clientside popup. Still, will be good to have these for future changes that might need them.
long hand of Kremlin
* Fix gas analyzer and anomaly scanner UI activation issue * save * fix comment * milkalyzer
Prediction our beloved
fixed lines that were messing with construction menu entries for machine parts
* tweaked tear gas * changed color of tear gas * sped up metabolism rate of tear gas * sped up tear gas passing more * reduced tear gas content in grenades * added threshold for better effect end timing * removed clickable component from foams * Suggestion changes * Hide in spawn menu --------- Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
* Make visitor mindshields removable, and give disaster victims mindshields. * Fix whitespace * Fix ALL the whitespace
* Changed rat king to be antag Rat King guide updated to show antag rules Initial infected given zombie faction Zombies given zombie faction too (not sure if redundant or not) * Given zombie faction to Initial Infected and Zombies in mind_roles * Changed MindRoleGhostRoleAntag to MindRoleGhostRoleSoloAntagonist removed components from antag listings * Removed changes for zombies * Update Resources/Prototypes/Roles/Antags/zombie.yml Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> * Update Resources/Prototypes/ai_factions.yml Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> * Changed mob prototype to match * Forgot solo again --------- Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
fix puncturase cauterizing bleeding
…ear them. (#37660) * Added monkey/kobold emergency eva suit sprites, and the ability for them to wear it * Added tag, fixed indentation * Ok actually fixed the indentation this time
* swap HOP and vault, fix cams, new genpop, shit ton of stuff * fixed some initialised open doors, added posters to HOP/EVA * implemented suggestions and feedback, lots of things
* Added Zombie faction roles everywhere that makes sense for initial infected to be associated with Zombies. * Adding faction component to round start zombie. (not hopeful) * Removed stupid attempts and added zombie faction component to the zombie system when the player is given the ability to force themself to zombify. * Changed use of "zombie" for ProtoId<NpcFactionPrototype> * Update Content.Server/Zombies/ZombieSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Zombies/ZombieSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Removed faction component from ZombieOutbreak event. Shouldn't cause problems with the event as II gets component with their ability to self zombify. --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Added warden's uniforms to their dresser. Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Added warden's guitar Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Removed armored coats and guitar from warden dresser. Signed-off-by: Nox38 <nebulousnox38@gmail.com> --------- Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Add corgi essence * Adjust spacing concerns * Renamed 'corgi essence' to 'corgium' based on maintainer discussion
* Update air_alarm.yml * that too * Update air_alarm.yml
Fix BaseMaintTileRecipe Changed BaseTileRecipe to BaseMaintTileRecipe
* Changed LobbyMusiccollection over to a Cvar and edited ContentAudioSystem.cs to use Cvar Values * Addedd Ability to modify the lobbyMusiccollection from the command line * Fixed changing lobby music while in the round * Deleted uneeded duplicate line * Removed additional duplicate lobbyplaylist line * Alphabatized imports and refactored to use Subs.CVar * Added error checking and default behaviour to CVar sub. * Refactored to use TryIndex and Allowed for a empty soundcollection when a sound collection is not found. Edited Cvar comment to reflect changes. * Made _lobbyMusicCollection nullable and addedd handling for null case where used. Also Changed LobbyMusicCollection Cvar over to audio rather than ambience. * Update Content.Server/Audio/ContentAudioSystem.cs --------- Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* hey look I knocked out a todo :shockedface: * Update Resources/Locale/en-US/electrocution/electrocute-command.ftl --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
allow combat mode toggling when cuffed or crit
Update tiles.yml
* spectra * documentation * added into liquid anomaly * Update TemporaryStealthComponent.cs * Update TemporaryStealthComponent.cs * integrated * new system * mark old status effect system as obsolete * ForcedSleeping new status effect * work with reagents * networking??? * Revert "integrated" This reverts commit bca02b82bae18ae131af593d7eb86e6de2745157. * Revert "Update TemporaryStealthComponent.cs" This reverts commit 4a5be8c4b704a0d1ff9544b2e245d8b2701ec580. * Revert "Update TemporaryStealthComponent.cs" This reverts commit a4875bcb41347638854bd723d96a51c3e6d38034. * Revert "added into liquid anomaly" This reverts commit df5086b14bb35f1467158a36807c0f2163a16d99. * Revert "documentation" This reverts commit 3629b9466758cbdfa4dd5e67ece122fa2f181138. * Revert "spectra" This reverts commit 2d03d88c16d16ad6831c19a7921b84600daeb284. * drowsiness status effect remove * reagents work * polish, remove test changes * first Fildrance review part * Update misc.yml * more fildrance review * final part * fix trailing spaces * sleeping status effect * drowsiness status effect * Create ModifyStatusEffect.cs * some tweak * Yay!!! Manual networking * minor nitpick * oopsie * refactor: xml-docs, notnullwhen attributes, whitespaces * fildrance and emo review * refactor: simplify check in SharedStatusEffectsSystem by using pattern matching, TryEffectsWithComp now returns set of Entity<T, StatusEffectComponent> --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
* checkpoint * pt 2 * pt... i forgot * pt 4 * patch * More test fixes * optimization!!! * the REAL hand system * fix RetractableItemActionSystem.cs oversight * the review * test * remove test usage of body prototype * Update Content.IntegrationTests/Tests/Interaction/InteractionTest.cs Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * hellcode * hellcode 2 * Minor cleanup * test * Chasing the last of the bugs * changes --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* fix power cell draw rate * comment
* fix unwielding * hand refactor bugfix 2
* Added a ConfirmableAction component to ActionRevertPolymorph * Update Resources/Locale/en-US/actions/actions/polymorph.ftl --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Add CloningEvent and an action entity prototype * Remove redundant action prototype from Yaml * Add a field that might be changed * CR * CR - guard statement and Dirty
* commit * revert linq conversion
* fix: EyeOffset when eyes are closed * fix: Relay only blocked on eyes closed action * cleanup: whitespace * fix: missing cancel on PVS, dependencies * remove: namespace import * change: apply from review * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Updated hat descriptions * final touches * typo fix * final touchups * Quote fixes
feat: add /showaccessreaders to +MAPPING and +DEBUG
…on-14 into upstream/6-25
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
Why / Balance
Technical details
Media
Requirements
Breaking changes
Changelog