Ed
3409e0f752
Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Overlays/StencilOverlay.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
# Content.Shared/Clothing/Components/ClothingComponent.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/SkinColor.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
2025-09-15 13:50:49 +03:00
Pieter-Jan Briers
0c97520276
Fix usages of TryIndex() ( #39124 )
...
* Fix usages of TryIndex()
Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115 )
This then resulted in TryIndex() getting modified to log errors (94f98073b0#39098 )
This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.
Fixes #39115
Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.
* fix tests
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-09-09 18:17:56 +02:00
Pieter-Jan Briers
e99fc501a6
Revert biome rework ( #38724 )
...
* Revert "Fix world generation (#38713 )"
This reverts commit 10fa6ff4af#37735 )"
This reverts commit fe7b96147c
2025-07-03 20:48:04 +02:00
metalgearsloth
fe7b96147c
Biome rework ( #37735 )
...
* DungeonData rework
Back to fields, serializes better, just make new layers dumby.
* wawawewa
* Fix this
* Fixes
* Port the work over
* wawawewa
* zoom
* Kinda workin
* Adjust wawa
* Unloading work
* Ore + entitytable fixes
Iterate every dungeon not just last.
* Big shot
* wawawewa
* Fixes
* true
* Fixes
# Conflicts:
# Content.Server/Procedural/DungeonJob/DungeonJob.cs
* wawawewa
* Fixes
* Fix
* Lot of work
* wawawewa
* Fixing
* eh?
* a
* Fix a heap of stuff
* Better ignored check
* Reserve tile changes
* biome
* changes
* wawawewa
* Fixes & snow
* Shadow fixes
* wawawewa
* smol
* Add layer API
* More work
* wawawewa
* Preloads and running again
* wawawewa
* Modified
* Replacements and command
* Runtime support
* werk
* Fix expeds + dungeon alltiles
* reh
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
2025-07-03 00:36:06 -04:00
Ed
d5fbdbdec0
Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
# Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
# Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
# Resources/Prototypes/Entities/Effects/chemistry_effects.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/GameRules/meteorswarms.yml
# Resources/Prototypes/Procedural/dungeon_configs.yml
2025-05-27 12:21:14 +03:00
Tayrtahn
5a93099509
Update SharedBiomeSystem methods to use Entity<T> ( #37698 )
...
* Fix warning in TryGetBiomeTile
* Overload TryGetBiomeTile
* Overload more methods, fix internal warnings
* Update TryGetEntity uses
* Update TryGetTile uses
* Cleanup TryGetDecals use
* Formatting
* Two more warnings while we're here
2025-05-21 22:10:52 -04:00
metalgearsloth
4afccdd5db
DungeonData rework ( #37172 )
...
* DungeonData rework
Back to fields, serializes better, just make new layers dumby.
* wawawewa
* Fix this
* Fixes
* review
* thanks fork
* fix
2025-05-18 03:10:30 +10:00
