removed cargo beret entirely

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 5c4b5ad5d0bb9da3e0b90c552382b863b17e4a49..b984d5897474b0c0469e3788770ba28a41a5b981 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -104,23 +104,6 @@
     - HamsterWearable
     - WhitelistChameleon
 
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatBeretCargo
-  name: cargo beret
-  description: A beret in cargo colors. Fancy!
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/beret_cargo.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hats/beret_cargo.rsi
-  - type: Tag
-    tags:
-    - ClothMade
-    - Recyclable
-    - HamsterWearable
-    - WhitelistChameleon
-
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretEngineering
@@ -1393,4 +1376,4 @@
     - HamsterWearable
     - ClothMade
     - Recyclable
-    - WhitelistChameleon
\ No newline at end of file
+    - WhitelistChameleon

diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
index f1c2936588714de3e113f623b7da010ba2cfe46d..d23027130fcdca44fd5026d9359fc542ce232209 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -24,14 +24,6 @@
   equipment:
     head: ClothingHeadHatCargosoft
 
-- type: loadout
-  id: SeniorCourierBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorCargo
-  equipment:
-    head: ClothingHeadHatBeretCargo
-
 # Jumpsuit
 - type: loadout
   id: CargoTechnicianJumpsuit

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index cd8aba66c1636907bb696f0b8a08a820d48466d4..fc6b5b4f5e2877624a4318b582a85d1ba5e3b4d3 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -642,7 +642,6 @@
   minLimit: 0
   loadouts:
   - CargoTechnicianHead
-  - SeniorCourierBeret
 
 - type: loadoutGroup
   id: CargoTechnicianJumpsuit

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
index 1080fc1d0a3c2fb5909bc25fe33487fac37d4280..808f1c680abf8c28cc30aa6950e725aa61e22bdd 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
@@ -10,7 +10,6 @@
 - type: latheRecipePack
   id: ClothingCargo
   recipes:
-  - ClothingHeadHatBeretCargo
   - ClothingUniformJumpsuitCargo
   - ClothingUniformJumpskirtCargo
   - ClothingUniformJumpsuitSalvageSpecialist

diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index 16b7317dd1a37e1d0f1bc26c0dfd8c08c1fbcc8e..a39ac99607624dea20e06c55b3e4140672f91fa3 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -814,7 +814,7 @@
   parent: BaseCommandHatRecipe
   id: ClothingHeadHatBeretHop
   result: ClothingHeadHatBeretHop
-  
+
 - type: latheRecipe
   parent: BaseCommandHatRecipe
   id: ClothingHeadHatQMsoft
@@ -862,11 +862,6 @@
   id: ClothingHeadHatBeretBrigmedic
   result: ClothingHeadHatBeretBrigmedic
 
-- type: latheRecipe
-  parent: BaseHatRecipe
-  id: ClothingHeadHatBeretCargo
-  result: ClothingHeadHatBeretCargo
-
 - type: latheRecipe
   parent: BaseHatRecipe
   id: ClothingHeadHatBeretSecurity

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png
deleted file mode 100644 (file)
index c6bee40..0000000
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png
deleted file mode 100644 (file)
index 0835b86..0000000
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png
deleted file mode 100644 (file)
index de3e17b..0000000
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png
deleted file mode 100644 (file)
index 5224f71..0000000
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png
deleted file mode 100644 (file)
index 39393b9..0000000
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json
deleted file mode 100644 (file)
index 88d19a4..0000000
--- a/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed by Hitlinemoss",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-hamster",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}