From ca08a045db996ae4fe8e795a358fb204ff166b29 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:19:35 +1200 Subject: [PATCH] Fix a few test failures (#15727) --- .../Shuttles/Components/ThrusterComponent.cs | 3 ++- .../Entities/Objects/Specific/Medical/medkits.yml | 10 +++++++--- .../Prototypes/Entities/Objects/Tools/toolbox.yml | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Content.Server/Shuttles/Components/ThrusterComponent.cs b/Content.Server/Shuttles/Components/ThrusterComponent.cs index bc66b89724..f9c59e4c6f 100644 --- a/Content.Server/Shuttles/Components/ThrusterComponent.cs +++ b/Content.Server/Shuttles/Components/ThrusterComponent.cs @@ -14,10 +14,10 @@ namespace Content.Server.Shuttles.Components /// Whether the thruster has been force to be enabled / disabled (e.g. VV, interaction, etc.) /// [ViewVariables(VVAccess.ReadWrite)] - [DataField("enabled")] public bool Enabled { get => _enabled; + [Obsolete("Use the system method")] set { if (_enabled == value) return; @@ -36,6 +36,7 @@ namespace Content.Server.Shuttles.Components } } + [DataField("enabled")] private bool _enabled = true; /// diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index f41617cd55..30c1527157 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -9,9 +9,9 @@ netsync: false state: firstaid - type: Storage - capacity: 30 + capacity: 35 - type: Item - size: 30 + size: 35 sprite: Objects/Specific/Medical/firstaidkits.rsi heldPrefix: firstaid - type: Tag @@ -93,4 +93,8 @@ - type: Sprite state: blackkit - type: Item - heldPrefix: blackkit + heldPrefix: blackkit + size: 50 + - type: Storage + capacity: 50 + diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 9e5356e572..1a345037b1 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -83,7 +83,7 @@ - type: Item sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi - type: Storage - capacity: 120 + capacity: 170 # this seems silly high - type: MeleeWeapon damage: types: