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

2025-07-07 18:09:10 -04:00
parent ab7a64e3b3 6eec2c5c51
commit 83f15bfada
617 changed files with 10860 additions and 4884 deletions
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -35,11 +35,6 @@
  equipment:
    head: ClothingHeadHatHopcap

- type: loadout
-  id: HoPBeret
-  equipment:
-    head: ClothingHeadHatBeretHop
-
 # Neck
 - type: loadout
  id: HoPCloak
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -153,7 +153,6 @@
  minLimit: 0
  loadouts:
  - HoPHead
-  - HoPBeret

 - type: loadoutGroup
  id: HoPJumpsuit