Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Random fixes (#668)

Browse Source 
* fix captain headrev

* fix double lathe recipe

* fix security webbing whitelist

* fix defibrillator doafter

* revert hardsuits armor stats
This commit is contained in:
ThereDrD
2024-08-27 14:32:28 +03:00
committed by GitHub
parent 82309e9b7b
commit 4a7dd80442
7 changed files with 79 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
View File

@@ -74,7 +74,6 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
base.Started(uid, component, gameRule, args);
component.CommandCheck = _timing.CurTime + component.TimerWait;
}
protected override void ActiveTick(EntityUid uid, RevolutionaryRuleComponent component, GameRuleComponent gameRule, float frameTime)
{
base.ActiveTick(uid, component, gameRule, frameTime);
@@ -102,8 +101,10 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
var revsLost = CheckRevsLose();
var commandLost = CheckCommandLose();
// This is (revsLost, commandsLost) concatted together
// (moony wrote this comment idk what it means)
var index = (commandLost ? 1 : 0) | (revsLost ? 2 : 0);
args.AddLine(Loc.GetString(Outcomes[index]));

16
Content.Server/Medical/DefibrillatorSystem.cs
View File

@@ -62,13 +62,14 @@ public sealed class DefibrillatorSystem : EntitySystem
// WD START
private void OnStaminaHitAttempt(Entity<DefibrillatorComponent> ent, ref StaminaDamageOnHitAttemptEvent args)
{
var (uid, comp) = ent;
if (comp.Enabled && _powerCell.TryUseActivatableCharge(uid))
if (ent.Comp.Enabled && _powerCell.TryUseActivatableCharge(ent))
{
if (!_powerCell.HasActivatableCharge(uid))
TryDisable(uid, comp);
comp.NextZapTime = _timing.CurTime + TimeSpan.FromSeconds(3);
_appearance.SetData(uid, DefibrillatorVisuals.Ready, false);
if (!_powerCell.HasActivatableCharge(ent))
TryDisable(ent);
ent.Comp.NextZapTime = _timing.CurTime + TimeSpan.FromSeconds(3);
_appearance.SetData(ent, DefibrillatorVisuals.Ready, false);
return;
}
@@ -194,10 +195,11 @@ public sealed class DefibrillatorSystem : EntitySystem
return false;
_audio.PlayPvs(component.ChargeSound, uid);
return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
uid, target, uid)
{
BreakOnMove = user == target, // WD EDIT
BreakOnMove = user != target, // WD EDIT
DuplicateCondition = DuplicateConditions.None, // WD EDIT
BlockDuplicate = true,
BreakOnHandChange = true,

2
Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
View File

@@ -50,7 +50,9 @@ public sealed class SharedRevolutionarySystem : EntitySystem
{
var stunTime = TimeSpan.FromSeconds(4);
var name = Identity.Entity(uid, EntityManager);
RemComp<RevolutionaryComponent>(uid);
_sharedStun.TryParalyze(uid, stunTime, true);
_popupSystem.PopupEntity(Loc.GetString("rev-break-control", ("name", name)), uid);
}

2
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View File

@@ -655,7 +655,7 @@
- CartridgeAmmo
- type: entity
parent: ClothingBeltSecurity
parent: ClothingBeltStorageBase
id: ClothingBeltSecurityWebbing
name: security webbing
description: Unique and versatile chest rig, can hold security gear.

141
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
View File

@@ -52,11 +52,12 @@
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.8
Heat: 0.2
Radiation: 0.5
Caustic: 0.5
- type: ClothingSpeedModifier
walkModifier: 0.7
sprintModifier: 0.7
walkModifier: 0.75
sprintModifier: 0.75
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitAtmos
@@ -75,6 +76,8 @@
- type: PressureProtection
highPressureMultiplier: 0.04
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.01
- type: ExplosionResistance
damageCoefficient: 0.5
- type: Armor
@@ -87,8 +90,8 @@
Caustic: 0.5
Radiation: 0.2
- type: ClothingSpeedModifier
walkModifier: 0.7
sprintModifier: 0.7
walkModifier: 0.85
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitEngineering
@@ -117,7 +120,7 @@
Caustic: 0.8
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.8
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSpatio
@@ -143,12 +146,13 @@
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.5
Piercing: 0.7
Radiation: 0.3
Heat: 0.8
Caustic: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.75
walkModifier: 0.85
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSalvage
@@ -175,8 +179,9 @@
Blunt: 0.6
Slash: 0.6
Piercing: 0.5
Heat: 0.3
Heat: 0.5
Radiation: 0.1
Caustic: 0.5
- type: ExplosionResistance
damageCoefficient: 0.2
- type: TemperatureProtection
@@ -207,16 +212,17 @@
Slash: 0.6
Piercing: 0.6
Caustic: 0.7
Heat: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.75
walkModifier: 0.85
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSecurity
#Brigmedic Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
parent: ClothingOuterHardsuitSecurity
id: ClothingOuterHardsuitBrigmedic
name: brigmedic hardsuit
description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit.
@@ -225,25 +231,19 @@
sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi
- type: PressureProtection
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Slash: 0.8
Piercing: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.65
sprintModifier: 0.65
- type: HeldSpeedModifier
Heat: 0.9
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic
#Warden's Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
parent: ClothingOuterHardsuitSecurity
id: ClothingOuterHardsuitWarden
name: warden's hardsuit
description: A specialized riot suit geared to combat low pressure environments.
@@ -252,28 +252,20 @@
sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.4
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.6
Piercing: 0.6
Caustic: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.7
sprintModifier: 0.7
- type: HeldSpeedModifier
Blunt: 0.55
Slash: 0.55
Piercing: 0.55
Caustic: 0.65
Heat: 0.65
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitWarden
#Captain's Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
parent: ClothingOuterHardsuitWarden
id: ClothingOuterHardsuitCap
name: captain's armored spacesuit
description: A formal armored spacesuit, made for the station's captain.
@@ -285,13 +277,11 @@
- type: PressureProtection
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Slash: 0.8
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.5
Radiation: 0.5
@@ -299,7 +289,6 @@
- type: ClothingSpeedModifier
walkModifier: 0.8
sprintModifier: 0.8
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCap
@@ -329,8 +318,8 @@
Radiation: 0.0
Caustic: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.8
walkModifier: 0.85
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitEngineeringWhite
@@ -365,7 +354,7 @@
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitRd
name: experimental research hardsuit
description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. Able to be compressed to small sizes.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/rd.rsi
@@ -386,15 +375,16 @@
- type: ExplosionResistance
damageCoefficient: 0.1
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.75
walkModifier: 0.8
sprintModifier: 0.8
- type: HeldSpeedModifier
- type: Item
size: Normal
size: Huge
- type: Tag
tags:
- WhitelistChameleon
- HighRiskItem
- Hardsuit
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitRd
- type: StaticPrice
@@ -474,8 +464,6 @@
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
- type: Item
size: Huge
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
- type: PressureProtection
@@ -540,15 +528,13 @@
coefficient: 0.001
- type: ExplosionResistance
damageCoefficient: 0.2
- type: FireProtection
reduction: 0.8 # perfect protection like atmos firesuit for pyro tf2 ops
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.2
Blunt: 0.5
Slash: 0.5
Piercing: 0.5
Heat: 0.4
Radiation: 0.01
Caustic: 0.5
- type: Item
@@ -581,7 +567,7 @@
coefficients:
Blunt: 0.4
Slash: 0.4
Piercing: 0.3
Piercing: 0.4
Heat: 0.5
Radiation: 0.25
Caustic: 0.4
@@ -614,12 +600,12 @@
Blunt: 0.2
Slash: 0.2
Piercing: 0.2
Heat: 0.2
Heat: 0.4
Radiation: 0.2
Caustic: 0.2
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.65
sprintModifier: 0.7
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCybersun
@@ -645,14 +631,10 @@
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.4
Heat: 0.25
Piercing: 0.6
Heat: 0.6
Radiation: 0.25
Caustic: 0.75
- type: ClothingSpeedModifier
walkModifier: 0.8
sprintModifier: 0.8
- type: HeldSpeedModifier
Caustic: 0.25
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitWizard
- type: ContainerContainer
@@ -676,6 +658,9 @@
canInteractUse: false
damageEnergyDraw: 15
domePrototype: EnergyDomeSmallPink
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: PowerCellDraw
drawRate: 8
useRate: 0
@@ -871,7 +856,7 @@
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitDeathsquad
name: death squad hardsuit
name: deathsquad hardsuit
description: An advanced hardsuit favored by commandos for use in special operations.
components:
- type: Sprite
@@ -881,25 +866,23 @@
- type: PressureProtection
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.001
- type: ExplosionResistance
damageCoefficient: 0.2
- type: Armor
modifiers:
coefficients:
Blunt: 0.1 #best armor in the game
Slash: 0.1
Piercing: 0.1
Heat: 0.1
Radiation: 0.1
Caustic: 0.1
- type: ClothingSpeedModifier
walkModifier: 1.0
sprintModifier: 1.0
- type: HeldSpeedModifier
- type: Armor
modifiers:
coefficients:
Blunt: 0.2 #best armor in the game
Slash: 0.2
Piercing: 0.2
Heat: 0.2
Radiation: 0.2
Caustic: 0.2
- type: ExplosionResistance
damageCoefficient: 0.2
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad
- type: GiftIgnore
#CBURN Hardsuit
- type: entity

3
Resources/Prototypes/GameRules/roundstart.yml
View File

@@ -184,6 +184,9 @@
mindComponents:
- type: RevolutionaryRole
prototype: HeadRev
blacklist: # WD
components:
- CommandStaff
- type: entity
id: Sandbox

8
Resources/Prototypes/Recipes/Lathes/security.yml
View File

@@ -406,14 +406,6 @@
materials:
Steel: 300
- type: latheRecipe # WD
id: MagazinePistolCaselessRifle
result: MagazinePistolCaselessRifle
category: Ammo
completetime: 5
materials:
Steel: 300
- type: latheRecipe
id: ShellShotgunIncendiary
result: ShellShotgunIncendiary