added senior teamster PDA, cargo beret

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index a97941b38949f39f6c31df25c07ca999aa930288..7ef10cb39ced859571e8ecc3e68e7d516537e2ca 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -41,7 +41,7 @@
   - type: Tag
     tags:
     - ClothMade
-    - Recyclable    
+    - Recyclable
     - WhitelistChameleon
 
 - type: entity
@@ -104,6 +104,23 @@
     - 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
@@ -477,8 +494,8 @@
     - state: icon-nobeard
       map: [ "foldedLayer" ]
       visible: true
-  
-    
+
+
 
 - type: entity
   parent: ClothingHeadBase

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index fbbdfe2b77cabda889647e77d4a9c19097a1aae9..63aa6a66b1350ee46c4465a1e342a7a34995adff 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1418,6 +1418,25 @@
   - type: Icon
     state: pda-seniorofficer
 
+- type: entity
+  parent: BasePDA
+  id: SeniorTeamsterPDA
+  name: senior teamster PDA
+  description: PDA for the guys that order the crucial station supplies.
+  components:
+  - type: Pda
+    id: CargoIDCard
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-seniorteamster
+  - type: PdaBorderColor
+    borderColor: "#e39751"
+    accentVColor: "#DFDFDF"
+  - type: Icon
+    state: pda-seniorteamster
+
 - type: entity
   parent: [ BaseMajorContraband, SyndiPDA ]
   id: PiratePDA

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
new file mode 100644 (file)
index 0000000..c6bee40
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET-hamster.png 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
new file mode 100644 (file)
index 0000000..0835b86
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/equipped-HELMET.png 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
new file mode 100644 (file)
index 0000000..de3e17b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/icon.png 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
new file mode 100644 (file)
index 0000000..5224f71
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-left.png 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
new file mode 100644 (file)
index 0000000..39393b9
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/inhand-right.png 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
new file mode 100644 (file)
index 0000000..88d19a4
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_cargo.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "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
+    }
+  ]
+}

diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
index 8f987ac66ef98af0df23bb4112b213cdab7734b2..9e7ad16c8986b7cfd8c5efcca1fb2661e7f74edc 100644 (file)
--- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
@@ -231,6 +231,9 @@
     },
     {
       "name": "pda-seniorofficer"
+    },
+    {
+      "name": "pda-seniorteamster"
     },
        {
       "name": "pda-wizard",

diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorteamster.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorteamster.png
new file mode 100644 (file)
index 0000000..b1224da
Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorteamster.png differ