New Drazil plushie (inverse lizard plushie) (#33776)
* Hew * properly attribute hew.ogg * add to maints locker plushie pool with low chance, clear up grammar * shhhh nobody saw that linter failure * adds localization support for Weh and Hew emotes * fix capitalization error present since circa 2/25/2024 * resolve conflicts, fix sprite, add reversed inhands * clear up cursed formatting
This commit is contained in:
@@ -58,6 +58,11 @@
|
|||||||
copyright: "Created by BlackMajor (github) for ss14, muffled_weh.ogg modified from weh.ogg by Slorkito (ss14 discord)"
|
copyright: "Created by BlackMajor (github) for ss14, muffled_weh.ogg modified from weh.ogg by Slorkito (ss14 discord)"
|
||||||
source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/weh.ogg"
|
source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/weh.ogg"
|
||||||
|
|
||||||
|
- files: ["hew.ogg"]
|
||||||
|
license: "CC0-1.0"
|
||||||
|
copyright: "Modified from weh.ogg by ArtisticRoomba"
|
||||||
|
source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/weh.ogg"
|
||||||
|
|
||||||
- files: ["skub.ogg", "skub3.ogg"]
|
- files: ["skub.ogg", "skub3.ogg"]
|
||||||
license: "CC0-1.0"
|
license: "CC0-1.0"
|
||||||
copyright: "Created by BlackMajor (github) for ss14"
|
copyright: "Created by BlackMajor (github) for ss14"
|
||||||
|
|||||||
BIN
Resources/Audio/Items/Toys/hew.ogg
Normal file
BIN
Resources/Audio/Items/Toys/hew.ogg
Normal file
Binary file not shown.
@@ -17,6 +17,7 @@ chat-emote-name-gasp = Gasp
|
|||||||
chat-emote-name-deathgasp = Deathgasp
|
chat-emote-name-deathgasp = Deathgasp
|
||||||
chat-emote-name-buzz = Buzz
|
chat-emote-name-buzz = Buzz
|
||||||
chat-emote-name-weh = Weh
|
chat-emote-name-weh = Weh
|
||||||
|
chat-emote-name-hew = Hew
|
||||||
chat-emote-name-chirp = Chirp
|
chat-emote-name-chirp = Chirp
|
||||||
chat-emote-name-beep = Beep
|
chat-emote-name-beep = Beep
|
||||||
chat-emote-name-chime = Chime
|
chat-emote-name-chime = Chime
|
||||||
@@ -50,6 +51,8 @@ chat-emote-msg-gasp = gasps.
|
|||||||
chat-emote-msg-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} eyes dead and lifeless...
|
chat-emote-msg-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} eyes dead and lifeless...
|
||||||
chat-emote-msg-deathgasp-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving...
|
chat-emote-msg-deathgasp-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving...
|
||||||
chat-emote-msg-buzz = buzzes!
|
chat-emote-msg-buzz = buzzes!
|
||||||
|
chat-emote-msg-weh = wehs!
|
||||||
|
chat-emote-msg-hew = hews!
|
||||||
chat-emote-msg-chirp = chirps!
|
chat-emote-msg-chirp = chirps!
|
||||||
chat-emote-msg-beep = beeps.
|
chat-emote-msg-beep = beeps.
|
||||||
chat-emote-msg-chime = chimes.
|
chat-emote-msg-chime = chimes.
|
||||||
|
|||||||
@@ -315,3 +315,4 @@ flavor-complex-sax = like jazz
|
|||||||
flavor-complex-bottledlightning = like lightning in a bottle
|
flavor-complex-bottledlightning = like lightning in a bottle
|
||||||
flavor-complex-punishment = like punishment
|
flavor-complex-punishment = like punishment
|
||||||
flavor-weh = like weh
|
flavor-weh = like weh
|
||||||
|
flavor-hew = like hew
|
||||||
|
|||||||
@@ -27,3 +27,6 @@ reagent-desc-laughter = Some say that this is the best medicine, but recent stud
|
|||||||
|
|
||||||
reagent-name-weh = juice that makes you Weh
|
reagent-name-weh = juice that makes you Weh
|
||||||
reagent-desc-weh = Pure essence of lizard plush. Makes you Weh!
|
reagent-desc-weh = Pure essence of lizard plush. Makes you Weh!
|
||||||
|
|
||||||
|
reagent-name-hew = juice that makes you Hew
|
||||||
|
reagent-desc-hew = Pure essence of inversed lizard plush. Makes you Hew!
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ reagent-physical-desc-exotic-smelling = exotic smelling
|
|||||||
reagent-physical-desc-energizing = energizing
|
reagent-physical-desc-energizing = energizing
|
||||||
reagent-physical-desc-exhilarating = exhilarating
|
reagent-physical-desc-exhilarating = exhilarating
|
||||||
reagent-physical-desc-vibrant = vibrant
|
reagent-physical-desc-vibrant = vibrant
|
||||||
|
reagent-physical-desc-inversed = inversed
|
||||||
reagent-physical-desc-fluffy = fluffy
|
reagent-physical-desc-fluffy = fluffy
|
||||||
reagent-physical-desc-funny = funny
|
reagent-physical-desc-funny = funny
|
||||||
reagent-physical-desc-alkaline = alkaline
|
reagent-physical-desc-alkaline = alkaline
|
||||||
|
|||||||
@@ -16,6 +16,8 @@
|
|||||||
weight: 9
|
weight: 9
|
||||||
- id: PlushieSpaceLizard
|
- id: PlushieSpaceLizard
|
||||||
weight: 1
|
weight: 1
|
||||||
|
- id: PlushieLizardInversed
|
||||||
|
weight: 0.5
|
||||||
- !type:GroupSelector
|
- !type:GroupSelector
|
||||||
children:
|
children:
|
||||||
- id: PlushieCarp
|
- id: PlushieCarp
|
||||||
|
|||||||
@@ -417,6 +417,58 @@
|
|||||||
- ReagentId: JuiceThatMakesYouWeh
|
- ReagentId: JuiceThatMakesYouWeh
|
||||||
Quantity: 10
|
Quantity: 10
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
parent: PlushieLizard
|
||||||
|
id: PlushieLizardInversed #Hew!
|
||||||
|
name: drazil plushie
|
||||||
|
description: An adorable stuffed toy that resembles a lizardperson from an inversed dimension. Hew!
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
state: plushie_lizard_inversed
|
||||||
|
- type: Item
|
||||||
|
heldPrefix: plushielizardinversed
|
||||||
|
- type: EmitSoundOnUse
|
||||||
|
sound:
|
||||||
|
path: /Audio/Items/Toys/hew.ogg
|
||||||
|
- type: EmitSoundOnLand
|
||||||
|
sound:
|
||||||
|
path: /Audio/Items/Toys/hew.ogg
|
||||||
|
- type: EmitSoundOnActivate
|
||||||
|
sound:
|
||||||
|
path: /Audio/Items/Toys/hew.ogg
|
||||||
|
- type: EmitSoundOnTrigger
|
||||||
|
sound:
|
||||||
|
path: /Audio/Items/Toys/hew.ogg
|
||||||
|
- type: Food
|
||||||
|
requiresSpecialDigestion: true
|
||||||
|
useSound:
|
||||||
|
path: /Audio/Items/Toys/hew.ogg
|
||||||
|
- type: MeleeWeapon
|
||||||
|
wideAnimationRotation: 180
|
||||||
|
soundHit:
|
||||||
|
path: /Audio/Items/Toys/hew.ogg
|
||||||
|
- type: Extractable
|
||||||
|
juiceSolution:
|
||||||
|
reagents:
|
||||||
|
- ReagentId: JuiceThatMakesYouHew
|
||||||
|
Quantity: 30
|
||||||
|
- type: SolutionContainerManager
|
||||||
|
solutions:
|
||||||
|
food:
|
||||||
|
maxVol: 20
|
||||||
|
reagents:
|
||||||
|
- ReagentId: Fiber
|
||||||
|
Quantity: 10
|
||||||
|
- ReagentId: JuiceThatMakesYouHew
|
||||||
|
Quantity: 10
|
||||||
|
- type: Clothing
|
||||||
|
quickEquip: false
|
||||||
|
sprite: Objects/Fun/toys.rsi
|
||||||
|
equippedPrefix: lizard-inversed
|
||||||
|
slots:
|
||||||
|
- HEAD
|
||||||
|
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: BasePlushie
|
parent: BasePlushie
|
||||||
id: PlushieDiona
|
id: PlushieDiona
|
||||||
@@ -1650,4 +1702,3 @@
|
|||||||
- type: PhysicalComposition
|
- type: PhysicalComposition
|
||||||
materialComposition:
|
materialComposition:
|
||||||
Plastic: 25
|
Plastic: 25
|
||||||
|
|
||||||
@@ -1269,6 +1269,11 @@
|
|||||||
flavorType: Base
|
flavorType: Base
|
||||||
description: flavor-weh
|
description: flavor-weh
|
||||||
|
|
||||||
|
- type: flavor
|
||||||
|
id: hew
|
||||||
|
flavorType: Base
|
||||||
|
description: flavor-hew
|
||||||
|
|
||||||
- type: flavor
|
- type: flavor
|
||||||
id: fishops
|
id: fishops
|
||||||
flavorType: Complex
|
flavorType: Complex
|
||||||
|
|||||||
@@ -349,3 +349,35 @@
|
|||||||
conditions:
|
conditions:
|
||||||
- !type:ReagentThreshold
|
- !type:ReagentThreshold
|
||||||
min: 50
|
min: 50
|
||||||
|
|
||||||
|
- type: reagent
|
||||||
|
id: JuiceThatMakesYouHew
|
||||||
|
name: reagent-name-hew
|
||||||
|
group: Toxins
|
||||||
|
desc: reagent-desc-hew
|
||||||
|
physicalDesc: reagent-physical-desc-inversed
|
||||||
|
flavor: hew
|
||||||
|
color: "#a64dc5"
|
||||||
|
metabolisms:
|
||||||
|
Poison:
|
||||||
|
metabolismRate: 0.25
|
||||||
|
effects:
|
||||||
|
- !type:Emote
|
||||||
|
emote: Hew
|
||||||
|
showInChat: true
|
||||||
|
force: true
|
||||||
|
probability: 0.5
|
||||||
|
- !type:Polymorph
|
||||||
|
prototype: ArtifactLizard
|
||||||
|
conditions:
|
||||||
|
- !type:OrganType
|
||||||
|
type: Animal
|
||||||
|
shouldHave: false
|
||||||
|
- !type:ReagentThreshold
|
||||||
|
min: 50
|
||||||
|
- !type:AdjustReagent
|
||||||
|
reagent: JuiceThatMakesYouHew
|
||||||
|
amount: -20
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentThreshold
|
||||||
|
min: 50
|
||||||
|
|||||||
@@ -92,3 +92,8 @@
|
|||||||
id: Weh
|
id: Weh
|
||||||
files:
|
files:
|
||||||
- /Audio/Items/Toys/weh.ogg
|
- /Audio/Items/Toys/weh.ogg
|
||||||
|
|
||||||
|
- type: soundCollection
|
||||||
|
id: Hew
|
||||||
|
files:
|
||||||
|
- /Audio/Items/Toys/hew.ogg
|
||||||
|
|||||||
@@ -34,6 +34,8 @@
|
|||||||
collection: Whistles
|
collection: Whistles
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: MaleGasp
|
collection: MaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -74,6 +76,8 @@
|
|||||||
collection: Whistles
|
collection: Whistles
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: FemaleGasp
|
collection: FemaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -96,6 +100,8 @@
|
|||||||
collection: MaleCry
|
collection: MaleCry
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: MaleGasp
|
collection: MaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -118,6 +124,8 @@
|
|||||||
collection: FemaleCry
|
collection: FemaleCry
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: FemaleGasp
|
collection: FemaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -158,6 +166,8 @@
|
|||||||
collection: Whistles
|
collection: Whistles
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: MaleGasp
|
collection: MaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -200,6 +210,8 @@
|
|||||||
collection: Whistles
|
collection: Whistles
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: FemaleGasp
|
collection: FemaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -229,6 +241,8 @@
|
|||||||
collection: BikeHorn
|
collection: BikeHorn
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: MaleGasp
|
collection: MaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -251,6 +265,8 @@
|
|||||||
path: /Audio/Voice/Arachnid/arachnid_click.ogg
|
path: /Audio/Voice/Arachnid/arachnid_click.ogg
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: MaleGasp
|
collection: MaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -289,6 +305,8 @@
|
|||||||
collection: Whistles
|
collection: Whistles
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: MaleGasp
|
collection: MaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -330,6 +348,8 @@
|
|||||||
collection: Whistles
|
collection: Whistles
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: FemaleGasp
|
collection: FemaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
@@ -355,6 +375,8 @@
|
|||||||
path: /Audio/Voice/Moth/moth_squeak.ogg
|
path: /Audio/Voice/Moth/moth_squeak.ogg
|
||||||
Weh:
|
Weh:
|
||||||
collection: Weh
|
collection: Weh
|
||||||
|
Hew:
|
||||||
|
collection: Hew
|
||||||
Gasp:
|
Gasp:
|
||||||
collection: MaleGasp
|
collection: MaleGasp
|
||||||
DefaultDeathgasp:
|
DefaultDeathgasp:
|
||||||
|
|||||||
@@ -334,7 +334,14 @@
|
|||||||
name: chat-emote-name-weh
|
name: chat-emote-name-weh
|
||||||
category: Vocal
|
category: Vocal
|
||||||
icon: Interface/Emotes/weh.png
|
icon: Interface/Emotes/weh.png
|
||||||
chatMessages: [Wehs!]
|
chatMessages: ["chat-emote-msg-weh"]
|
||||||
|
|
||||||
|
- type: emote
|
||||||
|
id: Hew
|
||||||
|
name: chat-emote-name-hew
|
||||||
|
category: Vocal
|
||||||
|
icon: Interface/Emotes/hew.png
|
||||||
|
chatMessages: ["chat-emote-msg-hew"]
|
||||||
|
|
||||||
- type: emote
|
- type: emote
|
||||||
id: Chirp
|
id: Chirp
|
||||||
|
|||||||
@@ -56,6 +56,11 @@
|
|||||||
copyright: "Created by Sarahon"
|
copyright: "Created by Sarahon"
|
||||||
source: "https://github.com/Sarahon"
|
source: "https://github.com/Sarahon"
|
||||||
|
|
||||||
|
- files: ["hew.png"]
|
||||||
|
license: "CC-BY-SA-3.0"
|
||||||
|
copyright: "Modified from existing weh emote image (weh.png) by ArtisticRoomba"
|
||||||
|
source: "https://github.com/ArtisticRoomba"
|
||||||
|
|
||||||
- files: ["honk.png"]
|
- files: ["honk.png"]
|
||||||
license: "CC-BY-SA-3.0"
|
license: "CC-BY-SA-3.0"
|
||||||
copyright: "Modified from existing bikehorn texture (icon.png) by TyAshley (AllenTheGreat) & Sarahon"
|
copyright: "Modified from existing bikehorn texture (icon.png) by TyAshley (AllenTheGreat) & Sarahon"
|
||||||
|
|||||||
BIN
Resources/Textures/Interface/Emotes/hew.png
Normal file
BIN
Resources/Textures/Interface/Emotes/hew.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 473 B |
Binary file not shown.
|
After Width: | Height: | Size: 682 B |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC-BY-SA-3.0",
|
"license": "CC-BY-SA-3.0",
|
||||||
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie",
|
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba",
|
||||||
"size": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -103,6 +103,21 @@
|
|||||||
{
|
{
|
||||||
"name": "plushie_lizard_mirrored"
|
"name": "plushie_lizard_mirrored"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "plushie_lizard_inversed"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lizard-inversed-equipped-HELMET",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "plushielizardinversed-inhand-left",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "plushielizardinversed-inhand-right",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "plushie_lamp"
|
"name": "plushie_lamp"
|
||||||
},
|
},
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 495 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Reference in New Issue
Block a user