From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 18 May 2023 02:07:10 +0000 (+1000) Subject: Add tethergun lathe recipe (#16551) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3c3762f2eef03a520b853e20a153b21cedf8ead3;p=space-station-14.git Add tethergun lathe recipe (#16551) --- diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs index 67fb9904a7..f6d65c862d 100644 --- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs +++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs @@ -247,7 +247,7 @@ public abstract class SharedTetherGunSystem : EntitySystem _appearance.SetData(gunUid, TetherVisualsStatus.Key, false, appearance); _appearance.SetData(gunUid, ToggleableLightVisuals.Enabled, false, appearance); - RemCompDeferred(component.Tethered.Value); + RemComp(component.Tethered.Value); _blocker.UpdateCanMove(component.Tethered.Value); component.Tethered = null; Dirty(component); diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 24127c16bb..b0cb852142 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -99,3 +99,12 @@ Steel: 1500 Plastic: 750 Plasma: 1000 + +- type: latheRecipe + id: WeaponTetherGun + result: WeaponTetherGun + completetime: 5 + materials: + Steel: 500 + Glass: 400 + Silver: 100 diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index f6f940a997..5bc6c623c7 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -116,18 +116,6 @@ recipeUnlocks: - TraversalDistorterMachineCircuitboard -- type: technology - id: GravityManipulation - name: research-technology-gravity-manipulation - icon: - sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi - state: base - discipline: Experimental - tier: 2 - cost: 7500 - recipeUnlocks: - - WeaponTetherGun - - type: technology id: MobileAnomalyTech name: research-technology-mobile-anomaly-tech @@ -172,3 +160,15 @@ - SuperCapacitorStockPart - SuperMatterBinStockPart - PicoManipulatorStockPart + +- type: technology + id: GravityManipulation + name: research-technology-gravity-manipulation + icon: + sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi + state: base + discipline: Experimental + tier: 3 + cost: 10000 + recipeUnlocks: + - WeaponTetherGun