From: nmajask Date: Wed, 11 Oct 2023 05:05:18 +0000 (-0400) Subject: Add casual jumpsuit/skirts (#20422) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d4667477a5ada5d1c96c2ed25064695c909d9b27;p=space-station-14.git Add casual jumpsuit/skirts (#20422) --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 373c8663ab..3c2fff3e75 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -38,6 +38,12 @@ ClothingUniformJumpsuitHawaiRed: 2 ClothingUniformJumpsuitHawaiYellow: 2 ClothingUniformJumpsuitFlannel: 2 + ClothingUniformJumpsuitCasualBlue: 2 + ClothingUniformJumpskirtCasualBlue: 2 + ClothingUniformJumpsuitCasualPurple: 2 + ClothingUniformJumpskirtCasualPurple: 2 + ClothingUniformJumpsuitCasualRed: 2 + ClothingUniformJumpskirtCasualRed: 2 ClothingShoesColorBlack: 8 ClothingShoesColorBrown: 4 ClothingShoesColorWhite: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index d0eeb5b64b..ea1c933b4c 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -835,3 +835,93 @@ - type: Construction graph: WebObjects node: jumpskirt + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtCasualBlue + name: casual blue jumpskirt + description: A loose worn blue shirt with a grey skirt, perfect for someone looking to relax. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + layers: + - state: icon-jumpskirt + - state: icon-shirt + color: "#134fc1" + - type: Item + inhandVisuals: + left: + - state: inhand-left-jumpskirt + - state: inhand-left-shirt + color: "#134fc1" + right: + - state: inhand-right-jumpskirt + - state: inhand-right-shirt + color: "#134fc1" + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING-jumpskirt + - state: equipped-INNERCLOTHING-shirt + color: "#134fc1" + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtCasualPurple + name: casual purple jumpskirt + description: A loose worn purple shirt with a grey skirt, perfect for someone looking to relax. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + layers: + - state: icon-jumpskirt + - state: icon-shirt + color: "#9c0dff" + - type: Item + inhandVisuals: + left: + - state: inhand-left-jumpskirt + - state: inhand-left-shirt + color: "#9c0dff" + right: + - state: inhand-right-jumpskirt + - state: inhand-right-shirt + color: "#9c0dff" + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING-jumpskirt + - state: equipped-INNERCLOTHING-shirt + color: "#9c0dff" + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtCasualRed + name: casual red jumpskirt + description: A loose worn red shirt with a grey skirt, perfect for someone looking to relax. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + layers: + - state: icon-jumpskirt + - state: icon-shirt + color: "#b30000" + - type: Item + inhandVisuals: + left: + - state: inhand-left-jumpskirt + - state: inhand-left-shirt + color: "#b30000" + right: + - state: inhand-right-jumpskirt + - state: inhand-right-shirt + color: "#b30000" + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING-jumpskirt + - state: equipped-INNERCLOTHING-shirt + color: "#b30000" diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 5e857141b8..8f4dbddaa9 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1338,3 +1338,93 @@ sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCasualBlue + name: casual blue jumpsuit + description: A loose worn blue shirt with a grey pants, perfect for someone looking to relax. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + layers: + - state: icon-jumpsuit + - state: icon-shirt + color: "#134fc1" + - type: Item + inhandVisuals: + left: + - state: inhand-left-jumpsuit + - state: inhand-left-shirt + color: "#134fc1" + right: + - state: inhand-right-jumpsuit + - state: inhand-right-shirt + color: "#134fc1" + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING-jumpsuit + - state: equipped-INNERCLOTHING-shirt + color: "#134fc1" + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCasualPurple + name: casual purple jumpsuit + description: A loose worn purple shirt with a grey pants, perfect for someone looking to relax. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + layers: + - state: icon-jumpsuit + - state: icon-shirt + color: "#9c0dff" + - type: Item + inhandVisuals: + left: + - state: inhand-left-jumpsuit + - state: inhand-left-shirt + color: "#9c0dff" + right: + - state: inhand-right-jumpsuit + - state: inhand-right-shirt + color: "#9c0dff" + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING-jumpsuit + - state: equipped-INNERCLOTHING-shirt + color: "#9c0dff" + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCasualRed + name: casual red jumpsuit + description: A loose worn red shirt with a grey pants, perfect for someone looking to relax. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + layers: + - state: icon-jumpsuit + - state: icon-shirt + color: "#b30000" + - type: Item + inhandVisuals: + left: + - state: inhand-left-jumpsuit + - state: inhand-left-shirt + color: "#b30000" + right: + - state: inhand-right-jumpsuit + - state: inhand-right-shirt + color: "#b30000" + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING-jumpsuit + - state: equipped-INNERCLOTHING-shirt + color: "#b30000" diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpskirt-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpskirt-monkey.png new file mode 100644 index 0000000000..e6db1f9f0a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpskirt-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpskirt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpskirt.png new file mode 100644 index 0000000000..39d5c95a89 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpskirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpsuit-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpsuit-monkey.png new file mode 100644 index 0000000000..ead0597ee4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpsuit-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpsuit.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpsuit.png new file mode 100644 index 0000000000..b570cd0638 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-jumpsuit.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-shirt-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-shirt-monkey.png new file mode 100644 index 0000000000..6e16ad2d4a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-shirt-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-shirt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-shirt.png new file mode 100644 index 0000000000..e89f172b4a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/equipped-INNERCLOTHING-shirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-jumpskirt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-jumpskirt.png new file mode 100644 index 0000000000..ced9f44050 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-jumpskirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-jumpsuit.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-jumpsuit.png new file mode 100644 index 0000000000..ea1c19df72 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-jumpsuit.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-shirt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-shirt.png new file mode 100644 index 0000000000..4f6448c92e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/icon-shirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-jumpskirt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-jumpskirt.png new file mode 100644 index 0000000000..0b82e8108e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-jumpskirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-jumpsuit.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-jumpsuit.png new file mode 100644 index 0000000000..346f153e13 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-jumpsuit.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-shirt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-shirt.png new file mode 100644 index 0000000000..fd167d63e4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-left-shirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-jumpskirt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-jumpskirt.png new file mode 100644 index 0000000000..e9a1b16700 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-jumpskirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-jumpsuit.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-jumpsuit.png new file mode 100644 index 0000000000..fcc42b7cd0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-jumpsuit.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-shirt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-shirt.png new file mode 100644 index 0000000000..9304ca453a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/inhand-right-shirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/meta.json new file mode 100644 index 0000000000..91a74ea172 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/casual.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by nmajask (github) for ss14, based on sprites by Tokiko (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-jumpsuit" + }, + { + "name": "icon-jumpskirt" + }, + { + "name": "icon-shirt" + }, + { + "name": "equipped-INNERCLOTHING-jumpsuit", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-jumpskirt", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-shirt", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-jumpsuit-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-jumpskirt-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-shirt-monkey", + "directions": 4 + }, + { + "name": "inhand-left-jumpsuit", + "directions": 4 + }, + { + "name": "inhand-left-jumpskirt", + "directions": 4 + }, + { + "name": "inhand-left-shirt", + "directions": 4 + }, + { + "name": "inhand-right-jumpsuit", + "directions": 4 + }, + { + "name": "inhand-right-jumpskirt", + "directions": 4 + }, + { + "name": "inhand-right-shirt", + "directions": 4 + } + ] +}