From: āda Date: Wed, 7 Jan 2026 16:05:58 +0000 (-0600) Subject: Grappling gun rope visual change (#42207) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d65aa07a843836e6629b50761ae18075012d5d8f;p=space-station-14.git Grappling gun rope visual change (#42207) * sprite changes * system changes --------- Co-authored-by: iaada --- diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs index 77af2e6543..47e726b0e7 100644 --- 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(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(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 0b79c8618b..f84b63ff3e 100644 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 0de49fca27..d383045c47 100644 --- 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 4367a5ed61..006225853e 100644 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 f96629f129..1570dc188a 100644 --- 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