]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
[Entity] SWAT gas mask for HoS (#15539)
authorNim <128169402+Nimfar11@users.noreply.github.com>
Thu, 20 Apr 2023 02:50:15 +0000 (05:50 +0300)
committerGitHub <noreply@github.com>
Thu, 20 Apr 2023 02:50:15 +0000 (20:50 -0600)
* SWAT gas mask for HoS

Adds a SWAT gas mask. Replaces the standard Security gas mask in the HoC box with an elite one.

* fix

* commit

* commit2

* commit3

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Resources/Prototypes/Entities/Clothing/Masks/masks.yml
Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/swat.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/swat.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/swat.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/swat.rsi/meta.json [new file with mode: 0644]

index bc0d020ecb3e5db4c212b59d76b87bfecbcd8905..26f08416197bf414c871b08da57515a30e861c32 100644 (file)
       - id: ClothingUniformJumpskirtHoSParadeMale
         prob: 0.1
       - id: ClothingOuterHardsuitSecurityRed
-      - id: ClothingMaskGasSecurity
+      - id: ClothingMaskGasSwat
       - id: ClothingShoeSlippersDuck
         prob: 0.2
       - id: DrinkVacuumFlask
index edf69ae9f547204fff2a7d543d3b4cc9642e1e4e..7967aec736e9a0a979b5fb159a3609fdeece77b0 100644 (file)
   - type: Unremoveable
   - type: AddAccentClothing
     accent: StutteringAccent
+
+- type: entity
+  parent: ClothingMaskGasExplorer
+  id: ClothingMaskGasSwat
+  name: swat gas mask
+  description: A elite issue Security gas mask.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/swat.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/swat.rsi
diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK.png
new file mode 100644 (file)
index 0000000..92f0cfb
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/icon.png b/Resources/Textures/Clothing/Mask/swat.rsi/icon.png
new file mode 100644 (file)
index 0000000..283c984
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/swat.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/swat.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..43a0255
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/swat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/swat.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..fe4301a
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/swat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json
new file mode 100644 (file)
index 0000000..1eebf87
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}