diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 03bafda5c1..795a97ccf6 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -181,6 +181,20 @@ - state: box - state: writing + +- type: entity + name: hatsune miku day box + parent: BoxCardboard + id: BoxPerformer + description: Happy Hatsune Miku Day! + components: + - type: StorageFill + contents: + - id: ClothingShoesBootsPerformer + - id: ClothingUniformJumpskirtPerformer + - id: FoodMealMemoryleek + amount: 2 + - type: entity name: flare box parent: BoxCardboard diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 8c6c1a6cc4..925ebe4ce7 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -31,3 +31,13 @@ - type: Clothing sprite: Clothing/Shoes/Boots/explorer.rsi +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBootsPerformer + name: performer's boots + description: These boots provide great traction for when you're up on stage. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/performer.rsi + - type: Clothing + sprite: Clothing/Shoes/Boots/performer.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index de5dc36778..82c32cf1f4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -469,3 +469,14 @@ sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtPerformer + name: performer's jumpskirt + description: Hi, I'm Scott, president of Donk Pizza. Have you heard of [FAMOUS VIRTUAL PERFORMER]? + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/performer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/performer.rsi diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index ed1ef889c3..016c2d8a40 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -7,8 +7,12 @@ icon: "Musician" supervisors: "whoever hires you" access: - - Maintenance + - Maintenance # TODO Remove maint access for all gimmick jobs once access work is completed - Theatre + special: + - !type:GiveItemOnHolidaySpecial + holiday: MikuDay + prototype: BoxPerformer - type: startingGear id: MusicianGear diff --git a/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/equipped-FEET.png new file mode 100644 index 0000000000..81bf8df7ab Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/icon.png new file mode 100644 index 0000000000..7619c7fd2e Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json new file mode 100644 index 0000000000..9f2d1bef54 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. This sprite features an adaptation of Hatsune Miku, © Crypton Future Media, Inc. 2007, licensed under a CC BY-NC: https://creativecommons.org/licenses/by-nc/3.0/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..6309b6b512 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/icon.png new file mode 100644 index 0000000000..55b1b73ecf Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/meta.json new file mode 100644 index 0000000000..18186a3706 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/performer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. This sprite features an adaptation of Hatsune Miku, © Crypton Future Media, Inc. 2007, licensed under a CC BY-NC: https://creativecommons.org/licenses/by-nc/3.0/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +}