]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Added janitoral uniform with miniskirt (#14050)
authorssdaniel24 <107036969+ssdaniel24@users.noreply.github.com>
Thu, 23 Mar 2023 03:39:12 +0000 (06:39 +0300)
committerGitHub <noreply@github.com>
Thu, 23 Mar 2023 03:39:12 +0000 (23:39 -0400)
Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaidmini.rsi/meta.json [new file with mode: 0644]

index db4085773a3fb3d1e329ae510d6c855cd304d37c..38056a22820069ee2724f60d6355669c44951319 100644 (file)
@@ -11,3 +11,4 @@
 
   emaggedInventory:
     ClothingUniformJumpskirtJanimaid: 2
+    ClothingUniformJumpskirtJanimaidmini: 1
index 601734f56e65ec4cb8d7feed7aab0e2b97bee864..511cd8cff4c49e1d351772c70cc92af368facd90 100644 (file)
   - 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 (file)
index 0000000..b5a1259
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 (file)
index 0000000..9add6c8
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 (file)
index 0000000..05a43b4
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 (file)
index 0000000..6bd8bbd
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 (file)
index 0000000..571eff1
--- /dev/null
@@ -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
+    }
+  ]
+}