]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
content (#21505)
authorKingFroozy <140668342+KingFroozy@users.noreply.github.com>
Wed, 8 Nov 2023 01:28:15 +0000 (04:28 +0300)
committerGitHub <noreply@github.com>
Wed, 8 Nov 2023 01:28:15 +0000 (18:28 -0700)
24 files changed:
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json [moved from Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/meta.json with 100% similarity]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING-monkey.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/icon.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json [moved from Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/meta.json with 100% similarity]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING-monkey.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/icon.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-right.png [deleted file]

index ea1c933b4c21aa5aa342263003d4fcc850da10bf..5573deb3149f5f0ca2d3c0bf05eae746d6dc5890 100644 (file)
@@ -49,9 +49,9 @@
   description: A yellow turtleneck designed specifically for work in conditions of the engineering department.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi
+    sprite: Clothing/Uniforms/Jumpskirt/ce_turtle.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi
+    sprite: Clothing/Uniforms/Jumpskirt/ce_turtle.rsi
 
 - type: entity
   parent: ClothingUniformSkirtBase
index e63522d681844aa647b70a60c7988b47b2b2da73..24e15ca8cbd71c99fc7ccac4caee40d010f6285f 100644 (file)
   description: A yellow turtleneck designed specifically for work in conditions of the engineering department.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/ceturtle.rsi
+    sprite: Clothing/Uniforms/Jumpsuit/ce_turtle.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/ceturtle.rsi
+    sprite: Clothing/Uniforms/Jumpsuit/ce_turtle.rsi
 
 - type: entity
   parent: ClothingUniformBase
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..4cb7704
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..93477d0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
new file mode 100644 (file)
index 0000000..06c845e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..bdbd3ea
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..7822bf6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644 (file)
index f142d6e..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644 (file)
index 71587c5..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/icon.png
deleted file mode 100644 (file)
index 0d92af9..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-left.png
deleted file mode 100644 (file)
index 1b40db9..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-right.png
deleted file mode 100644 (file)
index 5ba096c..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..7c9e3cf
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..1715984
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
new file mode 100644 (file)
index 0000000..50def37
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..bdbd3ea
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..7822bf6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644 (file)
index afa10c9..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644 (file)
index d5dc5cd..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/icon.png
deleted file mode 100644 (file)
index 2d5cfef..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-left.png
deleted file mode 100644 (file)
index 1b40db9..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-right.png
deleted file mode 100644 (file)
index 5ba096c..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-right.png and /dev/null differ