first bug fixes

This commit is contained in:
HappyRoach
2025-12-19 13:25:54 +03:00
parent 52a2289a31
commit 6c632dcfb7
10 changed files with 40 additions and 13 deletions

View File

@@ -1,5 +1,6 @@
using Content.Shared.Hands.Components;
using Content.Shared.Stunnable;
using Content.Shared.Zombies; // Corvax-Wega-Zombie-Crawl
namespace Content.Shared.Hands.EntitySystems;
@@ -37,9 +38,16 @@ public abstract partial class SharedHandsSystem
// Can't crawl around without any hands.
// Entities without the HandsComponent will always have full crawling speed.
if (totalHands == 0)
args.SpeedModifier = 0f;
// Corvax-Wega-Zombie-Crawl-start
if (!TryComp<ZombieComponent>(ent, out var _))
{
if (totalHands == 0)
args.SpeedModifier = 0f;
else
args.SpeedModifier *= (float)freeHands / totalHands;
}
else
args.SpeedModifier *= (float)freeHands / totalHands;
args.SpeedModifier *= 1;
// Corvax-Wega-Zombie-Crawl-end
}
}

View File

@@ -23,6 +23,7 @@ using Robust.Shared.Physics;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Content.Shared.Zombies; // Corvax-Wega-Zombie-Crawl
namespace Content.Shared.Stunnable;
@@ -72,6 +73,7 @@ public abstract partial class SharedStunSystem
SubscribeLocalEvent<KnockedDownComponent, HandCountChangedEvent>(OnHandCountChanged);
SubscribeLocalEvent<GravityAffectedComponent, KnockDownAttemptEvent>(OnKnockdownAttempt);
SubscribeLocalEvent<GravityAffectedComponent, GetStandUpTimeEvent>(OnGetStandUpTime);
SubscribeLocalEvent<KnockedDownComponent, EntityZombifiedEvent>(OnZombified); // Corvax-Wega-Zombie-Crawl
// Handling Alternative Inputs
SubscribeAllEvent<ForceStandUpEvent>(OnForceStandup);
@@ -570,6 +572,16 @@ public abstract partial class SharedStunSystem
args.DoAfterTime = TimeSpan.Zero;
}
// Corvax-Wega-Zombie-Crawl-start
private void OnZombified(Entity<KnockedDownComponent> entity, ref EntityZombifiedEvent args)
{
if (GameTiming.ApplyingState)
return; // The result of the change is already networked separately in the same game state
RefreshKnockedMovement(entity);
}
// Corvax-Wega-Zombie-Crawl-end
#endregion
#region Action Blockers

View File

@@ -75,3 +75,6 @@ auto_call_time = 150
preset_enabled = false
timerpreset = 240
map_enabled = true
[chat]
max_announcement_length = 512

View File

@@ -16,6 +16,10 @@
- !type:DepartmentTimeRequirement
department: Security
time: 60h
- !type:TraitsRequirement #Corvax-Wega-TraitsRequirement
inverted: true
traits:
- Muted
weight: 9
startingGear: SeniorOfficerGear
icon: "JobIconSeniorOfficer"

View File

@@ -18,7 +18,7 @@
oldAge: 6000
maxAge: 12000
# Corvax-SpeciesAgeLore-End
minHeight: 140 # Corvax-Wega-Height
minHeight: 145 # Corvax-Wega-Height
maxHeight: 225 # Corvax-Wega-Height
- type: speciesBaseSprites

View File

@@ -8,7 +8,7 @@
markingLimits: MobSlimeMarkingLimits
dollPrototype: MobSlimePersonDummy
skinColoration: Hues
minHeight: 140 # Corvax-Wega-Height
minHeight: 145 # Corvax-Wega-Height
maxHeight: 190 # Corvax-Wega-Height
- type: speciesBaseSprites

View File

@@ -14,7 +14,7 @@
sexes:
- Unsexed
# Вот тут мне пох на лор
minHeight: 140 # Corvax-Wega-Height
minHeight: 145 # Corvax-Wega-Height
maxHeight: 180 # Corvax-Wega-Height
- type: speciesBaseSprites

View File

@@ -7,7 +7,7 @@
markingLimits: MobFelinidMarkingLimits
dollPrototype: MobFelinidDummy
skinColoration: HumanToned
minHeight: 140
minHeight: 145
maxHeight: 160
- type: speciesBaseSprites

View File

@@ -11,8 +11,8 @@
naming: First
dollPrototype: MobResomiDummy
skinColoration: Hues
minHeight: 140
maxHeight: 160
minHeight: 155
maxHeight: 175
- type: speciesBaseSprites
id: MobResomiSprites

View File

@@ -11,7 +11,7 @@
description: traitor-greenshift-description
rules:
- Traitor
- SubGamemodesRule
- SubGamemodesRuleNoWizard
- SpaceTrafficControlFriendlyEventScheduler
- BasicRoundstartVariation
@@ -25,7 +25,7 @@
showInVote: false
rules:
- Vampire
- SubGamemodesRule
- SubGamemodesRuleNoWizard
- BasicStationEventScheduler
- MeteorSwarmScheduler
- SpaceTrafficControlEventScheduler
@@ -40,7 +40,7 @@
showInVote: false
rules:
- BloodCult
- SubGamemodesRule
- SubGamemodesRuleNoWizard
- BasicStationEventScheduler
- MeteorSwarmScheduler
- SpaceTrafficControlEventScheduler
@@ -55,7 +55,7 @@
showInVote: false
rules:
- BloodBrothers
- SubGamemodesRule
- SubGamemodesRuleNoWizard
- BasicStationEventScheduler
- MeteorSwarmScheduler
- SpaceTrafficControlEventScheduler