otherchanges

Author: Zekins3366

Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs

@@ -200,6 +200,9 @@ private void OnEntitySpoke(Entity<VoiceOfGodComponent> ent, ref EntitySpokeEvent
 
     private void ProcessCommand(Entity<VoiceOfGodComponent> ent, VoiceOfGodCommand command, string originalMessage)
     {
+        if (_timing.CurTime < ent.Comp.LastCommandUse + TimeSpan.FromSeconds(ent.Comp.GlobalCooldown))
+            return;
+
         if (ent.Comp.CommandCooldowns.TryGetValue(command.Id, out var lastUse))
         {
             var cooldownEnd = lastUse + TimeSpan.FromSeconds(command.Cooldown);
@@ -214,8 +217,9 @@ private void ProcessCommand(Entity<VoiceOfGodComponent> ent, VoiceOfGodCommand c
         }
 
         ent.Comp.CommandCooldowns[command.Id] = _timing.CurTime;
+        ent.Comp.LastCommandUse = _timing.CurTime;
 
-        _admin.Add(LogType.Action, LogImpact.Medium,
+        _admin.Add(LogType.Action, LogImpact.Extreme,
             $"{ToPrettyString(ent):player} used Voice of God command '{command.Id}' with message: {originalMessage}");
     }
 

Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

@@ -71,8 +71,13 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField, AutoNetworkedField]
     public bool ResistanceBypass = false;
 
-    [DataField, AutoNetworkedField] // Corvax-Wega-Add
-    public bool PossibilityWideAtack = true; // Corvax-Wega-Add
+    // Corvax-Wega-Add-start
+    [DataField, AutoNetworkedField]
+    public bool PossibilityWideAtack = true;
+
+    [DataField, AutoNetworkedField]
+    public bool IgnoreAttempted;
+    // Corvax-Wega-Add-end
 
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.

Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs

@@ -113,7 +113,7 @@ private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEve
 
     private void OnMeleeShotAttempted(EntityUid uid, MeleeWeaponComponent comp, ref ShotAttemptedEvent args)
     {
-        if (comp.NextAttack > Timing.CurTime)
+        if (comp.NextAttack > Timing.CurTime && !comp.IgnoreAttempted) // Corvax-Wega-Edit
             args.Cancel();
     }
 
@@ -220,14 +220,16 @@ private void OnLightAttack(LightAttackEvent msg, EntitySessionEventArgs args)
 
     private void OnHeavyAttack(HeavyAttackEvent msg, EntitySessionEventArgs args) // Corvax-Wega-Change
     {
-        var weapon = GetEntity(msg.Weapon); // Corvax-Wega-Add
-        if (args.SenderSession.AttachedEntity is not { } user // Corvax-Wega-Change
-            || TerminatingOrDeleted(user) || TerminatingOrDeleted(weapon)) // Corvax-Wega-Change
+        // Corvax-Wega-Change-start
+        var weapon = GetEntity(msg.Weapon);
+        if (args.SenderSession.AttachedEntity is not { } user
+            || TerminatingOrDeleted(user) || TerminatingOrDeleted(weapon))
             return;
 
-        if (!TryGetWeapon(user, out var weaponUid, out var weaponComp) // Corvax-Wega-Change
-            || weaponUid != weapon || !weaponComp.PossibilityWideAtack) // Corvax-Wega-Change
+        if (!TryGetWeapon(user, out var weaponUid, out var weaponComp)
+            || weaponUid != weapon || !weaponComp.PossibilityWideAtack)
             return;
+        // Corvax-Wega-Change-end
 
         AttemptAttack(user, weaponUid, weaponComp, msg, args.SenderSession);
     }

Content.Shared/_Wega/Lavaland/Components/Artefacts/VoiceOfGodComponent.cs

@@ -5,8 +5,14 @@ namespace Content.Shared.Lavaland.Artefacts.Components;
 [RegisterComponent]
 public sealed partial class VoiceOfGodComponent : Component
 {
+    [DataField]
+    public float GlobalCooldown = 30f;
+
     [ViewVariables(VVAccess.ReadOnly)]
     public Dictionary<string, TimeSpan> CommandCooldowns = new();
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public TimeSpan LastCommandUse = TimeSpan.Zero;
 }
 
 [RegisterComponent]

Content.Shared/_Wega/Weapons/Misc/Upgrades/Components/CrusherWatcherWingUpgradeComponent.cs

@@ -6,5 +6,5 @@ namespace Content.Shared.Weapons.Misc.Upgrades;
 public sealed partial class CrusherWatcherWingUpgradeComponent : Component
 {
     [DataField]
-    public float ResetsTime = 1.5f;
+    public float ResetsTime = 1f;
 }

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -205,7 +205,7 @@
   - type: Clothing
     sprite: Clothing/Belt/militarywebbing.rsi
   - type: ExplosionResistance
-    damageCoefficient: 0.1
+    damageCoefficient: 0 # Corvax-Wega-Edit
   - type: StaticPrice
     price: 500
   # Corvax-Wega-Dirtable-start

Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml

@@ -464,6 +464,7 @@
     sprite: _Wega/Mobs/Lavaland/colossus.rsi
     state: colossus
   - type: MeleeWeapon
+    ignoreAttempted: true
     altDisarm: false
     attackRate: 0.25
     damage:
@@ -487,6 +488,7 @@
     showExamineText: false
     soundGunshot: null
     soundEmpty: null
+  - type: VoiceOfGod # Maybe...
   - type: Pullable
   - type: MovementSpeedModifier
     baseWalkSpeed: 1.125
@@ -549,6 +551,7 @@
       Dead:
         Base: dragon_dead
   - type: MeleeWeapon
+    ignoreAttempted: true
     altDisarm: false
     angle: 0
     animation: WeaponArcBite

Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/throphies.yml

@@ -78,7 +78,7 @@
     tags: [ CrusherUpgradeWatcher ]
     examineText: crusher-upgrade-examine-text-ice-watcher
   - type: CrusherWatcherWingUpgrade
-    resetsTime: 2.8
+    resetsTime: 2
 
 - type: entity
   parent: BaseTrophyLavaland

Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/specific.yml

@@ -9,7 +9,7 @@
     ignoreTargeted: true
     damage:
       types:
-        Blunt: 25 #JUDGEMENT!
+        Blunt: 20 #JUDGEMENT!
   - type: Sprite
     sprite: _Wega/Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     layers:

Resources/migration.yml

@@ -797,3 +797,6 @@ HandheldHealthAnalyzerEmpty: HandheldHealthAnalyzer
 
 #2026-01-09
 BorgModuleAdvancedChemical: BorgModuleAdvancedTopical
+
+#2026-03-11 - CW
+SpawnMobSlimeGray: null