From: ssdaniel24 <107036969+ssdaniel24@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:39:12 +0000 (+0300)
Subject: Added janitoral uniform with miniskirt (#14050)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8cff034f524395b7ddd84795eaa476f48d86183b;p=space-station-14.git

Added janitoral uniform with miniskirt (#14050)
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
index db4085773a..38056a2282 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -11,3 +11,4 @@
 
   emaggedInventory:
     ClothingUniformJumpskirtJanimaid: 2
+    ClothingUniformJumpskirtJanimaidmini: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 601734f56e..511cd8cff4 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -553,6 +553,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtJanimaidmini
+  name: janitorial maid uniform with miniskirt
+  description: Elite service, not some candy wrappers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/janimaidmini.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/janimaidmini.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpskirtLawyerRed
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..b5a1259387
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png
new file mode 100644
index 0000000000..9add6c81b8
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png
new file mode 100644
index 0000000000..05a43b4307
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png
new file mode 100644
index 0000000000..6bd8bbd220
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json
new file mode 100644
index 0000000000..571eff1081
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "By discord:Van#1931 based on janimaid.rsi taken from tg at commit https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}