diff --git a/Content.Client/Physics/JointVisualsOverlay.cs b/Content.Client/Physics/JointVisualsOverlay.cs index e0b3499a97..9cc2831d21 100644 --- a/Content.Client/Physics/JointVisualsOverlay.cs +++ b/Content.Client/Physics/JointVisualsOverlay.cs @@ -1,9 +1,8 @@ +using System.Numerics; using Content.Shared.Physics; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Shared.Enums; -using Robust.Shared.Physics; -using Robust.Shared.Physics.Dynamics.Joints; namespace Content.Client.Physics; @@ -16,8 +15,6 @@ public sealed class JointVisualsOverlay : Overlay private IEntityManager _entManager; - private HashSet _drawn = new(); - public JointVisualsOverlay(IEntityManager entManager) { _entManager = entManager; @@ -25,7 +22,6 @@ public sealed class JointVisualsOverlay : Overlay protected override void Draw(in OverlayDrawArgs args) { - _drawn.Clear(); var worldHandle = args.WorldHandle; var spriteSystem = _entManager.System(); @@ -33,12 +29,14 @@ public sealed class JointVisualsOverlay : Overlay var joints = _entManager.EntityQueryEnumerator(); var xformQuery = _entManager.GetEntityQuery(); + args.DrawingHandle.SetTransform(Matrix3x2.Identity); + while (joints.MoveNext(out var visuals, out var xform)) { if (xform.MapID != args.MapId) continue; - var other = visuals.Target; + var other = _entManager.GetEntity(visuals.Target); if (!xformQuery.TryGetComponent(other, out var otherXform)) continue; diff --git a/Content.Server/_Goobstation/Fishing/FishingSystem.cs b/Content.Server/_Goobstation/Fishing/FishingSystem.cs index af623fb4ea..956932d039 100644 --- a/Content.Server/_Goobstation/Fishing/FishingSystem.cs +++ b/Content.Server/_Goobstation/Fishing/FishingSystem.cs @@ -129,7 +129,7 @@ public sealed class FishingSystem : SharedFishingSystem visuals.Sprite = component.RopeSprite; visuals.OffsetA = component.RopeLureOffset; visuals.OffsetB = component.RopeUserOffset; - visuals.Target = uid; + visuals.Target = GetNetEntity(uid); } protected override void ThrowFishReward(EntProtoId fishId, EntityUid fishSpot, EntityUid target) diff --git a/Content.Shared/Physics/JointVisualsComponent.cs b/Content.Shared/Physics/JointVisualsComponent.cs index 4fcf5ca79f..37a9cdc3b1 100644 --- a/Content.Shared/Physics/JointVisualsComponent.cs +++ b/Content.Shared/Physics/JointVisualsComponent.cs @@ -14,7 +14,7 @@ public sealed partial class JointVisualsComponent : Component public SpriteSpecifier Sprite = default!; [ViewVariables(VVAccess.ReadWrite), DataField("target"), AutoNetworkedField] - public EntityUid? Target; + public NetEntity? Target; /// /// Offset from Body A. diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs index 75d5300fdb..d2f0333b83 100644 --- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs +++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs @@ -64,7 +64,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem var visuals = EnsureComp(shotUid.Value); visuals.Sprite = component.RopeSprite; visuals.OffsetA = new Vector2(0f, 0.5f); - visuals.Target = uid; + visuals.Target = GetNetEntity(uid); Dirty(shotUid.Value, visuals); } diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index f27f7364d9..ad47a59bb7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -8,7 +8,7 @@ FlashlightLantern: 2 HandheldGPSBasic: 2 RadioHandheld: 2 -# WeaponGrapplingGun: 4 + # WeaponGrapplingGun: 2 WeaponProtoKineticAccelerator: 4 # WD EDIT START contrabandInventory: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index f7302059da..bcd9a29551 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -210,6 +210,7 @@ weight: 0.5 - id: OxygenTankFilled - id: WelderIndustrial + # - id: WeaponGrapplingGun - !type:GroupSelector children: - id: ClothingHeadHatWelding diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 53f3ff1d1c..b8ff662f92 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -318,7 +318,6 @@ # - state: base # - state: base-unshaded # map: [ "unshaded" ] -# shader: unshaded # visible: true # - type: UseDelay # delay: 1.5 diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 4aaeb3946d..f9fa4d7d8b 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -11,9 +11,8 @@ cost: 7500 recipeUnlocks: - MiningDrill -# - WeaponGrapplingGun - BorgModuleMining -# - BorgModuleGrapplingGun + # - BorgModuleGrapplingGun - MechEquipmentDrill # Goobstation - OreProcessorIndustrialMachineCircuitboard - ClothingMaskWeldingGas diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base-unshaded-off.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base-unshaded-off.png index 035cae01a2..b42d247e5b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base-unshaded-off.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base-unshaded-off.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base-unshaded.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base-unshaded.png index e72bc2ceb7..1f5f2a3d08 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base-unshaded.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base-unshaded.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base.png index 43cec357c2..b49e018656 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/base.png differ 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 a7dc185ce8..0b79c8618b 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/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/inhand-left.png index b678adc868..d17dd07e48 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/inhand-right.png index 38069830b5..afbddd8d19 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi/inhand-right.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 d0ad0d0874..0de49fca27 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": "Sprited by discord emogarbage", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/456cd10d94084c7c2574f628cf7ac9b67087ba26. Recolored, adjusted, and inhands created by EmoGarbage404", "size": { "x": 32, "y": 32