Commit Graph

6336 Commits

Author SHA1 Message Date
Vanessa 43a4db57d3 Upstream merge cleanup 2025-12-29 11:39:36 -06:00
slarticodefast 7b8038df14 Cleanup BatterySystem (#41298)
* cleanup

* fix fixtures

* this belongs into the next PR

* review

* misc

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-29 11:39:36 -06:00
Princess Cheeseballs 74cc4bc12c Conveyors spin fix (#37468)
* Init commit

* And on the third day god said: good enough

* and on the fourth day god said: oops

* Commit of evil

* I hate conveyors

* Switch the numbas

* I hate conveyors

* Master Merge

* And on the third day, God said: Good Enough

* I hate conveyors

* AAAA

* Optimize it a bit

* Move that

* Init Commit

* Oops

* Remove that

* One last commit

* Removed one TryComp

* Remove TryComp

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:36 -06:00
Justin Pfeifler 83d4239d5f Gravity Generators cannot be unanchored while active (#41256)
* Add unanchor attempt check

* Combine shared component and server component

- Combines SharedGravityGeneratorComponent and GravityGeneratorComponent
- AutoNetworked the GravityActiveBool

* Remove SharedGravityGeneratorComponent

* Update to SharedGravityGeneratorComponent

* Fix to be a complete sentence

* Dirty GravityActive whenever changed

* Rename component and remove view variables

* Update referenced component name

* Move unanchor attempt to shared system

* Add client system

* Revert popup to PopupEntity

* Fix popup to be PopupClient

* Set access restriction on GravityActive
2025-12-29 11:39:36 -06:00
Princess Cheeseballs db1f32c9e6 Fix Entity Effect Scaling (Hopefully) for good and some other misc fixes (#41163)
* Fix the last of the entity effects bugs

* aaa

* losing it

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:36 -06:00
JesterX666 636085892c Log radial menu interractions for the RCD, Issue #40902 (#40986)
* Log radial menu interractions,  Issue #40902

* code review adjustement

* Asked modifications from code review

* Update Content.Shared/RCD/Systems/RCDSystem.cs

Yeah, I'm old and using a very old C# syntax :D  I need to update my brain

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

* Update Content.Shared/RCD/Systems/RCDSystem.cs

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-29 11:39:36 -06:00
UpAndLeaves b792068a0b Move TileFireEvent to Shared (#41285)
* Move to shared

* cleanup

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-29 11:39:36 -06:00
ScarKy0 e676fbb187 Clone toolshed commands (#41261)
* init

* fuck this file its such a mess why wont anyone sort this holy shit

* review
2025-12-29 11:39:36 -06:00
slarticodefast 1586ae2306 Add DNA injector (#41271)
* add item

* Update Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-12-29 11:39:35 -06:00
Vanessa b0d80e7471 Cloning fix 2025-12-29 11:39:35 -06:00
SlamBamActionman c6f98a3008 Fix walls and other unanchorable objects being unanchored by the G.O.R.I.L.L.A gauntlet (#41219)
* Initial commit

* Review fixes

* Bitwise? Yeah my wisdom score is a 10

* Review comments
2025-12-29 11:39:35 -06:00
Princess Cheeseballs cd6a041c0a Make CuffableComponent and CuffableSystem not Crash (Hopefully) (#39123)
* This system is ancient

* Destroy that API

* Address reviews

* Destroy merge conflicts from orbit

* seems to work fine

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:35 -06:00
slarticodefast 98540ecbe7 Allow InteractionTests to load other maps (#41226)
* load maps and marker

* cleanup

* sneaky doc

* sneaky doc2

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-29 11:39:34 -06:00
Errant e234864fa3 Fix for Tesla Twins Miniboss (#41199)
* increase QA standards on the Tesla Generator production line

* comment

* Inert datafield and code

* I'm not even supposed to be here today
2025-12-29 11:39:34 -06:00
Connor Huffine 263c09a67a Remove unused includes in Ninja (#41207)
* Remove Unused

* Additional cleanup
2025-12-29 11:39:34 -06:00
SnappingOpossum 1104ad85b7 Allow pacifists to use disabling modes of energy magnum and energy shotgun (#41029)
Pacifists can stun with emagnum and eshotgun
2025-12-29 11:39:33 -06:00
Princess Cheeseballs f5686383ba [HOTFIX] Fix status effect removal from entity effects and buckets not being draggable (#41168)
just do less work it's that easy!

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:33 -06:00
TheGrimbeeper 74c5aa098d Xenoartifact: Fix phasing effect (#41160) 2025-12-29 11:39:33 -06:00
Princess Cheeseballs ca58cdbec4 Fix chemical explosion scaling. (#41153)
Fix area reaction scaling

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:33 -06:00
Atakku f05d3f9220 Implemented parenting and minimum default for loadout groups (#40861)
* Implemented parenting and minimum default for loadouts

* Fix a mistake

* Apply suggestion from @iaada

Co-authored-by: āda <ss.adasts@gmail.com>

* Implement @iaada's suggestion to rename MinDefault to DefaultSelected

* happy little accidents

* Moved Parents and Abstract fields to under ID, added inheritdoc

---------

Co-authored-by: āda <ss.adasts@gmail.com>
2025-12-29 11:39:33 -06:00
Vanessa 1dc29c9e32 Literally all of the damageable system refactor shitmed fixes. 2025-12-29 11:39:33 -06:00
Hannah Giovanna Dawson bd98b9212b Update DamageableSystem to modern standards (#39417)
* Update DamageableSystem to modern standards

* DamageContainerId -> DamageContainerID with lint flag

* Replace strings with protoids

* Make CVar subscription declarations all consistently whitespaced

* ChangeDamage -> TryChangeDamage, cope with C# jank

* Revert event signature changes

* Restore a comment

* Re-add two queries

* Init the queries

* Use appearanceQuery in DamageChanged

* Use damageableQuery in TryChangeDamage

* Use damageableQuery in SetDamageModifierSetId

* Final cleanup, fix sandboxing

* Rectify ExplosionSystem:::ProcessEntity's call to TryChangeDamage

* Re-organize DamageableSystem

* first big fuck you breaking change.

* THATS A LOT OF DAMAGE!!!

* Fix test fails

* test fixes 2

* push it

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:33 -06:00
metalgearsloth 6a8e307679 Double bullet speeds (#34971)
* Double bullet speeds

The only reason we had it at 20m/s was tunneling reasons.

The quick maths is (BodyA size + BodyB size) / frametime. Currently the game is doing substepping AFAIK so we can use 0.016 as the frametime therefore with a 0.40 width body we can get up to 40.625 (assuming the target is no narrower than 0.25 which given my thindows change last year should be a decently safe assumption).

* Fix

* Fix impact visuals, as they overshoot otherwise

* Revert changes

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-12-29 11:39:33 -06:00
Vanessa 504aecba37 More fixes. 2025-12-29 11:39:32 -06:00
Nemanja 2429e7b6b4 fix singulo decay (#28743) 2025-12-29 11:39:32 -06:00
Vanessa fc1d452e39 Various upstream tweaks and fixes. 2025-12-29 11:39:32 -06:00
āda 03cdc0f9f2 Document tags: M-Q (#41141)
* the letter M

* the letter N

* the letter O

* the letter P

* the letter q

* Update Resources/Prototypes/tags.yml

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-29 11:39:32 -06:00
ArtisticRoomba 33002e7485 DeltaPressure Predicted Examine (#41135)
* predicted examine

* atrociously satanic

* do it right this time

* deltafields aren't necessary

* Update Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-29 11:39:32 -06:00
sleepyyapril 9965777d04 Fix TryProccessRadioMessage Typo (#41139)
fix proccess typo
2025-12-29 11:39:32 -06:00
Princess Cheeseballs 16f205b75d Damageable/Destructible Benchmarks (#41064)
* the fard

* oomba

* The woke swarm...

* Review

* review

* Apply suggestions from code review

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-29 11:39:32 -06:00
beck-thompson a788927cea Admin alerts now link players with tpto (#40472)
* Admin alerts now link players with tpto

* Add coords

* Slarti tweaks!

* He saw my minor spelling mistake - its over...
2025-12-29 11:39:32 -06:00
TheGrimbeeper 1463a83a82 Xenoartifact: Fix teleport effect (#41049)
* Fix teleport effect

Fix teleport effect, teleporting the artifact instead of the node. Also fix the popup happening twice.

* Detach from parent

* Resolve popup

* fix pulling issue

* Fixed via joint system instead of pulling system

* artifact

* requested changes
2025-12-29 11:39:32 -06:00
Kyle Tyo 853fda5af2 Remove IsFirstTimePredicted from Ninja systems (#41127)
commit
2025-12-29 11:39:32 -06:00
psykana 7b39355168 Internals: prioritize gas tanks over jetpacks (#35068)
* Internals: prioritize gas tanks over jetpacks

* Use HasComp
2025-12-29 11:39:32 -06:00
slarticodefast f7b1de8255 remove a bunch of redundant IsFirstTimePredicted checks (#41119) 2025-12-29 11:39:32 -06:00
Princess Cheeseballs de5bdbc2f4 Fix eating the whole stack of uranium. (#41092)
* I hate stack system!!!

* a lil bit of fixing, as a treat

* humgry

* mmm burger

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:32 -06:00
slarticodefast d2331ae65c Hotfix: Not all pens embed, exploding pens embed when activated (#41105)
* Revert "All pens embed (#39104)"

This reverts commit 3c1982a85fedb8a38a7bcf51ea05a22b1eea5a99.

* only activated pens embed

* fix disembedding during prediction
2025-12-29 11:39:31 -06:00
TemporalOroboros 70f775fd8e Purges uses of TransformComponent.Coordinates.set (#34937)
* ECS-TransformComponent-Coordinates
Moves over all uses of the setter to use SharedTransformSystem.SetCoordinates instead

* revert unrelated change

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-29 11:39:31 -06:00
āda ad4f64fcd6 Stack System Cleanup (#38872)
* eye on the prize

* OnStackInteractUsing, TryMergeStacks, TryMergeToHands, TryMergeToContacts

* namespace

* Use, get count, getMaxCount

* component access

* add regions, mark TODO

* obsolete TryAdd, public TryMergeStacks

* GetMaxCount

* event handlers

* event handlers

* SetCount

* client server event handlers

* move to shared

* Revert "move to shared"

This reverts commit 45540a2d6b8e1e6d2a8f83a584267776c7edcd73.

* misc changes to shared

* split

* spawn and SpawnNextToOrDrop

* SpawnMultipleAtPosition, SpawnMultipleNextToOrDrop, CalculateSpawns, general server cleanup

* Rename Use to TryUse.

* Small misc changes

* Remove obsolete functions

* Remove some SetCount calls

* Partialize

* small misc change

* don't nuke the git dif with the namespace block

* Comments and reordering

* touchup to UpdateLingering

* Summary comment for StackStatusControl

* Last pass

* Actual last pass (for now)

* I know myself too well

* fixup

* goodbye lingering

* fixes

* review

* fix test

* second look

* fix test

* forgot

* remove early comp getting

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-29 11:39:31 -06:00
Centronias 88b2dcebc6 `BaseSpawnEntityEntityEffect` scales its spawned entities by default (#41091)
* make basically all entity spawning reactions scaling

* Intelligence
2025-12-29 11:39:31 -06:00
Princess Cheeseballs e59a873ae6 Reduce Triggers Boilerplate. (#41086)
* Push 1

* cleanup + master merge

* launchontrigger

* A crumb of cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:31 -06:00
pre-commit-ci[bot] 460bcebc2e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2025-12-29 11:39:31 -06:00
Hannah Giovanna Dawson 4afd2fb05d LaunchOnTriggerComponent (#39871)
* LaunchOnTriggerComponent

Launches an object when a trigger on that
object is caused. The launch will be a certain
amount of force. The direction of the force
will be in the direction the object is facing.

* Fire stationary objects in the direction they're facing

* EVIL

* LESS EVIL

* Resolve @ScarKy0 comments
2025-12-29 11:39:31 -06:00
āda a3db6f513b Delete FoodComponent, migrate prototypes to EdibleComponent (#41070)
* yml

* yml fixes

* cs

* document regression

* comment

* organs fix

* diona consistency

* push

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:31 -06:00
slarticodefast 355cf08d43 Fix wielding two-handed items with only one hand (#40966)
* fix

* review
2025-12-29 11:39:31 -06:00
Princess Cheeseballs 7d888e511d Mild Entity Effect/Condition Cleanup (#41059)
* Commit

* ploop

* borger

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:30 -06:00
slarticodefast 7e6ee4afff Predict DestructibleSystem Part 2: First batch of entity effects (#41039)
* first batch

* fix name

* fix
2025-12-29 11:39:30 -06:00
Sir Warock 08dfaf0dd5 Merge Injector & Hypospray Systems & Components (#41833)
* Merge Injector & Hyposprays

* Fixes

* Requested Changes

* Preview

* Inclusion of Prototypes

* Fix

* small oversight

* Further fixes

* A few more fixes & Bluespacesyringe buff

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

* Final Commit, hopefully

* Merge conflict no more

* YML fix

* Add required changes

Co-Authored-By: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* cleanup warnings removal

* Bug fix & Maintainer Requests

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

* Adhere to requested changes

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

---------

Co-authored-by: āda <177162775+iaada@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:30 -06:00
Uberration 95cac43684 Fix: LockSystem - HasUserAccess - Set DenyReason Localization Text Properly (#41012)
* Update AccessReaderSystem.cs

Fixes #40987
Related to PR #40883

Set DenyReason in CheckUserHasLockAccessEvent when access is denied to display "Access denied." popup to users. Uses ??= to avoid overriding reasons from possible systems.

* RE-FIX: Localize default deny reason in LockSystem.HasUserAccess

The default deny reason was being passed as a localization key string instead of being localized before display.

* Re-added null coalescing operator

Per maint request
2025-12-29 11:39:30 -06:00
Princess Cheeseballs b2f02e6eed Fix Being Drunk! (#41002)
* Drunk moment

* push

* fix test fails + a smidge of cleanup

* two smidges of cleanup

* Unpredicted so don't need the workaround

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:30 -06:00