Merge remote-tracking branch 'origin/master'

Vault-Overseers · Oct 9, 2024 · 6d1712b · 6d1712b
2 parents 4f60ecd + 20e0f3b
commit 6d1712b
Show file tree

Hide file tree

Showing 9 changed files with 590,718 additions and 346,606 deletions.
diff --git a/Content.Server/Mood/MoodSystem.cs b/Content.Server/Mood/MoodSystem.cs
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
diff --git a/Resources/Locale/en-US/_Nuclear14/department.ftl b/Resources/Locale/en-US/_Nuclear14/department.ftl
diff --git a/Resources/Maps/N14/SunnyvaleSurface.yml b/Resources/Maps/N14/SunnyvaleSurface.yml
diff --git a/Resources/Maps/N14/SunnyvaleUnderground.yml b/Resources/Maps/N14/SunnyvaleUnderground.yml
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/fitness.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/fitness.yml
diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/factions.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/factions.yml