tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update WelderRefinable usages to new SheetGlass id (#3539)

Browse Source
This commit is contained in:
ShadowCommander
2021-03-07 01:05:57 -08:00
committed by GitHub
parent e919a82874
commit 0fd3e8a57e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable #nullable enable
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Interactable;
@@ -22,7 +22,7 @@ namespace Content.Server.GameObjects.Components.Construction
{ {
[ViewVariables] [ViewVariables]
[DataField("refineResult")] [DataField("refineResult")]
private HashSet<string>? _refineResult = new() { "GlassStack" }; private HashSet<string>? _refineResult = new() { };
[ViewVariables] [ViewVariables]
[DataField("refineTime")] [DataField("refineTime")]
private float _refineTime = 2f; private float _refineTime = 2f;

8
Resources/Prototypes/Entities/Objects/Materials/shards.yml
View File

@@ -34,7 +34,7 @@
color: "#bbeeff" color: "#bbeeff"
- type: WelderRefinable - type: WelderRefinable
refineResult: refineResult:
- GlassStack - SheetGlass
- type: entity - type: entity
id: ShardGlassReinforced id: ShardGlassReinforced
@@ -48,7 +48,7 @@
color: "#96cdef" color: "#96cdef"
- type: WelderRefinable - type: WelderRefinable
refineResult: refineResult:
- GlassStack - SheetGlass
- SheetSteel - SheetSteel
- type: DamageOtherOnHit - type: DamageOtherOnHit
amount: 10 amount: 10
@@ -65,7 +65,7 @@
color: "#f3b489" color: "#f3b489"
- type: WelderRefinable - type: WelderRefinable
refineResult: refineResult:
- GlassStack - SheetGlass
- PlasmaStack - SheetPlasma
- type: DamageOtherOnHit - type: DamageOtherOnHit
amount: 15 amount: 15