Grappling gun rope visual change (#42207)

* sprite changes

* system changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>

diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index 77af2e6543596c757f50797f86565534c59dab65..47e726b0e73ba2cd0d0e6fd27c1b45a8c707847b 100644 (file)
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -65,7 +65,6 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
             Dirty(uid, component);
             var visuals = EnsureComp<JointVisualsComponent>(shotUid.Value);
             visuals.Sprite = component.RopeSprite;
-            visuals.OffsetA = new Vector2(0f, 0.5f);
             visuals.Target = uid;
             Dirty(shotUid.Value, visuals);
         }
@@ -229,10 +228,10 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
             return;
 
         var jointComp = EnsureComp<JointComponent>(uid);
-        var joint = _joints.CreateDistanceJoint(uid, args.Weapon.Value, anchorA: new Vector2(0f, 0.5f), id: GrapplingJoint);
+        var joint = _joints.CreateDistanceJoint(uid, args.Weapon.Value, id: GrapplingJoint);
         joint.MaxLength = joint.Length + 0.2f;
         joint.Stiffness = 1f;
-        joint.MinLength = 0.35f;
+        joint.MinLength = 1f; // Length of a tile to prevent pulling yourself into / through walls
         // Setting velocity directly for mob movement fucks this so need to make them aware of it.
         // joint.Breakpoint = 4000f;
         Dirty(uid, jointComp);

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/hook.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/hook.png
index 0b79c8618b8b1e8c07bc0714aa3aeeb94a92a9a5..f84b63ff3ee8ca38c82ae66e2f9612e4bd1cc1e8 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/hook.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/hook.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/meta.json
index 0de49fca278efd0b2611b08e14d1c618c3985091..d383045c47548376b1e43884e124e8c6aecbc685 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/456cd10d94084c7c2574f628cf7ac9b67087ba26. Recolored, adjusted, and inhands created by EmoGarbage404",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/456cd10d94084c7c2574f628cf7ac9b67087ba26. Recolored, adjusted, and inhands created by EmoGarbage404. A portion of 'hook' removed by iaada.",
     "size": {
         "x": 32,
         "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png
index 4367a5ed61dc75b0a247b05e2ba438184e284abc..006225853eb1820a44bc1a9296c1235bc6ec158d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
index f96629f1291a8abcf0477e16c2ab9a211dd8e5b5..1570dc188ab0fd80b72870d79ba686fa737f5805 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprited by august-sun(GitHub)/augustsun(Discord) for Space Station 14.",
+    "copyright": "Sprited by august-sun(GitHub)/augustsun(Discord) for Space Station 14. A portion of 'hook' removed by iaada.",
     "size": {
         "x": 32,
         "y": 32