Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

Consumable

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

Materials

increase material prices (#30869)

2024-08-18 21:28:46 -06:00

biological.yml

Ichor Now Clots Blood (#29661)

2024-08-20 12:57:06 +02:00

botany.yml

Fix that space (#32149)

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

chemicals.yml

Hivelord mob (#31322)

2024-09-11 09:52:27 -04:00

cleaning.yml

Nerf & standardised slip times (#27879)

2024-07-17 09:26:02 +10:00

elements.yml

Chem colors (#28367)

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

fun.yml

Fixed Wehxplosion yaml error (#34837)

2025-02-02 22:31:32 +01:00

gases.yml

Chem colors (#28367)

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

medicine.yml

Diphenhydramine causes drowsiness (#36212)

2025-04-02 23:29:52 -07:00

narcotics.yml

Mutetoxin buff (#32915)

2024-10-20 22:43:14 -05:00

pyrotechnic.yml

phlog now ignites when consumed as well (#30955)

2024-08-17 12:49:11 +10:00

toxins.yml

Lizards now metabolize chocolate (#32147)

2024-09-16 14:45:15 +02:00