crystall-punk-14

Files

Ed 2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml

2024-07-23 12:24:42 +03:00

Components

Make delay incurred from additional syringe contents modifiable + tiny syringe buff/fix (#29825 )

2024-07-22 03:20:36 -07:00

Dispenser

Add limited-reagent dispensers (#23907 )

2024-01-17 16:43:48 -05:00

EntitySystems

Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream

2024-07-15 12:58:23 +03:00

Reaction

Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream