Add Overdosing Behaviour to Meth (#4949)
* Added debug bottle of meth as well as a damage increase on a Reagent Threshold * fix for metabolism getting funked when there is a failed reaction condition * removed max, raised minimum to 10 * reduced regular meth damage, increased overdose damage
This commit is contained in:
@@ -106,7 +106,7 @@ namespace Content.Server.Body.Metabolism
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!conditionsMet)
|
if (!conditionsMet)
|
||||||
return;
|
continue;
|
||||||
|
|
||||||
// If we're part of a body, pass that entity to Metabolize
|
// If we're part of a body, pass that entity to Metabolize
|
||||||
// Otherwise, just pass our owner entity, maybe we're a plant or something
|
// Otherwise, just pass our owner entity, maybe we're a plant or something
|
||||||
|
|||||||
@@ -3,12 +3,14 @@ using Content.Shared.Chemistry.Reagent;
|
|||||||
using Robust.Shared.GameObjects;
|
using Robust.Shared.GameObjects;
|
||||||
using Robust.Shared.Serialization.Manager.Attributes;
|
using Robust.Shared.Serialization.Manager.Attributes;
|
||||||
using Content.Shared.Damage;
|
using Content.Shared.Damage;
|
||||||
|
using JetBrains.Annotations;
|
||||||
|
|
||||||
namespace Content.Server.Chemistry.ReagentEffects
|
namespace Content.Server.Chemistry.ReagentEffects
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Default metabolism for medicine reagents.
|
/// Default metabolism for medicine reagents.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[UsedImplicitly]
|
||||||
public class HealthChange : ReagentEffect
|
public class HealthChange : ReagentEffect
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -188,10 +188,17 @@
|
|||||||
- !type:HealthChange
|
- !type:HealthChange
|
||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
Poison: 3 # 2.5
|
Poison: 2 # 2.5
|
||||||
- !type:MovespeedModifier
|
- !type:MovespeedModifier
|
||||||
walkSpeedModifier: 1.3
|
walkSpeedModifier: 1.3
|
||||||
sprintSpeedModifier: 1.3
|
sprintSpeedModifier: 1.3
|
||||||
|
- !type:HealthChange
|
||||||
|
conditions:
|
||||||
|
- !type:ReagentThreshold
|
||||||
|
min: 10
|
||||||
|
damage:
|
||||||
|
types:
|
||||||
|
Poison: 4 # this is added to the base damage of the meth.
|
||||||
Omnizine:
|
Omnizine:
|
||||||
effects:
|
effects:
|
||||||
- !type:HealthChange
|
- !type:HealthChange
|
||||||
|
|||||||
19
Resources/Prototypes/Entities/Debugging/drugs.yml
Normal file
19
Resources/Prototypes/Entities/Debugging/drugs.yml
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
- type: entity
|
||||||
|
parent: DrinkGlassBase
|
||||||
|
id: DrinkMeth
|
||||||
|
name: meth # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
|
||||||
|
description: Just a whole glass of meth.
|
||||||
|
suffix: DEBUG
|
||||||
|
components:
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- Debug
|
||||||
|
- type: SolutionContainerManager
|
||||||
|
solutions:
|
||||||
|
drink:
|
||||||
|
maxVol: 20
|
||||||
|
reagents:
|
||||||
|
- ReagentId: Meth
|
||||||
|
Quantity: 20
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Objects/Consumable/Drinks/beer.rsi
|
||||||
Reference in New Issue
Block a user