Commentary fixed

13lackHawk · May 11, 2024 · eda3b1c · eda3b1c
1 parent b6edf45
commit eda3b1c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -150,8 +150,7 @@ private void HandleExplodeTrigger(EntityUid uid, ExplodeOnTriggerComponent compo
         private void HandleFlashTrigger(EntityUid uid, FlashOnTriggerComponent component, TriggerEvent args)
         {
             // TODO Make flash durations sane ffs.
-            _flashSystem.FlashArea(uid, args.User, force: false, component.Range, component.Duration * 1000f);
-            // A-13 force set to false due usage for trigger granades only and to not break balance. - 'PenPlus+'
+            _flashSystem.FlashArea(uid, args.User, force: false, component.Range, component.Duration * 1000f); // A-13 'force: false' set to false due usage for trigger granades only and to not break balance. - 'PenPlus+'
             args.Handled = true;
         }
 

diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
@@ -63,8 +63,7 @@ private void OnFlashMeleeHit(EntityUid uid, FlashComponent comp, MeleeHitEvent a
             args.Handled = true;
             foreach (var e in args.HitEntities)
             {
-                Flash(e, args.User, comp.ForceFlash, uid, comp.FlashDuration, comp.SlowTo, melee: true);
-                // A-13 new variable from component ForceFlash to ignore protection if needed. - 'PenPlus+'
+                Flash(e, args.User, comp.ForceFlash, uid, comp.FlashDuration, comp.SlowTo, melee: true); // A-13 new variable from component ForceFlash to ignore protection if needed. - 'PenPlus+'
             }
         }
 
@@ -74,8 +73,7 @@ private void OnFlashUseInHand(EntityUid uid, FlashComponent comp, UseInHandEvent
                 return;
 
             args.Handled = true;
-            FlashArea(uid, args.User, comp.ForceFlash, comp.Range, comp.AoeFlashDuration, comp.SlowTo, true);
-            // A-13 new variable from component ForceFlash to ignore protection if needed. - 'PenPlus+'
+            FlashArea(uid, args.User, comp.ForceFlash, comp.Range, comp.AoeFlashDuration, comp.SlowTo, true); // A-13 new variable from component ForceFlash to ignore protection if needed. - 'PenPlus+'
         }
 
         private bool UseFlash(EntityUid uid, FlashComponent comp, EntityUid user)
@@ -121,13 +119,13 @@ public void Flash(EntityUid target,
             if (!Resolve(target, ref flashable, false))
                 return;
 
-            if (!force) // A-13 check if flash is forced. - 'PenPlus+'
+            if (!force) // A-13 check if flash is forced. - 'PenPlus+' start
             {
                 var attempt = new FlashAttemptEvent(target, user, used);
                 RaiseLocalEvent(target, attempt, true);
                 if (attempt.Cancelled)
                     return;
-            }
+            } // A-13 check if flash is forced. - 'PenPlus+' end
 
             if (melee)
             {

diff --git a/Content.Shared/Flash/Components/FlashComponent.cs b/Content.Shared/Flash/Components/FlashComponent.cs
@@ -16,10 +16,11 @@ public sealed partial class FlashComponent : Component
         [ViewVariables(VVAccess.ReadWrite)]
         public float Range { get; set; } = 7f;
 
+        // A-13 new variable for component ForceFlash to ignore protection if needed. - 'PenPlus+' start
         [DataField("forceFlash")]
         [ViewVariables(VVAccess.ReadWrite)]
         public bool ForceFlash { get; set; } = false;
-        // A-13 new variable for component ForceFlash to ignore protection if needed. - 'PenPlus+'
+        // A-13 new variable for component ForceFlash to ignore protection if needed. - 'PenPlus+' end
 
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("aoeFlashDuration")]