фикс милир, энергощита и следов резоми (#3600)

This commit is contained in:
banumbas 2026-01-04 12:48:56 +03:00 committed by GitHub
parent 5b5bde621f
commit d9f405de74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 28 deletions

View file

@ -1,7 +1,6 @@
using Content.Client._Sunrise.BloodCult;
using Content.Shared._Sunrise.Abilities.Milira;
using Content.Shared._Sunrise.Mood;
using Content.Shared._Sunrise.Mood;
using Robust.Client.GameObjects;
using Robust.Shared.Utility;
@ -47,10 +46,10 @@ public sealed class MoodVisualizerSystem : VisualizerSystem<MoodVisualsComponent
UpdateAppearance(ent, sprite, appearance);
}
private void OnAppearanceChange(Entity<MoodVisualsComponent> ent, ref AppearanceChangeEvent args)
protected override void OnAppearanceChange(EntityUid uid, MoodVisualsComponent component, ref AppearanceChangeEvent args)
{
if (args.Sprite != null)
UpdateAppearance(ent, args.Sprite, args.Component);
UpdateAppearance((uid, component), args.Sprite, args.Component);
}
private bool ShouldHideMoodVisuals(Entity<MoodVisualsComponent> ent)

View file

@ -631,7 +631,7 @@
color: white
- type: ItemTogglePointLight
- type: Reflect
reflectProb: 0.95
reflectProb: 1 # Sunrise-Edit
reflects:
- Energy
- type: Blocking
@ -653,30 +653,17 @@
- type: Appearance
- type: Damageable
damageContainer: Shield
- type: ExaminableDamage
messages: EnergyShieldMessages
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 180
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 100
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
- !type:SpawnEntitiesBehavior
spawn:
BrokenEnergyShield:
min: 1
max: 1
# Sunrise-Start
- type: BatterySelfRecharger
autoRechargeRate: 75
autoRechargePauseTime: 5
- type: EnergyShield
energyCostPerDamage: 15
- type: ExaminableBattery
- type: Battery
maxCharge: 1500
startingCharge: 1500
- type: EmpImmune
- type: StaticPrice
price: 7000
# Sunrise-End

View file

@ -97,6 +97,11 @@
collection: ResomiChirp
interactFailureSound:
path: /Audio/Items/wirecutter.ogg
- type: FootprintEmitter
leftBareFootState:
- "footprint-left-bare-spider"
rightBareFootState:
- "footprint-right-bare-spider"
- type: Hands
leftHandDisplacement:
sizeMaps: