diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index e523b6e430..85fac386af 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -15,3 +15,5 @@ ClothingBeltJanitor: 2 ClothingHeadsetService: 2 ClothingOuterWinterJani: 2 + emaggedInventory: + ClothingUniformJumpskirtJanimaid: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 3be0c226fc..4cb7dd5f44 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -26,3 +26,5 @@ Gohei: 2 ClothingHeadPaperSack: 2 ClothingHeadPaperSackSmile: 2 + emaggedInventory: + ClothingShoesBling: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index dd1bd0b44b..147bd3dc02 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -23,6 +23,26 @@ footstepSoundCollection: collection: footstep_clown +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBling + name: bling clown shoes + description: Made of refined bananium and shined with the pulp of a fresh banana peel. These make a flashy statement. + components: + - type: Sprite + sprite: Clothing/Shoes/Specific/bling.rsi + - type: Clothing + sprite: Clothing/Shoes/Specific/bling.rsi + - type: FootstepModifier + footstepSoundCollection: + collection: footstep_clown + - type: PointLight + netsync: false + enabled: true + radius: 3 + energy: 2 + color: "#FFD800" + - type: entity parent: ClothingShoesBase id: ClothingShoesCult diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 0dd42c7342..11a3843ab6 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -541,3 +541,15 @@ sprite: Clothing/Uniforms/Jumpskirt/atmosf.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/atmosf.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtJanimaid + name: janitorial maid uniform + description: For professionals, not the posers. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi + diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET.png new file mode 100644 index 0000000000..c715df8fa0 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/icon.png new file mode 100644 index 0000000000..05a48d15a6 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-left.png new file mode 100644 index 0000000000..96c6b8fcad Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-right.png new file mode 100644 index 0000000000..a4587cd38e Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json new file mode 100644 index 0000000000..56e6395348 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json @@ -0,0 +1,27 @@ + +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..fa7398710a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png new file mode 100644 index 0000000000..4c978dd8a1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png new file mode 100644 index 0000000000..a35a5e9d2b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png new file mode 100644 index 0000000000..1c3b595e90 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json new file mode 100644 index 0000000000..4322840a3f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from tg at commit https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}