18 Commits

Author SHA1 Message Date
Dmitry
c682eb80b4 merge remote master, upstream 2025-10-26 22:31:58 +07:00
Princess Cheeseballs
4059c29ebc Entity effects ECS refactor (#40580)
* LOCKED THE FUCK IN

* Forgot this little fella

* Crying

* All entity effects ported, needs cleanup still

* Commit

* HEHEHEHAW

* Shelve for now

* fixe

* Big

* First big chunk of changes

* Big if true

* Commit

* IT BUILDS!!!

* Fix LINTER fails

* Cleanup

* Scale working, cut down on some evil code

* Delete old Entity Effects

* Accidentally breaking shit by fixing bugs

* Fix a bunch of effects not working

* Fix reagent thresholds

* Update damage

* Wait don't change the gas metabolisms A

* Cleanup

* more fixes

* Eh

* Misc fixes and jank

* Remove two things, add bullshit, change condition to inverted

* Remove unused "Shared" system structure

* Namespace fix

* merge conflicts/cleanup

* More fixes

* Guidebook text begins

* Shelve

* Push

* More shit to push

* Fix

* Fix merg conflicts

* BLOOD FOR THE BLOOD GOD!!!

* Mild cleanup and lists

* Fix localization and comments

* Shuffle localization around a bit.

* All done?

* Nearly everything

* Is this the end?

* Whoops forgot to remove that TODO

* Get rid of some warnings for good measure...

* It's done

* Should make those virtual in case we want to override them tbqh...

* Update Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* Fix test fails real

* Add to codeowners

* Documentation to everything

* Forgot to push whoops

* Standardize Condition names

* Fix up metabolism a little as a treat

* review

* add IsServer checks

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
2025-10-12 21:23:42 +00:00
Morb0
a7492708b6 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
#	Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
#	Content.Server/GuideGenerator/ReagentEntry.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Datasets/ion_storm.yml
2024-07-01 14:55:33 +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
KrasnoshchekovPavel
6625e91ee1 Add more reaction info to wiki json (#2064) 2024-05-03 11:06:13 +03:00
Morb0
918f543c2c Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
#	Resources/Textures/Objects/Devices/nuke.rsi/meta.json
#	Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
2023-12-25 21:03:49 +03:00
Leon Friedrich
8587c3778a Make some prototypes use frozen collections (#22576)
* Make some prototypes use frozen collections

* poke tests

* Remove frozen dictionary enumeration
2023-12-25 15:12:22 +11:00
Morb0
8363a22e11 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
#	Tools/actions_changelogs_since_last_run.py
2023-12-18 01:51:30 +03:00
Nemanja
0a81038a17 mild reagent prototype cleanup + other misc garbage (#22630) 2023-12-16 19:34:13 -08:00
mhamster
834852ac96 GuideGenerator TextTools (#1523) 2023-11-21 22:03:58 +03:00
mhamster
65cfa17d9c [Fix?] Json generation for wiki works again (#1504) 2023-10-15 21:46:35 +03:00
mhamster
68201fc1e8 Fix wiki json autogen + entity autogen (#1441) 2023-09-24 17:29:13 +03:00
wrexbe
bc68ac96dd Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Alex Evgrashin
860db943e1 Reagents localization (#7916)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 21:06:01 +10:00
mirrorcult
ec4d4688c7 Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Sam Weaver
adddd2fac6 FIXED: Chemistry JSON dump tool and companion GitHub Action (#6222)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-01-18 14:44:22 -07:00
Moony
5fd45fc82a Revert "Chemistry JSON dump tool and companion GitHub Action (#6134)" (#6217)
This reverts commit 40e2e78e0f.
2022-01-17 16:06:19 -06:00
Sam Weaver
40e2e78e0f Chemistry JSON dump tool and companion GitHub Action (#6134)
* fuck

* oh boy

* Sorted every chem into guide groups

* WHY ARE YOU NOT ABSTRACT

* removes the target thing in favor of simply generating everything.

* eee

* Add group for med

* Update wiki JSON generation to use System.Text.Json

* Fix error on shutdown during wiki JSON generation

* First pass at automatic wiki workflow

* Add a temporary workaround while the build is continuing to give errors

* Update workflow to reference correct API url, track dependency.

* Compile wiki actions into one job rather than two

* Update page name to reference editable page

* Add other JSON file and parameterize root page path

* A few steps closer to using `System.Text.Json` to serialize properly

* Revert System.Text.Json and return to Newtonsoft.Json.

* Revert the revert. Return to System.Text.Json.

This reverts commit a5ea98dfdcfab3f605ac4d82d3b110f099324308.

* Add and register UniversalJsonConverter class.

* Narrow triggers for update-wiki GitHub action.

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-01-17 13:50:02 -06:00