diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index d7422fa54c..bd5852b621 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -1,6 +1,11 @@ - type: vendingMachineInventory id: AutoDrobeInventory startingInventory: + ClothingHeadHatJester: 1 + ClothingUniformJumpsuitJester: 1 + ClothingHeadHatJesterAlt: 1 + ClothingUniformJumpsuitJesterAlt: 1 + ClothingShoesJester: 1 ClothingOuterWinterClown: 1 ClothingOuterWinterMime: 1 ClothingOuterWinterMusician: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index dbf43cd519..456eba073f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -489,3 +489,23 @@ sprite: Clothing/Head/Hats/safarihat.rsi - type: Clothing sprite: Clothing/Head/Hats/safarihat.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatJester + name: jester hat + description: A hat with bells, to add some merriness to the suit. + components: + - type: Sprite + sprite: Clothing/Head/Hats/jester.rsi + - type: Clothing + sprite: Clothing/Head/Hats/jester.rsi + +- type: entity + parent: ClothingHeadHatJester + id: ClothingHeadHatJesterAlt + components: + - type: Sprite + sprite: Clothing/Head/Hats/jester2.rsi + - type: Clothing + sprite: Clothing/Head/Hats/jester2.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index de62b235c4..c71a0ebce8 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -130,3 +130,14 @@ description: Stylish black shoes. components: - type: NoSlip + +- type: entity + parent: ClothingShoesClown + id: ClothingShoesJester + name: jester shoes + description: A court jester's shoes, updated with modern squeaking technology. + components: + - type: Sprite + sprite: Clothing/Shoes/Specific/jester.rsi + - type: Clothing + sprite: Clothing/Shoes/Specific/jester.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 3ace39c6d2..30c8bf89db 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -151,6 +151,26 @@ sprite: Clothing/Uniforms/Jumpsuit/clown.rsi femaleMask: UniformTop +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitJester + name: jester suit + description: A jolly dress, well suited to entertain your master, nuncle. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/jester.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/jester.rsi + +- type: entity + parent: ClothingUniformJumpsuitJester + id: ClothingUniformJumpsuitJesterAlt + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/jester2.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/jester2.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCMO diff --git a/Resources/Textures/Clothing/Head/Hats/jester.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/jester.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..a34fea026c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/jester.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/jester.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/jester.rsi/icon.png new file mode 100644 index 0000000000..a2dfcb65e1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/jester.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/jester.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/jester.rsi/inhand-left.png new file mode 100644 index 0000000000..5162ee18a6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/jester.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/jester.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/jester.rsi/inhand-right.png new file mode 100644 index 0000000000..5f4f53eefd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/jester.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/jester.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/jester.rsi/meta.json new file mode 100644 index 0000000000..951f247c92 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/jester.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, inhand by github:Morb0", + "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/Head/Hats/jester2.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..4fcb8edea5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/jester2.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/icon.png new file mode 100644 index 0000000000..af8326d4f1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/jester2.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/inhand-left.png new file mode 100644 index 0000000000..807cffbcb2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/jester2.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/inhand-right.png new file mode 100644 index 0000000000..5d0543f1c9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/jester2.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/meta.json new file mode 100644 index 0000000000..951f247c92 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/jester2.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, inhand by github:Morb0", + "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/Shoes/Specific/jester.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/equipped-FEET.png new file mode 100644 index 0000000000..6a1cedcc12 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/icon.png new file mode 100644 index 0000000000..2da879fce5 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/inhand-left.png new file mode 100644 index 0000000000..6e4d419619 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/inhand-right.png new file mode 100644 index 0000000000..6c1de4c256 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json new file mode 100644 index 0000000000..30fd407e21 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "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/jester.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..65d81a80b3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/icon.png new file mode 100644 index 0000000000..5cf2208d81 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/inhand-left.png new file mode 100644 index 0000000000..48cbc3898b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/inhand-right.png new file mode 100644 index 0000000000..965b9229cb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json new file mode 100644 index 0000000000..03c2ba394f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..e77a295d08 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/icon.png new file mode 100644 index 0000000000..6987782a00 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/inhand-left.png new file mode 100644 index 0000000000..48cbc3898b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/inhand-right.png new file mode 100644 index 0000000000..965b9229cb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/meta.json new file mode 100644 index 0000000000..03c2ba394f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}