Add 2 New Reagents (Felinase and Caninase) (#41136)
* Flavors, Flavor Profiles, Reagent Text * Base Reagent and Mix reaction * Borkinase, flavor stuff * Final touches me thinks * Comment out shit * Update fun.yml removed comments * Update fun.yml Increased output for borkinase and felinase * explosive reaction creates razorium when mixed and makes a radioactive explosion. screaming explosion funny!!! * reagent descriptions updated em * chem is no longer nuclear bomb * remove tile-break scale * recipe change done through web view dont kill me im lazy * removed cellular, halved rads done through web again, dont end me thanks * updated locale to reflect name change * updated reagent to reflect name change * updated reactions to reflect name changes --------- Co-authored-by: NoreUhh <noreuhh@gmail.com>
This commit is contained in:
parent
4e8cef60a4
commit
059f74cfbe
|
|
@ -1,3 +1,4 @@
|
||||||
|
using Content.Shared.StatusEffectNew;
|
||||||
using Content.Server.Speech.Components;
|
using Content.Server.Speech.Components;
|
||||||
using Content.Shared.Speech;
|
using Content.Shared.Speech;
|
||||||
using Robust.Shared.Random;
|
using Robust.Shared.Random;
|
||||||
|
|
@ -23,6 +24,7 @@ namespace Content.Server.Speech.EntitySystems
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
SubscribeLocalEvent<BarkAccentComponent, AccentGetEvent>(OnAccent);
|
SubscribeLocalEvent<BarkAccentComponent, AccentGetEvent>(OnAccent);
|
||||||
|
SubscribeLocalEvent<BarkAccentComponent, StatusEffectRelayedEvent<AccentGetEvent>>(OnAccentRelayed);
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Accentuate(string message)
|
public string Accentuate(string message)
|
||||||
|
|
@ -36,9 +38,14 @@ namespace Content.Server.Speech.EntitySystems
|
||||||
.Replace("l", "r").Replace("L", "R");
|
.Replace("l", "r").Replace("L", "R");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnAccent(EntityUid uid, BarkAccentComponent component, AccentGetEvent args)
|
private void OnAccent(Entity<BarkAccentComponent> entity, ref AccentGetEvent args)
|
||||||
{
|
{
|
||||||
args.Message = Accentuate(args.Message);
|
args.Message = Accentuate(args.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnAccentRelayed(Entity<BarkAccentComponent> entity, ref StatusEffectRelayedEvent<AccentGetEvent> args)
|
||||||
|
{
|
||||||
|
args.Args.Message = Accentuate(args.Args.Message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
using Content.Server.Speech.Components;
|
using Content.Server.Speech.Components;
|
||||||
using Content.Shared.Speech;
|
using Content.Shared.Speech;
|
||||||
|
using Content.Shared.StatusEffectNew;
|
||||||
using Robust.Shared.Random;
|
using Robust.Shared.Random;
|
||||||
|
|
||||||
namespace Content.Server.Speech.EntitySystems
|
namespace Content.Server.Speech.EntitySystems
|
||||||
|
|
@ -20,6 +21,7 @@ namespace Content.Server.Speech.EntitySystems
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
SubscribeLocalEvent<OwOAccentComponent, AccentGetEvent>(OnAccent);
|
SubscribeLocalEvent<OwOAccentComponent, AccentGetEvent>(OnAccent);
|
||||||
|
SubscribeLocalEvent<OwOAccentComponent, StatusEffectRelayedEvent<AccentGetEvent>>(OnAccentRelayed);
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Accentuate(string message)
|
public string Accentuate(string message)
|
||||||
|
|
@ -34,9 +36,15 @@ namespace Content.Server.Speech.EntitySystems
|
||||||
.Replace("l", "w").Replace("L", "W");
|
.Replace("l", "w").Replace("L", "W");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnAccent(EntityUid uid, OwOAccentComponent component, AccentGetEvent args)
|
private void OnAccent(Entity<OwOAccentComponent> entity, ref AccentGetEvent args)
|
||||||
{
|
{
|
||||||
args.Message = Accentuate(args.Message);
|
args.Message = Accentuate(args.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnAccentRelayed(Entity<OwOAccentComponent> entity, ref StatusEffectRelayedEvent<AccentGetEvent> args)
|
||||||
|
{
|
||||||
|
args.Args.Message = Accentuate(args.Args.Message);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -183,6 +183,8 @@ flavor-complex-true-nature = like the true nature of reality
|
||||||
flavor-complex-false-meat = not entirely unlike meat
|
flavor-complex-false-meat = not entirely unlike meat
|
||||||
flavor-complex-paper = like mushy pulp
|
flavor-complex-paper = like mushy pulp
|
||||||
flavor-complex-compressed-meat = like compressed meat
|
flavor-complex-compressed-meat = like compressed meat
|
||||||
|
flavor-complex-dog-food = like dog food
|
||||||
|
flavor-complex-canned-tuna = like canned tuna
|
||||||
|
|
||||||
# Drink-specific flavors.
|
# Drink-specific flavors.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,3 +30,9 @@ reagent-desc-weh = Pure essence of lizard plush. Makes you Weh!
|
||||||
|
|
||||||
reagent-name-hew = juice that makes you Hew
|
reagent-name-hew = juice that makes you Hew
|
||||||
reagent-desc-hew = Pure essence of inversed lizard plush. Makes you Hew!
|
reagent-desc-hew = Pure essence of inversed lizard plush. Makes you Hew!
|
||||||
|
|
||||||
|
reagent-name-catessence = felinase
|
||||||
|
reagent-desc-catessence = A type of carcinogenic enzyme known to break down proteins found within the vocal cords of most animals. Mixing is NOT recommended.
|
||||||
|
|
||||||
|
reagent-name-canidessence = caninase
|
||||||
|
reagent-desc-canidessence = A type of carcinogenic enzyme known to break down proteins found within the vocal cords of most animals. Mixing is NOT recommended.
|
||||||
|
|
|
||||||
|
|
@ -33,3 +33,19 @@
|
||||||
name: scrambled
|
name: scrambled
|
||||||
components:
|
components:
|
||||||
- type: ScrambledAccent
|
- type: ScrambledAccent
|
||||||
|
|
||||||
|
# Causes wu to tawk wike a cat. ^w^
|
||||||
|
- type: entity
|
||||||
|
parent: SpeechStatusEffectBase
|
||||||
|
id: StatusEffectOwO
|
||||||
|
name: owoaccent
|
||||||
|
components:
|
||||||
|
- type: OwOAccent
|
||||||
|
|
||||||
|
# Causes you to tark rike a dog. Woof!
|
||||||
|
- type: entity
|
||||||
|
parent: SpeechStatusEffectBase
|
||||||
|
id: StatusEffectBark
|
||||||
|
name: barkaccent
|
||||||
|
components:
|
||||||
|
- type: BarkAccent
|
||||||
|
|
|
||||||
|
|
@ -1345,6 +1345,16 @@
|
||||||
flavorType: Base
|
flavorType: Base
|
||||||
description: flavor-hew
|
description: flavor-hew
|
||||||
|
|
||||||
|
- type: flavor
|
||||||
|
id: dogfood
|
||||||
|
flavorType: Base
|
||||||
|
description: flavor-complex-dog-food
|
||||||
|
|
||||||
|
- type: flavor
|
||||||
|
id: cannedtuna
|
||||||
|
flavorType: Complex
|
||||||
|
description: flavor-complex-canned-tuna
|
||||||
|
|
||||||
- type: flavor
|
- type: flavor
|
||||||
id: fishops
|
id: fishops
|
||||||
flavorType: Complex
|
flavorType: Complex
|
||||||
|
|
|
||||||
|
|
@ -403,3 +403,113 @@
|
||||||
- !type:ReagentCondition
|
- !type:ReagentCondition
|
||||||
reagent: JuiceThatMakesYouHew
|
reagent: JuiceThatMakesYouHew
|
||||||
min: 50
|
min: 50
|
||||||
|
|
||||||
|
- type: reagent
|
||||||
|
id: Felinase
|
||||||
|
name: reagent-name-catessence
|
||||||
|
group: Toxins
|
||||||
|
desc: reagent-desc-catessence
|
||||||
|
physicalDesc: reagent-physical-desc-milky
|
||||||
|
flavor: cannedtuna
|
||||||
|
color: "#d8bed8"
|
||||||
|
metabolisms:
|
||||||
|
Poison:
|
||||||
|
metabolismRate: 0.2
|
||||||
|
effects:
|
||||||
|
- !type:HealthChange
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Felinase
|
||||||
|
min: 25
|
||||||
|
damage:
|
||||||
|
types:
|
||||||
|
Radiation: 0.5
|
||||||
|
- !type:AdjustReagent
|
||||||
|
reagent: Felinase
|
||||||
|
amount: -15
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Felinase
|
||||||
|
min: 40
|
||||||
|
- !type:ModifyStatusEffect
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Felinase
|
||||||
|
min: 25
|
||||||
|
effectProto: StatusEffectOwO
|
||||||
|
time: 25.0
|
||||||
|
type: Add
|
||||||
|
- !type:Emote
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Felinase
|
||||||
|
min: 25
|
||||||
|
emote: Cough
|
||||||
|
showInChat: true
|
||||||
|
showInGuidebook: true
|
||||||
|
force: true
|
||||||
|
probability: 0.05
|
||||||
|
- !type:PopupMessage
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Felinase
|
||||||
|
min: 25
|
||||||
|
type: Local
|
||||||
|
visualType: Small
|
||||||
|
messages: [ "capsaicin-effect-light-burn" ]
|
||||||
|
probability: 0.05
|
||||||
|
|
||||||
|
- type: reagent
|
||||||
|
id: Caninase
|
||||||
|
name: reagent-name-canidessence
|
||||||
|
group: Toxins
|
||||||
|
desc: reagent-desc-canidessence
|
||||||
|
physicalDesc: reagent-physical-desc-bubbly
|
||||||
|
flavor: dogfood
|
||||||
|
color: "#b87333"
|
||||||
|
metabolisms:
|
||||||
|
Poison:
|
||||||
|
metabolismRate: 0.2
|
||||||
|
effects:
|
||||||
|
- !type:HealthChange
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Caninase
|
||||||
|
min: 25
|
||||||
|
damage:
|
||||||
|
types:
|
||||||
|
Radiation: 0.5
|
||||||
|
- !type:AdjustReagent
|
||||||
|
reagent: Caninase
|
||||||
|
amount: -15
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Caninase
|
||||||
|
min: 40
|
||||||
|
- !type:ModifyStatusEffect
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Caninase
|
||||||
|
min: 25
|
||||||
|
effectProto: StatusEffectBark
|
||||||
|
time: 25.0
|
||||||
|
type: Add
|
||||||
|
- !type:Emote
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Caninase
|
||||||
|
min: 25
|
||||||
|
emote: Cough
|
||||||
|
showInChat: true
|
||||||
|
showInGuidebook: true
|
||||||
|
force: true
|
||||||
|
probability: 0.05
|
||||||
|
- !type:PopupMessage
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentCondition
|
||||||
|
reagent: Caninase
|
||||||
|
min: 25
|
||||||
|
type: Local
|
||||||
|
visualType: Small
|
||||||
|
messages: [ "capsaicin-effect-light-burn" ]
|
||||||
|
probability: 0.05
|
||||||
|
|
|
||||||
|
|
@ -215,3 +215,50 @@
|
||||||
intensitySlope: 1
|
intensitySlope: 1
|
||||||
maxTotalIntensity: 250
|
maxTotalIntensity: 250
|
||||||
tileBreakScale: 0.00001
|
tileBreakScale: 0.00001
|
||||||
|
|
||||||
|
- type: reaction
|
||||||
|
id: Felinase
|
||||||
|
reactants:
|
||||||
|
Haloperidol:
|
||||||
|
amount: 3
|
||||||
|
Cognizine:
|
||||||
|
amount: 2
|
||||||
|
CarpoToxin:
|
||||||
|
amount: 2
|
||||||
|
Enzyme:
|
||||||
|
amount: 1
|
||||||
|
products:
|
||||||
|
Felinase: 2
|
||||||
|
|
||||||
|
- type: reaction
|
||||||
|
id: Caninase
|
||||||
|
reactants:
|
||||||
|
Haloperidol:
|
||||||
|
amount: 3
|
||||||
|
Cognizine:
|
||||||
|
amount: 2
|
||||||
|
Happiness:
|
||||||
|
amount: 2
|
||||||
|
Enzyme:
|
||||||
|
amount: 1
|
||||||
|
products:
|
||||||
|
Caninase: 2
|
||||||
|
|
||||||
|
- type: reaction
|
||||||
|
id: CaninaseFelinaseReaction
|
||||||
|
impact: High
|
||||||
|
priority: 20
|
||||||
|
reactants:
|
||||||
|
Caninase:
|
||||||
|
amount: 1
|
||||||
|
Felinase:
|
||||||
|
amount: 1
|
||||||
|
products:
|
||||||
|
Razorium: 2
|
||||||
|
effects:
|
||||||
|
- !type:Explosion
|
||||||
|
explosionType: Radioactive
|
||||||
|
maxIntensity: 5
|
||||||
|
intensityPerUnit: 1
|
||||||
|
intensitySlope: 2.7
|
||||||
|
maxTotalIntensity: 50
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue