]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Familiar Garbs (#22253)
authornoctis <99278536+noctyrnal@users.noreply.github.com>
Sat, 9 Dec 2023 21:03:07 +0000 (21:03 +0000)
committerGitHub <noreply@github.com>
Sat, 9 Dec 2023 21:03:07 +0000 (14:03 -0700)
* update time

* removing maps and adding petah for pr

* removed shitbox

---------

Co-authored-by: camrynz <99278536+camrynz@users.noreply.github.com>
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING-monkey.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/meta.json [new file with mode: 0644]

index ce8170a7b550b020b2e06a909293c283c0b89d20..da5c620c5963d080fc6d8610969d015b69e892cf 100644 (file)
       - state: equipped-INNERCLOTHING-jumpsuit
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitFamilyGuy
+  name: familiar garbs
+  description: Makes you remember the time you did something funny.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..50ad9b7
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..a95c026
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/icon.png
new file mode 100644 (file)
index 0000000..d0d58de
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..e55c47c
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..6a936d7
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/meta.json
new file mode 100644 (file)
index 0000000..a02f7be
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from bartender outfit in SS14, edited by noctyrnal.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}