Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo

Merged master into branch
2025-06-28 15:25:23 -04:00
parent 9ffa1a7f7b 97f0bab5b8
commit cb9e2d9323
1210 changed files with 19683 additions and 10901 deletions
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -35,6 +35,11 @@
  equipment:
    head: ClothingHeadHatHopcap

+- type: loadout
+  id: HoPBeret
+  equipment:
+    head: ClothingHeadHatBeretHop
+
 # Neck
 - type: loadout
  id: HoPCloak
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -26,7 +26,7 @@
  id: Headphones
  storage:
    back:
-    - ClothingNeckHeadphones
+    - ClothingMultipleHeadphones

 # Toys
 - type: loadout
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -153,6 +153,7 @@
  minLimit: 0
  loadouts:
  - HoPHead
+  - HoPBeret

 - type: loadoutGroup
  id: HoPJumpsuit