diff --git a/Resources/Prototypes/Entities/Clothing/Head/animals.yml b/Resources/Prototypes/Entities/Clothing/Head/animals.yml index 4ea1c92242..83fa2f7561 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/animals.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/animals.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalCat - name: grey cat + name: grey cat hat description: A cute and fluffy head of a grey cat. components: - type: Sprite @@ -12,7 +12,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalCatBrown - name: brown cat + name: brown cat hat description: A cute and fluffy head of a brown cat. components: - type: Sprite @@ -23,7 +23,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalCatBlack - name: black cat + name: black cat hat description: A cute and fluffy head of a black cat. components: - type: Sprite @@ -34,7 +34,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalHeadslime - name: headslime + name: headslime hat description: A green, sticky headslime, you put it on your head. components: - type: Sprite @@ -45,7 +45,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalMonkey - name: monkey + name: monkey hat description: That's a monkey head. It has a hole on a mouth to eat bananas. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 87acc37bf9..fb4e8ad149 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -23,7 +23,7 @@ - type: entity parent: HatBase id: ClothingHeadHelmetHardsuitDeathsquad - name: deathsquad + name: deathsquad hardsuit helmet description: A robust helmet for special operations. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index fc04981776..376698ad35 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -45,7 +45,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretWarden - name: warden's hat + name: warden's beret description: A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety. components: - type: Sprite @@ -100,7 +100,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatChef - name: chef hat + name: chefs hat description: "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work." components: - type: Sprite @@ -177,7 +177,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatPaper - name: paper + name: paper hat description: A hat made of paper. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 138853fa3c..b314dac781 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -12,7 +12,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHelmetCosmonaut - name: cosmonaut + name: cosmonaut helmet description: A deceptively well armored space helmet. Ancient design, but advanced manufacturing. components: - type: Sprite @@ -96,7 +96,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHelmetSyndicate - name: syndicate + name: syndicate helmet description: A stylish, robust syndicate helmet components: - type: Sprite @@ -118,7 +118,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHelmetThunderdome - name: thunderdome + name: thunderdome helmet description: Let the battle commence! components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index b437bb6339..a3d22355dc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBluesoft - name: bluesoft + name: blue cap description: "It's a baseball hat in a tasteless blue colour." components: - type: Sprite @@ -12,7 +12,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBluesoftFlipped - name: bluesoft flipped + name: blue cap flipped description: "It's a baseball hat in a tasteless blue colour. Flipped." components: - type: Sprite @@ -23,7 +23,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCargosoft - name: cargosoft + name: cargo cap description: "It's a baseball hat painted in Cargo colours." components: - type: Sprite @@ -34,7 +34,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCargosoftFlipped - name: cargosoft flipped + name: cargo cap flipped description: "It's a baseball hat painted in Cargo colours. Flipped." components: - type: Sprite @@ -45,7 +45,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCorpsoft - name: corpsoft + name: corporate cap description: A baseball bat in corporation colors. components: - type: Sprite @@ -56,7 +56,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCorpsoftFlipped - name: corpsoft flipped + name: corporate cap flipped description: A baseball bat in corporation colors. Flipped. components: - type: Sprite @@ -67,7 +67,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatGreensoft - name: greensoft + name: green cap description: "It's a baseball hat in a tasteless green colour." components: - type: Sprite @@ -78,7 +78,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatGreensoftFlipped - name: greensoft flipped + name: green cap flipped description: "It's a baseball hat in a tasteless green colour. Flipped." components: - type: Sprite @@ -89,7 +89,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatGreysoft - name: greysoft + name: grey cap description: "It's a baseball hat in a tasteless grey colour." components: - type: Sprite @@ -100,7 +100,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatGreysoftFlipped - name: greysoft flipped + name: grey cap flipped description: "It's a baseball hat in a tasteless grey colour. Flipped." components: - type: Sprite @@ -111,7 +111,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatMimesoft - name: mimesoft + name: mime cap description: "It's a baseball hat in a tasteless white colour." components: - type: Sprite @@ -122,7 +122,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatMimesoftFlipped - name: mimesoft flipped + name: mime cap flipped description: It's a baseball hat in a tasteless white colour. Flipped. components: - type: Sprite @@ -133,7 +133,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatOrangesoft - name: orangesoft + name: orange cap description: It's a baseball hat in a good-looking orange colour. components: - type: Sprite @@ -144,7 +144,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatOrangesoftFlipped - name: orangesoft flipped + name: orange cap flipped description: It's a baseball hat in a good-looking orange colour. Flipped. components: - type: Sprite @@ -155,7 +155,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatPurplesoft - name: purple soft + name: purple cap description: It's a baseball hat in a tasteless purple colour. components: - type: Sprite @@ -166,7 +166,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatPurplesoftFlipped - name: purplesoft flipped + name: purple cap flipped description: It's a baseball hat in a tasteless purple colour. Flipped. components: - type: Sprite @@ -177,7 +177,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatRedsoft - name: redsoft + name: red cap description: It's a baseball hat in a tasteless red colour. components: - type: Sprite @@ -188,7 +188,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatRedsoftFlipped - name: redsoft flipped + name: red cap flipped description: It's a baseball hat in a tasteless purple colour. Flipped. components: - type: Sprite @@ -199,7 +199,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatSecsoft - name: secsoft + name: ssecurity cap description: It's a robust baseball hat in tasteful red colour. components: - type: Sprite @@ -210,7 +210,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatSecsoftFlipped - name: secsoft flipped + name: security cap flipped description: It's a robust baseball hat in tasteful red colour. Flipped. components: - type: Sprite @@ -221,7 +221,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatYellowsoft - name: yellowsoft + name: yellow cap description: A yellow baseball hat. components: - type: Sprite @@ -232,7 +232,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatYellowsoftFlipped - name: yellowsoft flipped + name: yellow cap flipped description: A yellow flipped baseball hat. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 86d4897391..0e4d231da6 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterCoatBomber - name: bomber + name: bomber jacket description: A thick, well-worn WW2 leather bomber jacket. components: - type: Sprite @@ -14,7 +14,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterCoatDetective - name: detective + name: detective trenchcoat description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration! components: - type: Sprite @@ -60,7 +60,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterCoatInspector - name: inspector coat + name: inspectors coat description: A strict inspector coat for being intimidating during inspections. components: - type: Sprite @@ -125,7 +125,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterCoatPirate - name: pirate + name: pirate garb description: Yarr. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 48d8f29afb..af62d16e74 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterSuitBomb - name: bombsuit + name: bomb suit description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce. components: - type: Sprite @@ -56,7 +56,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterSuitSyndicate - name: syndicate + name: syndicate suit description: "Has a tag on it 'Totally not property of an enemy corporation, honest!'" components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 04af80ea0f..061acb6335 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -52,7 +52,7 @@ - type: entity parent: ClothingOuterBase id: ClothingOuterVestHazard - name: hazard + name: hi-viz vest description: A high-visibility vest used in work zones. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 7600d0814d..debbfa32c6 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingShoesBase id: ClothingShoesBootsWork - name: workboots shoes + name: workboots description: Engineering lace-up work boots for the especially blue-collar. components: - type: Sprite 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 index 9bb14dd227..fdcf3c8987 100644 Binary files a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/equipped-HELMET.png 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 index 37012652f4..52d94883e8 100644 Binary files a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/icon.png 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 index ea873414b6..b44740c996 100644 Binary files a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/inhand-left.png 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 index dc849846b4..d105b74a32 100644 Binary files a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/inhand-right.png 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 index 6232756c5e..50ab60e45f 100644 --- a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/meta.json @@ -3,8 +3,8 @@ "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 + "x": 32, + "y": 32 }, "states": [ {