diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 366aaf574c..c0c50d9e63 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -38,6 +38,8 @@ ClothingOuterClownPriest: 1 ClothingMaskSadMime: 1 ClothingMaskScaredMime: 1 + ClothingUniformJumpsuitKimono: 1 + ClothingHeadHatCasa: 1 emaggedInventory: ClothingShoesBling: 1 ClothingOuterDogi: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 03841d71a2..7813870d48 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -24,6 +24,17 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCasa + name: casa + description: Cone-shaped hat + components: + - type: Sprite + sprite: Clothing/Head/Hats/casa.rsi + - type: Clothing + sprite: Clothing/Head/Hats/casa.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretRND diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 4c2980f916..fc9981466f 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -356,6 +356,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitKimono + name: kimono + description: traditional chinese clothing + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitMedicalDoctor diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/casa.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..93a02d5404 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/casa.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/casa.rsi/icon.png new file mode 100644 index 0000000000..6e2a1b2496 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/casa.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-left.png new file mode 100644 index 0000000000..2820aefb7d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-right.png new file mode 100644 index 0000000000..7f6dd0c704 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/casa.rsi/meta.json new file mode 100644 index 0000000000..09c159af0c --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/casa.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite by joestarguy, code by kxvvv", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..a7e4614b05 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/icon.png new file mode 100644 index 0000000000..4abd764f8b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-left.png new file mode 100644 index 0000000000..0e31169205 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-right.png new file mode 100644 index 0000000000..b6263cdbc1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json new file mode 100644 index 0000000000..541eeb740f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite by joestarguy, code by kxvvv", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}