diff --git a/Resources/Audio/Items/Toys/attributions.yml b/Resources/Audio/Items/Toys/attributions.yml index 162ee8c1c3..cd767ff3d6 100644 --- a/Resources/Audio/Items/Toys/attributions.yml +++ b/Resources/Audio/Items/Toys/attributions.yml @@ -58,6 +58,11 @@ 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" +- 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"] license: "CC0-1.0" copyright: "Created by BlackMajor (github) for ss14" diff --git a/Resources/Audio/Items/Toys/hew.ogg b/Resources/Audio/Items/Toys/hew.ogg new file mode 100644 index 0000000000..63ba808770 Binary files /dev/null and b/Resources/Audio/Items/Toys/hew.ogg differ diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl index 8c74acafca..479e9daab4 100644 --- a/Resources/Locale/en-US/chat/emotes.ftl +++ b/Resources/Locale/en-US/chat/emotes.ftl @@ -17,6 +17,7 @@ chat-emote-name-gasp = Gasp chat-emote-name-deathgasp = Deathgasp chat-emote-name-buzz = Buzz chat-emote-name-weh = Weh +chat-emote-name-hew = Hew chat-emote-name-chirp = Chirp chat-emote-name-beep = Beep 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-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving... chat-emote-msg-buzz = buzzes! +chat-emote-msg-weh = wehs! +chat-emote-msg-hew = hews! chat-emote-msg-chirp = chirps! chat-emote-msg-beep = beeps. chat-emote-msg-chime = chimes. diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 2789e59938..f7730aa01f 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -315,3 +315,4 @@ flavor-complex-sax = like jazz flavor-complex-bottledlightning = like lightning in a bottle flavor-complex-punishment = like punishment flavor-weh = like weh +flavor-hew = like hew diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl index a4a8c0f150..66abb737ff 100644 --- a/Resources/Locale/en-US/reagents/meta/fun.ftl +++ b/Resources/Locale/en-US/reagents/meta/fun.ftl @@ -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-hew = juice that makes you Hew +reagent-desc-hew = Pure essence of inversed lizard plush. Makes you Hew! diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 61954e01eb..56953776e6 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -87,6 +87,7 @@ reagent-physical-desc-exotic-smelling = exotic smelling reagent-physical-desc-energizing = energizing reagent-physical-desc-exhilarating = exhilarating reagent-physical-desc-vibrant = vibrant +reagent-physical-desc-inversed = inversed reagent-physical-desc-fluffy = fluffy reagent-physical-desc-funny = funny reagent-physical-desc-alkaline = alkaline diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 411dc30721..84c8995222 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -16,6 +16,8 @@ weight: 9 - id: PlushieSpaceLizard weight: 1 + - id: PlushieLizardInversed + weight: 0.5 - !type:GroupSelector children: - id: PlushieCarp diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 60420bb9d9..2672be0622 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -417,6 +417,58 @@ - ReagentId: JuiceThatMakesYouWeh 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 parent: BasePlushie id: PlushieDiona @@ -1650,4 +1702,3 @@ - type: PhysicalComposition materialComposition: Plastic: 25 - \ No newline at end of file diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index b79d6530ec..611750fa7d 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1269,6 +1269,11 @@ flavorType: Base description: flavor-weh +- type: flavor + id: hew + flavorType: Base + description: flavor-hew + - type: flavor id: fishops flavorType: Complex diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 1df2636c8c..00d31cbd10 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -349,3 +349,35 @@ conditions: - !type:ReagentThreshold 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 diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml index 6e7b5c0fa0..04d2b3b2e8 100644 --- a/Resources/Prototypes/SoundCollections/emotes.yml +++ b/Resources/Prototypes/SoundCollections/emotes.yml @@ -92,3 +92,8 @@ id: Weh files: - /Audio/Items/Toys/weh.ogg + +- type: soundCollection + id: Hew + files: + - /Audio/Items/Toys/hew.ogg diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 5eda800244..96726eb7fe 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -34,6 +34,8 @@ collection: Whistles Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: MaleGasp DefaultDeathgasp: @@ -74,6 +76,8 @@ collection: Whistles Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: FemaleGasp DefaultDeathgasp: @@ -96,6 +100,8 @@ collection: MaleCry Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: MaleGasp DefaultDeathgasp: @@ -118,6 +124,8 @@ collection: FemaleCry Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: FemaleGasp DefaultDeathgasp: @@ -158,6 +166,8 @@ collection: Whistles Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: MaleGasp DefaultDeathgasp: @@ -200,6 +210,8 @@ collection: Whistles Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: FemaleGasp DefaultDeathgasp: @@ -229,6 +241,8 @@ collection: BikeHorn Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: MaleGasp DefaultDeathgasp: @@ -251,6 +265,8 @@ path: /Audio/Voice/Arachnid/arachnid_click.ogg Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: MaleGasp DefaultDeathgasp: @@ -289,6 +305,8 @@ collection: Whistles Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: MaleGasp DefaultDeathgasp: @@ -330,6 +348,8 @@ collection: Whistles Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: FemaleGasp DefaultDeathgasp: @@ -355,6 +375,8 @@ path: /Audio/Voice/Moth/moth_squeak.ogg Weh: collection: Weh + Hew: + collection: Hew Gasp: collection: MaleGasp DefaultDeathgasp: @@ -424,7 +446,7 @@ path: /Audio/Voice/Diona/diona_salute.ogg params: volume: -5 - + - type: emoteSounds id: ReptilianBodyEmotes sounds: diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 6cd5bcacba..21a884ed4c 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -334,7 +334,14 @@ name: chat-emote-name-weh category: Vocal 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 id: Chirp diff --git a/Resources/Textures/Interface/Emotes/attributions.yml b/Resources/Textures/Interface/Emotes/attributions.yml index 55cb19a9d7..d29915984d 100644 --- a/Resources/Textures/Interface/Emotes/attributions.yml +++ b/Resources/Textures/Interface/Emotes/attributions.yml @@ -56,6 +56,11 @@ copyright: "Created by 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"] license: "CC-BY-SA-3.0" copyright: "Modified from existing bikehorn texture (icon.png) by TyAshley (AllenTheGreat) & Sarahon" diff --git a/Resources/Textures/Interface/Emotes/hew.png b/Resources/Textures/Interface/Emotes/hew.png new file mode 100644 index 0000000000..d6859991be Binary files /dev/null and b/Resources/Textures/Interface/Emotes/hew.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/lizard-inversed-equipped-HELMET.png b/Resources/Textures/Objects/Fun/toys.rsi/lizard-inversed-equipped-HELMET.png new file mode 100644 index 0000000000..f8652eaf31 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/lizard-inversed-equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index b4db18defc..4d86adeded 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "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": { "x": 32, "y": 32 @@ -103,6 +103,21 @@ { "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" }, diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_inversed.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_inversed.png new file mode 100644 index 0000000000..06ac083f54 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_inversed.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-left.png new file mode 100644 index 0000000000..708736a0ca Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-right.png new file mode 100644 index 0000000000..501b3c449b Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushielizardinversed-inhand-right.png differ