Ed cc02a133e0 Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2 ...

# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs

2024-09-17 11:54:36 +03:00

..

categories.yml

ignore traits

2024-07-28 21:04:45 +03:00

disabilities.yml

ignore traits

2024-07-28 21:04:45 +03:00

quirks.yml

Move some disabilities traits into a new category (#30102)

2024-07-24 06:50:19 -04:00

speech.yml

French and Spanish traits (#30966)

2024-09-15 22:03:15 +02:00