From 0fd3e8a57e4be4e2d892f602ea97c2f31aea3f84 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Sun, 7 Mar 2021 01:05:57 -0800 Subject: [PATCH] Update WelderRefinable usages to new SheetGlass id (#3539) --- .../Components/Construction/WelderRefinableComponent.cs | 4 ++-- .../Prototypes/Entities/Objects/Materials/shards.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs b/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs index d0d5961b62..68e46f2862 100644 --- a/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.GameObjects.Components.Interactable; @@ -22,7 +22,7 @@ namespace Content.Server.GameObjects.Components.Construction { [ViewVariables] [DataField("refineResult")] - private HashSet? _refineResult = new() { "GlassStack" }; + private HashSet? _refineResult = new() { }; [ViewVariables] [DataField("refineTime")] private float _refineTime = 2f; diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index 58eb23a8cd..674dfa8725 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -34,7 +34,7 @@ color: "#bbeeff" - type: WelderRefinable refineResult: - - GlassStack + - SheetGlass - type: entity id: ShardGlassReinforced @@ -48,7 +48,7 @@ color: "#96cdef" - type: WelderRefinable refineResult: - - GlassStack + - SheetGlass - SheetSteel - type: DamageOtherOnHit amount: 10 @@ -65,7 +65,7 @@ color: "#f3b489" - type: WelderRefinable refineResult: - - GlassStack - - PlasmaStack + - SheetGlass + - SheetPlasma - type: DamageOtherOnHit amount: 15