]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix a few test failures (#15727)
authorLeon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Mon, 24 Apr 2023 07:19:35 +0000 (19:19 +1200)
committerGitHub <noreply@github.com>
Mon, 24 Apr 2023 07:19:35 +0000 (17:19 +1000)
Content.Server/Shuttles/Components/ThrusterComponent.cs
Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
Resources/Prototypes/Entities/Objects/Tools/toolbox.yml

index bc66b897242d6825812ff9b31130f827b08f09e4..f9c59e4c6f069258a366c0625a21183003c9bbdd 100644 (file)
@@ -14,10 +14,10 @@ namespace Content.Server.Shuttles.Components
         /// Whether the thruster has been force to be enabled / disabled (e.g. VV, interaction, etc.)
         /// </summary>
         [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;
 
         /// <summary>
index f41617cd553bfb02c654ffa54d3ecd23caa46181..30c15271578e64ca291ad7758fb0d1d7493e3124 100644 (file)
@@ -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
+    
index 9e5356e5728005ec2cd3c99c7a60e667a0298224..1a345037b140ee3c6c6425443d545cfd3cbce8b7 100644 (file)
@@ -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: