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

Merge branch 'master' into buckle-locker-fix-1262

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-07 20:36:43 +02:00
parent e0f888344e ae41d03ec6
commit 8f685f0541
5598 changed files with 6598 additions and 6497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs
View File

@@ -1,6 +1,5 @@
#nullable enable
using Content.Server.GameObjects.Components.Strap;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Server.Interfaces.GameObjects.Components.Interaction;
using Content.Server.Mobs;
@@ -57,7 +56,7 @@ namespace Content.Server.GameObjects.Components.Mobs
status.ChangeStatusEffectIcon(StatusEffect.Buckled,
Buckled
? BuckledTo!.BuckledIcon
: "/Textures/Mob/UI/Buckle/unbuckled.png");
: "/Textures/Interface/StatusEffects/Buckle/unbuckled.png");
}
}

28
Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs
View File

@@ -39,17 +39,17 @@ namespace Content.Server.GameObjects
[UsedImplicitly]
public static readonly string[] _humanStatusImages =
{
"/Textures/Mob/UI/Human/human0.png",
"/Textures/Mob/UI/Human/human1.png",
"/Textures/Mob/UI/Human/human2.png",
"/Textures/Mob/UI/Human/human3.png",
"/Textures/Mob/UI/Human/human4.png",
"/Textures/Mob/UI/Human/human5.png",
"/Textures/Mob/UI/Human/human6-0.png",
"/Textures/Mob/UI/Human/human6-1.png",
"/Textures/Mob/UI/Human/humancrit-0.png",
"/Textures/Mob/UI/Human/humancrit-1.png",
"/Textures/Mob/UI/Human/humandead.png",
"/Textures/Interface/StatusEffects/Human/human0.png",
"/Textures/Interface/StatusEffects/Human/human1.png",
"/Textures/Interface/StatusEffects/Human/human2.png",
"/Textures/Interface/StatusEffects/Human/human3.png",
"/Textures/Interface/StatusEffects/Human/human4.png",
"/Textures/Interface/StatusEffects/Human/human5.png",
"/Textures/Interface/StatusEffects/Human/human6-0.png",
"/Textures/Interface/StatusEffects/Human/human6-1.png",
"/Textures/Interface/StatusEffects/Human/humancrit-0.png",
"/Textures/Interface/StatusEffects/Human/humancrit-1.png",
"/Textures/Interface/StatusEffects/Human/humandead.png",
};
public override void ChangeHudState(DamageableComponent damage)
@@ -67,7 +67,7 @@ namespace Content.Server.GameObjects
}
var modifier = totaldamage / (critvalue / normalstates); //integer division floors towards zero
statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Health,
"/Textures/Mob/UI/Human/human" + modifier + ".png");
"/Textures/Interface/StatusEffects/Human/human" + modifier + ".png");
overlayComponent?.RemoveOverlay(OverlayType.GradientCircleMaskOverlay);
overlayComponent?.RemoveOverlay(OverlayType.CircleMaskOverlay);
@@ -76,7 +76,7 @@ namespace Content.Server.GameObjects
case ThresholdType.Critical:
statusEffectsComponent?.ChangeStatusEffectIcon(
StatusEffect.Health,
"/Textures/Mob/UI/Human/humancrit-0.png");
"/Textures/Interface/StatusEffects/Human/humancrit-0.png");
overlayComponent?.ClearOverlays();
overlayComponent?.AddOverlay(OverlayType.GradientCircleMaskOverlay);
@@ -84,7 +84,7 @@ namespace Content.Server.GameObjects
case ThresholdType.Death:
statusEffectsComponent?.ChangeStatusEffectIcon(
StatusEffect.Health,
"/Textures/Mob/UI/Human/humandead.png");
"/Textures/Interface/StatusEffects/Human/humandead.png");
overlayComponent?.ClearOverlays();
overlayComponent?.AddOverlay(OverlayType.CircleMaskOverlay);

4
Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Server.GameObjects.Components.Mobs
serializer.DataField(ref _helpInterval, "helpInterval", 1f);
serializer.DataField(ref _helpKnockdownRemove, "helpKnockdownRemove", 1f);
serializer.DataField(ref _stunTexture, "stunTexture",
"/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png");
"/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png");
}
/// <summary>
@@ -171,7 +171,7 @@ namespace Content.Server.GameObjects.Components.Mobs
Timer.Spawn(((int) _helpInterval * 1000), () => _canHelp = true);
EntitySystem.Get<AudioSystem>()
.PlayFromEntity("/Audio/effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f));
.PlayFromEntity("/Audio/Effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f));
_knockdownTimer -= _helpKnockdownRemove;