From d65aa07a843836e6629b50761ae18075012d5d8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C4=81da?= Date: Wed, 7 Jan 2026 10:05:58 -0600 Subject: [PATCH] Grappling gun rope visual change (#42207) * sprite changes * system changes --------- Co-authored-by: iaada --- .../Weapons/Misc/SharedGrapplingGunSystem.cs | 5 ++--- .../Guns/Launchers/grappling_gun.rsi/hook.png | Bin 737 -> 715 bytes .../Guns/Launchers/grappling_gun.rsi/meta.json | 2 +- .../Guns/Launchers/sticky_hand.rsi/hook.png | Bin 343 -> 338 bytes .../Guns/Launchers/sticky_hand.rsi/meta.json | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) 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 0b79c8618b8b1e8c07bc0714aa3aeeb94a92a9a5..f84b63ff3ee8ca38c82ae66e2f9612e4bd1cc1e8 100644 GIT binary patch delta 691 zcmV;k0!;nk1N~}T!4+#EE_9%mC^O74kAg;- z9C=C%k;6j4A%8}ch>yRg;-9CCMxGox3R4s?Q7eALANmwEgzm?pYO56~0LYmPyq!W@ z3Oa9~Wzoy6de6x{B-UZ}8us>~KMUb>!3`LouU5$=f>I>uo-MbL*s3o&Ld>lu5d)?D841|cZ z=AMV&Fn=>m)9T#E)PZGX-`niHhr{t5LI_!TSs)@g=g1iIqs@p&ZQEXq8)L{hmwcLJ z2duR_r4;pjA43FJs)}M#N~o#|lv2s+lLnS1wALV{{9-y$*&mNB0X00^{A?CRE9xS@91K2urIY#1u#`T|zUNdqRVTSoP ZoB{mHgjg9Z>&pND002ovPDHLkV1mq#Mce=Y delta 713 zcmV;)0yh221>psdB!7izLqkwWLqi~Na&Km7Y-IodD3N`UJxIeq9K~N-OGPUp77=mC zP<643ia3@k7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rv#YxdcO8j3^ zXc6PVaX;SOd)&PPyp0M|jIJo4sHUEZ$AoNdRS3Mok0JD80)GP{Gqgl{F$34}bq^0; z?;U2TkN3Kf_zi}?w?B$su zJ(HRz4iO8*4wgEYm2`!8hBz!MD&>2#4$GXkI4hMJYu%H-Fql_Y(p;xGia3^#KoSBZ z)KEqRCL*+|q<e(*o|-K|lWo^q0cF~I*~Ss!CS zU>9iCE$jQ(vYID=?-{sK+x}_;nENEX-qylLK>s#yaoyIWJ>YT&7=F@3U9=@1O>dz9 zyr0oG<$%Fkpl8kLt+kKS2OvXTE#CkKhroD|ve#YS-GANL+rMX8{rv!@L2|op@qcIl z009?CL_t(oh3%CwYQ!)QMgNA>u2uO0dx0hGHUlozgp|q!qRMA*VSE6A&mkYfS8yRz zZJ|C)DjA1t@Y>oC67(xE(&#_U3KMU&>5G+_vr2xG{#EbE~act$?-mpp@di?_-E#{2D9(NGVZO6_iq|uU`dNLTIfa zrThf4G>>~_S>9w00GoP4MBFqDy!Z3qg%D5_#X@W>gg{-_H}`$>aKtiets#V%=(d2w0gdY)H~kLeSB$f={*68Wt#^dTQ+&)+00000NkvXXu0mjf7f?!k 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 4367a5ed61dc75b0a247b05e2ba438184e284abc..006225853eb1820a44bc1a9296c1235bc6ec158d 100644 GIT binary patch delta 251 zcmVA6e-R~WMlarH^latdwD=M?$a5@g3+_BpZ z=gR<5nGL!%Rm|30HFDg0!iQdVzykqQoRjV(1E9Gld;kFGWj8ygLXZHKm7_2LnTy#OLl&V7EN!LdlLxjF|5;q zsdnBE@_HW)b?2J^gn6Q^XqkekNC12<$OgKpu>z>#obf=65Nk=GVVEa_2{1PWK#1AL z6N5FwcfW=Npfg*GST`*?Sxv#TQmhc)**4?P^aPdfh8a!i5##^>002ovPDHLkV1gNy BaTWjo delta 256 zcmV+b0ssEe0@nhNF#!>gGBSTfp%n5jCI<6=_j?DhK~b3vr^|WRa>rrI$9u>DH~h-wP} 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 -- 2.52.0