Ed 04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml

2024-06-17 14:20:38 +03:00

..

Commands

Make some prototypes use frozen collections (#22576)

2023-12-25 15:12:22 +11:00

Components

Add a system for modifying entity names without causing conflicts (#27863)

2024-06-16 15:38:53 -04:00

Containers/EntitySystems

Moved Serverside solution container code to shared (yes that includes ensureSolution!) (#27478)

2024-05-06 17:27:36 -07:00

EntitySystems

Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream

2024-06-17 14:20:38 +03:00

ReactionEffects

Replaces reagent-effect-guidebook-missing with more descriptive guidebook entries (#28817)

2024-06-14 22:43:36 -04:00

ReagentEffectConditions

add 👷 JobCondition system for reagents (#29023)

2024-06-15 17:36:25 -04:00

ReagentEffects

Replaces reagent-effect-guidebook-missing with more descriptive guidebook entries (#28817)

2024-06-14 22:43:36 -04:00

TileReactions

Replace obsolete EntityWhitelist IsValid usages part 2 (#28506)

2024-06-03 17:40:03 -04:00