Syndicate Shoulder Holster and the Outlaw's Hat (#9147)

* Syndie Holster sprite

* Outlaw Hat sprite

* Outlaw Hat entity

* Syndie Shoulder Holster entity

* Tweaked sussy toolbox

* Tweaked Syndie Holster

* Outlaw Hat and Syndie Holster to the Uplink

* it was a misinput, calm down

* Tweaked holster so it can only hold weapons

* and ammo too

* fixing conflicts... from my OWN PR....

* Fixed another conlfict

* fix

Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml

@@ -76,7 +76,7 @@
       - id: Multitool
       - id: Wirecutter
       - id: ClothingHandsGlovesCombat
-      - id: ClothingBeltMilitaryWebbing
+      - id: ClothingBeltSyndieHolster
       - id: ClothingMaskGasSyndicate
 
 - type: entity

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -158,6 +158,15 @@
   icon: /Textures/Objects/Misc/guardian_info.rsi/icon.png
   price: 14
 
+- type: uplinkListing
+  id: UplinkHolster
+  category: Utility
+  itemId: ClothingBeltSyndieHolster
+  listingName: Syndicate Shoulder Holster
+  description: A deep shoulder holster capable of holding many types of ballistics.
+  icon: /Textures/Clothing/Belt/syndieholster.rsi/icon.png
+  price: 2
+
 - type: uplinkListing
   id: UplinkEmag
   category: Utility
@@ -406,6 +415,12 @@
   itemId: ClothingBackpackDuffelSyndicatePyjamaBundle
   price: 4
 
+- type: uplinkListing
+  id: UplinkOutlawHat
+  category: Misc
+  itemId: ClothingHeadHatOutlawHat
+  price: 1
+
 - type: uplinkListing
   id: UplinkCatEars
   category: Misc

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -437,6 +437,25 @@
   - type: Storage
     capacity: 20
 
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltSyndieHolster
+  name: syndicate shoulder holster
+  description: A deep shoulder holster capable of holding many types of ballistics.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/syndieholster.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/syndieholster.rsi
+  - type: Storage
+    capacity: 60
+    whitelist:
+      components:
+        - Gun
+        - MeeleeWeapon
+        - BallisticAmmoProvider
+        - CartridgeAmmo
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltSecurityWebbing

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -169,6 +169,17 @@
   - type: Clothing
     sprite: Clothing/Head/Hats/hoshat.rsi
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatOutlawHat
+  name: outlaw's hat
+  description: A hat that makes you look like you carry a notched pistol, numbered one and nineteen more.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/outlawhat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/outlawhat.rsi
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatWitch1

Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94daddb1ac6625e2a7f7a88d62235ee44a480b5e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}