Ed d6a8c169b2 Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/IdentityManagement/IdentitySystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs

2025-09-29 14:00:54 +03:00

..

Consumable

Requested changes

2025-09-22 17:44:54 -04:00

Materials

fix: allow ejecting diamonds from lathes/silos (#38132)

2025-06-07 13:36:58 -04:00

biological.yml

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

botany.yml

Fix that space (#32149)

2024-09-14 14:28:35 +03:00

chemicals.yml

Add contraband levels for several reagents (#40426)

2025-09-18 12:01:22 -07:00

cleaning.yml

Add contraband levels for several reagents (#40426)

2025-09-18 12:01:22 -07:00

elements.yml

Chem colors (#28367)

2024-05-31 12:44:22 -07:00

fun.yml

Add contraband levels for several reagents (#40426)

2025-09-18 12:01:22 -07:00

gases.yml

Add contraband levels for several reagents (#40426)

2025-09-18 12:01:22 -07:00

medicine.yml

Add contraband levels for several reagents (#40426)

2025-09-18 12:01:22 -07:00

narcotics.yml

Add contraband levels for several reagents (#40426)

2025-09-18 12:01:22 -07:00

pyrotechnic.yml

Add contraband levels for several reagents (#40426)

2025-09-18 12:01:22 -07:00

toxins.yml

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00