Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

blup #12

Merged
merged 1 commit into from Jun 16, 2024
Merged

blup #12

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/chat/emotes.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ chat-emote-name-gasp = Gasp
chat-emote-name-deathgasp = Deathgasp
chat-emote-name-buzz = Buzz
chat-emote-name-weh = Weh
chat-emote-name-blup = Blup
chat-emote-name-chirp = Chirp
chat-emote-name-beep = Beep
chat-emote-name-chime = Chime
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -269,3 +269,4 @@ flavor-complex-sax = like jazz
flavor-complex-bottledlightning = like lightning in a bottle
flavor-complex-punishment = like punishment
flavor-weh = like weh
flavor-blup = like blup
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/reagents/meta/fun.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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-desc-weh = Pure essence of lizard plush. Makes you Weh!

reagent-name-blup = juice that makes you Blup
reagent-desc-blup = It's in the name. Blup.
14 changes: 14 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,20 @@
wideAnimationRotation: 180
soundHit:
path: /Audio/Items/Toys/blup.ogg
- type: Extractable
juiceSolution:
reagents:
- ReagentId: JuiceThatMakesYouBlup
Quantity: 30
- type: SolutionContainerManager
solutions:
food:
maxVol: 20
reagents:
- ReagentId: Fiber
Quantity: 10
- ReagentId: JuiceThatMakesYouBlup
Quantity: 10

- type: entity
parent: PlushieLizard
Expand Down
7 changes: 6 additions & 1 deletion Resources/Prototypes/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1079,6 +1079,11 @@
flavorType: Base
description: flavor-weh

- type: flavor
id: blup
flavorType: Base
description: flavor-blup

- type: flavor
id: fishops
flavorType: Complex
Expand All @@ -1102,4 +1107,4 @@
- type: flavor
id: paintthinner
flavorType: Complex
description: flavor-complex-paint-thinner
description: flavor-complex-paint-thinner
18 changes: 18 additions & 0 deletions Resources/Prototypes/Reagents/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -349,3 +349,21 @@
conditions:
- !type:ReagentThreshold
min: 50

- type: reagent
id: JuiceThatMakesYouBlup
name: reagent-name-blup
group: Toxins
desc: reagent-desc-blup
physicalDesc: reagent-physical-desc-vibrant
flavor: blup
color: "#db6b9a"
metabolisms:
Poison:
metabolismRate: 0.25
effects:
- !type:Emote
emote: Blup
showInChat: true
force: true
probability: 0.5
5 changes: 5 additions & 0 deletions Resources/Prototypes/SoundCollections/emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,8 @@
id: Weh
files:
- /Audio/Items/Toys/weh.ogg

- type: soundCollection
id: Blup
files:
- /Audio/Items/Toys/blup.ogg
22 changes: 22 additions & 0 deletions Resources/Prototypes/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
collection: Whistles
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: MaleGasp
DefaultDeathgasp:
Expand Down Expand Up @@ -74,6 +76,8 @@
collection: Whistles
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: FemaleGasp
DefaultDeathgasp:
Expand All @@ -96,6 +100,8 @@
collection: MaleCry
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: MaleGasp
DefaultDeathgasp:
Expand All @@ -118,6 +124,8 @@
collection: FemaleCry
Weh:
collection: Weh
Blup:
collection: Blup

- type: emoteSounds
id: MaleSlime
Expand Down Expand Up @@ -154,6 +162,8 @@
collection: Whistles
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: MaleGasp
DefaultDeathgasp:
Expand Down Expand Up @@ -196,6 +206,8 @@
collection: Whistles
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: FemaleGasp
DefaultDeathgasp:
Expand Down Expand Up @@ -225,6 +237,8 @@
collection: BikeHorn
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: MaleGasp
DefaultDeathgasp:
Expand All @@ -247,6 +261,8 @@
path: /Audio/Voice/Arachnid/arachnid_click.ogg
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: MaleGasp
DefaultDeathgasp:
Expand Down Expand Up @@ -285,6 +301,8 @@
collection: Whistles
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: MaleGasp
DefaultDeathgasp:
Expand Down Expand Up @@ -326,6 +344,8 @@
collection: Whistles
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: FemaleGasp
DefaultDeathgasp:
Expand All @@ -351,6 +371,8 @@
path: /Audio/Voice/Moth/moth_squeak.ogg
Weh:
collection: Weh
Blup:
collection: Blup
Gasp:
collection: MaleGasp
DefaultDeathgasp:
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Voice/speech_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,13 @@
icon: Interface/Emotes/weh.png
chatMessages: [Wehs!]

- type: emote
id: Blup
name: chat-emote-name-blup
category: Vocal
icon: Interface/Emotes/weh.png
chatMessages: [Blups!]

- type: emote
id: Chirp
name: chat-emote-name-chirp
Expand Down
Loading