Merge branch 'unstable'

Fansana · Nov 1, 2024 · c0efed8 · c0efed8
2 parents 8488b4d + 5c94c65
commit c0efed8
Show file tree

Hide file tree

Showing 36 changed files with 220,063 additions and 222,360 deletions.
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Wieldable.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -94,11 +95,27 @@ public override void Update(float frameTime)
         // it's kinda tricky.
         // I think as long as we make secondaries their own component it's probably fine
         // as long as guncomp has an alt-use key then it shouldn't be too much of a PITA to deal with.
-        if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
-        {
-            return;
+        //if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
+        //{
+        //    return;
+        //}
+        // Floof changes from frontier
+        bool gunBoundToUse = false;
+        bool gunBoundToAlt = false;
+
+        if (TryComp<GunComponent>(weaponUid, out var gun)) {
+            gunBoundToUse = gun.UseKey;
+            gunBoundToAlt = !gun.UseKey; //Bound to alt-use when false
+
+            // If ranged mode only works when wielded, do not block melee attacks when unwielded
+            // (e.g. crusher & crusher glaive)
+            if (TryComp<GunRequiresWieldComponent>(weaponUid, out var _) &&
+                TryComp<WieldableComponent>(weaponUid, out var wield)) {
+                gunBoundToUse &= wield.Wielded;
+                gunBoundToAlt &= wield.Wielded;
+            }
         }
-
+        // End Floof changes
         var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
 
         if (mousePos.MapId == MapId.Nullspace)
@@ -118,7 +135,7 @@ public override void Update(float frameTime)
         }
 
         // Heavy attack.
-        if (altDown == BoundKeyState.Down)
+        if (altDown == BoundKeyState.Down && !gunBoundToAlt) //Floof: add !gunBoundToAlt condition
         {
             // If it's an unarmed attack then do a disarm
             if (weapon.AltDisarm && weaponUid == entity)
@@ -139,7 +156,7 @@ public override void Update(float frameTime)
         }
 
         // Light attack
-        if (useDown == BoundKeyState.Down)
+        if (useDown == BoundKeyState.Down && !gunBoundToUse) //Floof: add !gunBoundToAlt condition
         {
             var attackerPos = Transform(entity).MapPosition;
 

diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -653,7 +653,7 @@ Entries:
     - type: Add
       message: >-
         Added a crit state to most Xenos including: Friend, Rouny, Praetorian,
-        Drone, and Ravager.  
+        Drone, and Ravager.
     - type: Fix
       message: 'fixed Friend being unrevivable '
   id: 89
@@ -873,7 +873,7 @@ Entries:
     - type: Add
       message: >-
         several New friendly Xeno experimental subjects much like
-        Friend-shaped. 
+        Friend-shaped.
   id: 119
   time: '2024-09-09T02:04:05.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/145

diff --git a/Resources/Maps/Floof/arena.yml b/Resources/Maps/Floof/arena.yml
@@ -120631,7 +120631,7 @@ entities:
     - type: Transform
       pos: 22.5,-36.5
       parent: 2
-- proto: LockerClown
+- proto: LockerClownFilled
   entities:
   - uid: 17848
     components:
@@ -120852,7 +120852,7 @@ entities:
     - type: Transform
       pos: 16.5,-32.5
       parent: 2
-- proto: LockerMime
+- proto: LockerMimeFilled
   entities:
   - uid: 17870
     components:

diff --git a/Resources/Maps/Floof/asterisk.yml b/Resources/Maps/Floof/asterisk.yml
@@ -49649,7 +49649,7 @@ entities:
     - type: Transform
       pos: 37.25989,-20.5
       parent: 2
-- proto: LockerClown
+- proto: LockerClownFilled
   entities:
   - uid: 7633
     components:
@@ -49759,7 +49759,7 @@ entities:
     - type: Transform
       pos: 37.5,-8.5
       parent: 2
-- proto: LockerMime
+- proto: LockerMimeFilled
   entities:
   - uid: 7651
     components: