7 Commits

Author	SHA1	Message	Date
Ed	b581f5d132	Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync ... # Conflicts: # .github/workflows/check-trailing-whitespace.yml # Content.IntegrationTests/Tests/Access/AccessReaderTest.cs # Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs # Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs # Content.Shared/Light/Components/SunShadowCycleComponent.cs # Resources/Prototypes/Damage/modifier_sets.yml # Resources/Prototypes/Maps/Pools/default.yml	2025-06-23 16:37:22 +03:00
Ed	42d39a7c67	Merge remote-tracking branch 'upstream/stable' into ed-10-06-2025-upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Lock/LockSystem.cs	2025-06-10 11:33:34 +03:00
DrSmugleaf	7f9b2a0434	Fix eating and drinking verbs showing up after a short delay and making your verb UI bounce (#38164) ... * Fix eating and drinking verbs showing up after a short delay and making your verb UI bounce * Usings fix * Usings fix * Usings fix * Usings fix * CVar fix * Predicted ppups * Openable predicted popup * Fix audio prediction	2025-06-09 10:36:04 -04:00
āda	b6af2dbaf8	Loc fix for emote guidebook (#38020) ... Loc fix	2025-06-03 17:55:15 +02:00
pathetic meowmeow	bf41de18aa	Move entity effects definitions to shared (#35614) ... * Move entity effects to shared * relocate spawning to server * Generic version of EntityEffect for just raising event. * genericise everything * oops forgot to push you * some condensation * finish rebas * unwhite the space * oops forgot nuke * bad rebase fix * useless annotations begone --------- Co-authored-by: EmoGarbage404 <retron404@gmail.com>	2025-05-23 12:32:22 -04:00
Ed	7abf678bbe	fix inverse effect	2024-06-30 12:02:40 +03:00
SlamBamActionman	b9fa941ca6	Turn ReagentEffects into generic EntityEffects (#28168) ... * Oh the possibilities * Merge fixes * Forgot to remote LavaSystem oops * Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs * Throw exception for unimplemented effectargs * Remove Json and overrideable datafields * Fix test issues * Actually fix the compiling issue * Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)	2024-06-30 13:43:43 +10:00