diff --git a/Resources/Prototypes/Catalog/VendingMachines/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/theater.yml index c674aa9bf6..e26bf8e5bf 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/theater.yml @@ -11,4 +11,7 @@ ClothingOuterSanta: 2 ClothingOuterXenos: 2 ClothingOuterSkub: 2 - ClothingHeadHatXeno: 2 \ No newline at end of file + ClothingHeadHatXeno: 2 + ClothingHeadHatShrineMaidenWig: 2 + ClothingOuterSuitShrineMaiden: 2 + Gohei: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index e43ae9ffc5..28c920844c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -107,3 +107,14 @@ sprite: Clothing/Head/Misc/xenos.rsi - type: Clothing sprite: Clothing/Head/Misc/xenos.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatShrineMaidenWig + name: shrine maiden's wig + description: The tag reads "All proceeds go to the Hakurei Shrine." + components: + - type: Sprite + sprite: Clothing/Head/Misc/shrine-maidens-wig.rsi + - type: Clothing + sprite: Clothing/Head/Misc/shrine-maidens-wig.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 2e1309970b..041d9b67bb 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -79,6 +79,17 @@ - type: Clothing sprite: Clothing/OuterClothing/Suits/chicken.rsi +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSuitShrineMaiden + name: shrine maiden outfit + description: Makes you want to go deal with some troublesome youkai. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Suits/shrine-maiden.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Suits/shrine-maiden.rsi + - type: entity parent: ClothingOuterBase id: ClothingOuterSuitMonkey diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml new file mode 100644 index 0000000000..18f173c5cc --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml @@ -0,0 +1,15 @@ +- type: entity + name: gohei + parent: BaseItem + id: Gohei + description: A wooden stick with white streamers at the end. Originally used by shrine maidens to purify things. Now used by the station's weeaboos. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/gohei.rsi + state: gohei + - type: MeleeWeapon + damage: 3 ##You'd be better off punching people + - type: Item + size: 12 + sprite: Objects/Weapons/Melee/gohei.rsi + prefix: inhand diff --git a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..9bb14dd227 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/icon.png new file mode 100644 index 0000000000..37012652f4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/inhand-left.png new file mode 100644 index 0000000000..ea873414b6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/inhand-right.png new file mode 100644 index 0000000000..dc849846b4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/meta.json new file mode 100644 index 0000000000..6232756c5e --- /dev/null +++ b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.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/3d1a0a5b367a080c42fba0e85ce0382b2cbcb284 . Inhands were made for SS14 and available under the same license.", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..bb9c7abdbd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/icon.png new file mode 100644 index 0000000000..d8b2df3a5d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/inhand-left.png new file mode 100644 index 0000000000..3cb0f40c11 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/inhand-right.png new file mode 100644 index 0000000000..97f028126b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi/meta.json new file mode 100644 index 0000000000..af215f51ed --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.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/3d1a0a5b367a080c42fba0e85ce0382b2cbcb284 . Inhands were made for SS14 and available under the same license.", + "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/Objects/Weapons/Melee/gohei.rsi/gohei.png b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/gohei.png new file mode 100644 index 0000000000..2d7953a6f4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/gohei.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-left.png new file mode 100644 index 0000000000..e0a337bdf3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-right.png new file mode 100644 index 0000000000..2e33d7d08e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json new file mode 100644 index 0000000000..8c87c6bc1c --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/799647e170c9b7dbdbb28bdf46234e012b6bd6c8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4, + }, + { + "name": "inhand-right", + "directions": 4, + }, + { + "name": "gohei" + } + ] +}