From: lzk228 <124214523+lzk228@users.noreply.github.com>
Date: Wed, 3 May 2023 21:47:49 +0000 (+0300)
Subject: [Clothing] Hawaiian shirts (#16043)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2921204bd9d019d15a6e80d66f4a806b7195a925;p=space-station-14.git

[Clothing] Hawaiian shirts (#16043)

* textures&meta

* plush-rouny-fix

* shirts-yml

* add shirts to clothesmate

* fix

* fixes

* bib
---

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index fa89e873df..cc92114d11 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -22,7 +22,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 4200
+  cost: 4350
   category: Service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index dc4fb55280..0111f976fc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -32,6 +32,10 @@
     ClothingUniformJumpskirtColorDarkBlue: 2
     ClothingUniformJumpsuitColorTeal: 2
     ClothingUniformJumpskirtColorTeal: 2
+    ClothingUniformJumpsuitHawaiBlack: 2
+    ClothingUniformJumpsuitHawaiBlue: 2
+    ClothingUniformJumpsuitHawaiRed: 2
+    ClothingUniformJumpsuitHawaiYellow: 2
     ClothingShoesColorBlack: 8
     ClothingShoesColorBrown: 4
     ClothingShoesColorWhite: 3
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 29eb35173f..443e3a6720 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -275,7 +275,7 @@
     modifiers:
       coefficients:
         Slash: 0.9
-        Piercing: 0.9  
+        Piercing: 0.9
 
 - type: entity
   parent: ClothingUniformBase
@@ -291,7 +291,7 @@
     modifiers:
       coefficients:
         Slash: 0.9
-        Piercing: 0.9  
+        Piercing: 0.9
 
 - type: entity
   parent: ClothingUniformBase
@@ -1041,7 +1041,7 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/cluwne.rsi
   - type: Unremoveable
-  
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitDameDane
@@ -1076,3 +1076,47 @@
     sprite: Clothing/Uniforms/Jumpsuit/cossack.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/cossack.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHawaiBlack
+  name: black hawaiian shirt
+  description: Black as a starry night.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hawaiblack.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hawaiblack.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHawaiBlue
+  name: blue hawaiian shirt
+  description: Blue as a huge ocean.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hawaiblue.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hawaiblue.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHawaiRed
+  name: red hawaiian shirt
+  description: Red as a juicy watermelons.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hawaired.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hawaired.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHawaiYellow
+  name: yellow hawaiian shirt
+  description: Yellow as a bright sun.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..a35da374d4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png
new file mode 100644
index 0000000000..4471de10bc
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png
new file mode 100644
index 0000000000..8f213061c2
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png
new file mode 100644
index 0000000000..f7ccaf7d97
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/meta.json
new file mode 100644
index 0000000000..59d6c2d7d0
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by ;3#1161",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..0de6ae1401
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png
new file mode 100644
index 0000000000..9b7cc65ebe
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png
new file mode 100644
index 0000000000..46c5d6229b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png
new file mode 100644
index 0000000000..8db1985cb8
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/meta.json
new file mode 100644
index 0000000000..59d6c2d7d0
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by ;3#1161",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..0f906e2c71
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png
new file mode 100644
index 0000000000..79f247bf01
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png
new file mode 100644
index 0000000000..75be7de7be
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png
new file mode 100644
index 0000000000..bb96e022b1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/meta.json
new file mode 100644
index 0000000000..59d6c2d7d0
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by ;3#1161",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..1b49813ca2
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png
new file mode 100644
index 0000000000..4bb5883cf1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png
new file mode 100644
index 0000000000..2499e79677
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png
new file mode 100644
index 0000000000..f31cab9aeb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/meta.json
new file mode 100644
index 0000000000..59d6c2d7d0
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by ;3#1161",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index a614b21126..48a4eb52ac 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -11,7 +11,8 @@
             "name": "plushie_ratvar"
         },
         {
-            "name": "plushie_rouny"
+            "name": "plushie_rouny",
+            "directions": 4
         },
         {
             "name": "plushie_spacelizard"