diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index bd5852b621..61de068af8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -32,5 +32,8 @@ ClothingHeadPaperSackSmile: 2 ClothingEyesBlindfold: 1 ClothingHeadRastaHat: 2 + ClothingUniformJumpsuitDameDane: 2 + ClothingShoesDameDane: 2 + ClothingOuterDameDane: 2 emaggedInventory: ClothingShoesBling: 1 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index cec03087dc..f445e28860 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -153,3 +153,14 @@ Slash: 0.8 Piercing: 0.4 Heat: 0.8 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterDameDane + name: dame dane coat + description: Friday... + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/damedanecoat.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/damedanecoat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index 8ba85049b8..938cd70e83 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -58,3 +58,14 @@ sprite: Clothing/Shoes/Misc/tourist.rsi - type: Clothing sprite: Clothing/Shoes/Misc/tourist.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesDameDane + name: dame dane shoes + description: At last... + components: + - type: Sprite + sprite: Clothing/Shoes/Misc/damedaneshoes.rsi + - type: Clothing + sprite: Clothing/Shoes/Misc/damedaneshoes.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 24b49bdb1a..9e47078ace 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -914,7 +914,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ert_janitor.rsi - type: DiseaseProtection protection: 0.1 - + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitERTLeader @@ -960,4 +960,15 @@ coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.8 \ No newline at end of file + Piercing: 0.8 + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitDameDane + name: dame dane outfit + description: Baka mitai... + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..f2f6a36418 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/icon.png new file mode 100644 index 0000000000..516c155a19 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/inhand-left.png new file mode 100644 index 0000000000..4902033e09 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/inhand-right.png new file mode 100644 index 0000000000..6675c89a72 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/meta.json new file mode 100644 index 0000000000..b82a1bb226 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/damedanecoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Alekshhh (Github) for SS14, inspired by Kazuma Kiryu outfit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET.png new file mode 100644 index 0000000000..f6578edc12 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/icon.png new file mode 100644 index 0000000000..3897f856ac Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/inhand-left.png new file mode 100644 index 0000000000..df31dab036 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/inhand-right.png new file mode 100644 index 0000000000..459d642d9d Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/meta.json new file mode 100644 index 0000000000..b5ea733f55 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Alekshhh (Github) for SS14, inspired by Kazuma Kiryu outfit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..514e170128 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/icon.png new file mode 100644 index 0000000000..047ac28e21 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/inhand-left.png new file mode 100644 index 0000000000..6898119893 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/inhand-right.png new file mode 100644 index 0000000000..f9faf3f1e4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json new file mode 100644 index 0000000000..24127f0b57 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Alekshhh (Github) for SS14, inspired by Kazuma Kiryu outfit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}