From def4473ed268fdad8e920306a51c35ac95c2fc2a Mon Sep 17 00:00:00 2001 From: keronshb <54602815+keronshb@users.noreply.github.com> Date: Mon, 23 May 2022 19:11:17 -0400 Subject: [PATCH] Fixes some high speed item issues (#8361) --- .../Damage/Components/DamageOnHighSpeedImpactComponent.cs | 2 +- .../Prototypes/Entities/Objects/Consumable/Food/produce.yml | 2 +- Resources/Prototypes/Entities/Objects/Devices/pda.yml | 2 +- .../Prototypes/Entities/Objects/Specific/Janitorial/soap.yml | 2 +- Resources/Prototypes/Reagents/cleaning.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs index 3882b2ed39..914d940ef3 100644 --- a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs +++ b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs @@ -12,7 +12,7 @@ namespace Content.Server.Damage.Components [DataField("minimumSpeed")] public float MinimumSpeed { get; set; } = 20f; [DataField("factor")] - public float Factor { get; set; } = 1f; + public float Factor { get; set; } = 0.5f; [DataField("soundHit", required: true)] public SoundSpecifier SoundHit { get; set; } = default!; [DataField("stunChance")] diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index e0e763dcb5..3e8f822f0f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -177,7 +177,7 @@ sprite: Objects/Specific/Hydroponics/banana.rsi HeldPrefix: peel - type: Slippery - launchForwardsMultiplier: 6.0 + launchForwardsMultiplier: 1.5 - type: StepTrigger intersectRatio: 0.2 - type: CollisionWake diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index e57306910b..d612d6db9f 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -192,7 +192,7 @@ state: pda-clown - type: Slippery paralyzeTime: 4 - launchForwardsMultiplier: 9.0 + launchForwardsMultiplier: 1.5 - type: StepTrigger - type: CollisionWake enabled: false diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index d30c061533..984c077624 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -14,7 +14,7 @@ sprite: Objects/Specific/Janitorial/soap.rsi - type: Slippery paralyzeTime: 2 - launchForwardsMultiplier: 6.0 + launchForwardsMultiplier: 1.5 - type: StepTrigger intersectRatio: 0.2 - type: CollisionWake diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index 50c063b029..e5b08a194f 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -36,7 +36,7 @@ physicalDesc: reagent-physical-desc-shiny color: "#77b58e" boilingPoint: 290.0 # Glycerin - meltingPoint: 18.2 + meltingPoint: 18.2 tileReactions: - !type:SpillTileReaction paralyzeTime: 3