]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
More Storage Rebalancing (#21373)
authorNemanja <98561806+EmoGarbage404@users.noreply.github.com>
Wed, 1 Nov 2023 23:19:41 +0000 (19:19 -0400)
committerGitHub <noreply@github.com>
Wed, 1 Nov 2023 23:19:41 +0000 (17:19 -0600)
* the changes...

* eek

66 files changed:
Content.Client/Storage/UI/StorageWindow.cs
Content.Shared/Item/ItemComponent.cs
Content.Shared/Stacks/SharedStackSystem.cs
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
Resources/Prototypes/Catalog/Fills/Boxes/security.yml
Resources/Prototypes/Catalog/Fills/Items/belt.yml
Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Resources/Prototypes/Entities/Clothing/Back/duffel.yml
Resources/Prototypes/Entities/Clothing/Back/satchel.yml
Resources/Prototypes/Entities/Clothing/Back/specific.yml
Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
Resources/Prototypes/Entities/Objects/Fun/crayons.yml
Resources/Prototypes/Entities/Objects/Misc/box.yml
Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
Resources/Prototypes/Entities/Objects/Misc/implanters.yml
Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
Resources/Prototypes/Entities/Objects/Power/powersink.yml
Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
Resources/Prototypes/Entities/Objects/Shields/shields.yml
Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
Resources/Prototypes/Entities/Objects/Tools/flare.yml
Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml

index 5c985779176329c55efec007b064c4734e1789e2..fb3f7cd33fa8c8c6de1fabeac4632fbaae58a572 100644 (file)
@@ -67,7 +67,8 @@ namespace Content.Client.Storage.UI
                 VerticalAlignment = VAlignment.Center
             };
             _information.SetMessage(Loc.GetString("comp-storage-window-weight",
-                ("percent", 0),
+                ("weight", 0),
+                ("maxWeight", 0),
                 ("size", SharedItemSystem.GetItemSizeLocale(ItemSize.Normal))));
 
             vBox.AddChild(_information);
index a14561d76606aa54da20fcc25945fe29aac0972c..2c667b778a2ab2dabc76ad827d5d0ac93627fe6f 100644 (file)
@@ -89,15 +89,15 @@ public enum ItemSize
     /// <summary>
     /// Items that are too large to fit inside of standard bags, but can worn in exterior slots or placed in custom containers.
     /// </summary>
-    Large = 16,
+    Large = 8,
 
     /// <summary>
     /// Items that are too large to place inside of any kind of container.
     /// </summary>
-    Huge = 24,
+    Huge = 16,
 
     /// <summary>
     /// Picture furry gf
     /// </summary>
-    Ginormous = 48
+    Ginormous = 32
 }
index d70dfc52f951196e5a58506aac36914cf0c281e2..756c84cac55eeda926cd6c0634c32a74b7595ad2 100644 (file)
@@ -329,6 +329,9 @@ namespace Content.Shared.Stacks
             if (!Resolve(insertEnt, ref insertStack) || !Resolve(targetEnt, ref targetStack))
                 return false;
 
+            if (insertStack.StackTypeId != targetStack.StackTypeId)
+                return false;
+
             var available = GetAvailableSpace(targetStack);
 
             if (available <= 0)
index 05030edb82074f1bf1ded974728b77bfd46176ce..91405883987911582adf541df3cb21cdb1eb8bfc 100644 (file)
@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.ActionBlocker;
 using Content.Shared.CombatMode;
@@ -473,32 +472,35 @@ public abstract class SharedStorageSystem : EntitySystem
             return false;
         }
 
-        if (item.Size > GetMaxItemSize((uid, storageComp)))
+        if (!_stackQuery.TryGetComponent(insertEnt, out var stack) || !HasSpaceInStacks(uid, stack.StackTypeId))
         {
-            reason = "comp-storage-too-big";
-            return false;
-        }
+            if (item.Size > GetMaxItemSize((uid, storageComp)))
+            {
+                reason = "comp-storage-too-big";
+                return false;
+            }
 
-        if (TryComp<StorageComponent>(insertEnt, out var insertStorage)
-            && GetMaxItemSize((insertEnt, insertStorage)) >= GetMaxItemSize((uid, storageComp)))
-        {
-            reason = "comp-storage-too-big";
-            return false;
-        }
+            if (TryComp<StorageComponent>(insertEnt, out var insertStorage)
+                && GetMaxItemSize((insertEnt, insertStorage)) >= GetMaxItemSize((uid, storageComp)))
+            {
+                reason = "comp-storage-too-big";
+                return false;
+            }
 
-        if (storageComp.MaxSlots != null)
-        {
-            if (storageComp.Container.ContainedEntities.Count >= storageComp.MaxSlots)
+            if (storageComp.MaxSlots != null)
+            {
+                if (storageComp.Container.ContainedEntities.Count >= storageComp.MaxSlots)
+                {
+                    reason = "comp-storage-insufficient-capacity";
+                    return false;
+                }
+            }
+            else if (SharedItemSystem.GetItemSizeWeight(item.Size) + GetCumulativeItemSizes(uid, storageComp) > storageComp.MaxTotalWeight)
             {
                 reason = "comp-storage-insufficient-capacity";
                 return false;
             }
         }
-        else if (SharedItemSystem.GetItemSizeWeight(item.Size) + GetCumulativeItemSizes(uid, storageComp) > storageComp.MaxTotalWeight)
-        {
-            reason = "comp-storage-insufficient-capacity";
-            return false;
-        }
 
         reason = null;
         return true;
@@ -554,7 +556,7 @@ public abstract class SharedStorageSystem : EntitySystem
 
             foreach (var ent in storageComp.Container.ContainedEntities)
             {
-                if (!_stackQuery.TryGetComponent(ent, out var containedStack) || !insertStack.StackTypeId.Equals(containedStack.StackTypeId))
+                if (!_stackQuery.TryGetComponent(ent, out var containedStack))
                     continue;
 
                 if (!_stack.TryAdd(insertEnt, ent, insertStack, containedStack))
@@ -571,18 +573,24 @@ public abstract class SharedStorageSystem : EntitySystem
             }
 
             // Still stackable remaining
-            if (insertStack.Count > 0)
+            if (toInsertCount > 0)
             {
                 // Try to insert it as a new stack.
                 if (!CanInsert(uid, insertEnt, out _, storageComp) ||
                     !storageComp.Container.Insert(insertEnt))
                 {
+                    UpdateUI(uid, storageComp);
+
                     // If we also didn't do any stack fills above then just end
                     // otherwise play sound and update UI anyway.
                     if (toInsertCount == insertStack.Count)
                         return false;
                 }
             }
+            else
+            {
+                UpdateUI(uid, storageComp);
+            }
         }
         // Non-stackable but no insertion for reasons.
         else if (!storageComp.Container.Insert(insertEnt))
@@ -657,11 +665,32 @@ public abstract class SharedStorageSystem : EntitySystem
         //todo maybe this shouldn't be authoritative over weight? idk.
         if (uid.Comp.MaxSlots != null)
         {
-            return uid.Comp.Container.ContainedEntities.Count < uid.Comp.MaxSlots;
+            return uid.Comp.Container.ContainedEntities.Count < uid.Comp.MaxSlots || HasSpaceInStacks(uid);
+        }
+
+        return GetCumulativeItemSizes(uid, uid.Comp) < uid.Comp.MaxTotalWeight || HasSpaceInStacks(uid);
+    }
+
+    private bool HasSpaceInStacks(Entity<StorageComponent?> uid, string? stackType = null)
+    {
+        if (!Resolve(uid, ref uid.Comp))
+            return false;
+
+        foreach (var contained in uid.Comp.Container.ContainedEntities)
+        {
+            if (!_stackQuery.TryGetComponent(contained, out var stack))
+                continue;
+
+            if (stackType != null && !stack.StackTypeId.Equals(stackType))
+                continue;
+
+            if (_stack.GetAvailableSpace(stack) == 0)
+                continue;
 
+            return true;
         }
 
-        return GetCumulativeItemSizes(uid, uid.Comp) < uid.Comp.MaxTotalWeight;
+        return false;
     }
 
     /// <summary>
@@ -697,7 +726,9 @@ public abstract class SharedStorageSystem : EntitySystem
 
         // if there is no max item size specified, the value used
         // is one below the item size of the storage entity, clamped at ItemSize.Tiny
-        return (ItemSize) Math.Max((int) item.Size - 1, 1);
+        var sizes = Enum.GetValues<ItemSize>().ToList();
+        var currentSizeIndex = sizes.IndexOf(item.Size);
+        return sizes[Math.Max(currentSizeIndex - 1, 0)];
     }
 
     public FixedPoint2 GetStorageFillPercentage(Entity<StorageComponent?> uid)
index 3921843612321a5de8ec01f5761c0450667c2a58..5f0f0abf28b0f3b8c8bd1faf179b863668978b8a 100644 (file)
   name: death squad backpack
   description: Holds the kit of CentComm's most feared agents.
   components:
+    - type: Storage
+      maxTotalWeight: 56
     - type: StorageFill
       contents:
         - id: BoxSurvivalEngineering
index 355e2a1aff3b0dcbb0c404a1b89c0584c867f5c2..4bff55acdc23bbcb00c9b2bf69ff744f14ad11e3 100644 (file)
@@ -27,7 +27,7 @@
       - id: BoxSurvivalSecurity
       - id: Flash
       - id: MagazinePistol
-      
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffelSecurity
@@ -47,7 +47,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalBrigmedic
       - id: Flash
 
 - type: entity
index bdedcd69a123070615438554affc3bcdeb9af007..b70ef28e76a79f10fd6fb2d01c57fdf1abc36f63 100644 (file)
@@ -41,7 +41,7 @@
       - id: BoxSurvivalSecurity
       - id: Flash
       - id: MagazinePistol
-      
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchelSecurity
@@ -61,7 +61,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalBrigmedic
       - id: Flash
 
 - type: entity
index 7fc62984a052e0abc5b5cb8dc9896b97051896e5..6482c5dd91471928b4f7a857e0d80b8bfd8e03be 100644 (file)
@@ -20,7 +20,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolCaselessRifle
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .25 caseless (practice) magazines
@@ -31,7 +31,7 @@
   - type: StorageFill
     contents:
       - id: MagazinePistolCaselessRiflePractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .25 caseless (rubber) magazines
@@ -42,7 +42,7 @@
   - type: StorageFill
     contents:
       - id: MagazineCaselessRifleRubber
-        amount: 6
+        amount: 4
 
 # LightRifle
 - type: entity
@@ -54,7 +54,7 @@
   - type: StorageFill
     contents:
       - id: MagazineLightRifle
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .30 rifle (practice) magazines
@@ -65,7 +65,7 @@
   - type: StorageFill
     contents:
       - id: MagazineLightRiflePractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .30 rifle (rubber) magazines
@@ -76,7 +76,7 @@
   - type: StorageFill
     contents:
       - id: MagazineLightRifleRubber
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of Vector magazines
   - type: StorageFill
     contents:
       - id: MagazinePistol
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of pistol .35 auto (practice) magazines
   - type: StorageFill
     contents:
       - id: MagazinePistolPractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of pistol .35 auto (rubber) magazines
   - type: StorageFill
     contents:
       - id: MagazinePistolRubber
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of machine pistol .35 auto magazines
   - type: StorageFill
     contents:
       - id: MagazinePistolHighCapacity
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of machine pistol .35 auto (practice) magazines
   - type: StorageFill
     contents:
       - id: MagazinePistolHighCapacityPractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of machine pistol .35 auto (rubber) magazines
   - type: StorageFill
     contents:
       - id: MagazinePistolHighCapacityRubber
-        amount: 6
+        amount: 4
 
 
 - type: entity
   - type: StorageFill
     contents:
       - id: MagazineShotgun
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of (.50 beanbag) ammo drums
   - type: StorageFill
     contents:
       - id: MagazineShotgunBeanbag
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of (.50 slug) ammo drums
   - type: StorageFill
     contents:
       - id: MagazineShotgunSlug
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of (.50 incendiary) ammo drums
   - type: StorageFill
     contents:
       - id: MagazineShotgunIncendiary
-        amount: 6
+        amount: 4
 
 # base BallisticAmmoProvider dispensers
 - type: entity
   - type: StorageFill
     contents:
       - id: MagazineRifle
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .20 rifle (practice) magazines
   - type: StorageFill
     contents:
       - id: MagazineRiflePractice
-        amount: 6
+        amount: 4
 
 - type: entity
   name: box of .20 rifle (rubber) magazines
   - type: StorageFill
     contents:
       - id: MagazineRifleRubber
-        amount: 6
+        amount: 4
index 2cd3960dde33a858d65c389ed0b489785807affd..049780a9260e7860276b1bbecca4f35e186c6a99 100644 (file)
       - state: internals
       - state: emergencytank
 
-- type: entity
-  name: survival box
-  parent: BoxCardboard
-  id: BoxSurvivalBrigmedic
-  description: It's a box with basic internals inside.
-  suffix: MedSec
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingMaskBreathMedicalSecurity
-      - id: EmergencyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
-      - id: EmergencyMedipen
-      - id: FoodTinMRE
-  - type: Sprite
-    layers:
-      - state: internals
-      - state: emergencytank
-
 - type: entity
   name: survival box
   parent: BoxCardboard
index 6d30dac57a50f6f1fc108e3b76b8f51a1606bfe2..f86ba191e66e61669bdeaed4ebdea13feb674da2 100644 (file)
@@ -16,7 +16,7 @@
     - type: StorageFill
       contents:
         - id: Mousetrap
-          amount: 6
+          amount: 4
     - type: Sprite
       layers:
         - state: box
   - type: StorageFill
     contents:
       - id: PassengerPDA
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
   - type: StorageFill
     contents:
       - id: PassengerIDCard
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
   - type: StorageFill
     contents:
       - id: ClothingHeadsetGrey
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
 
 
 - type: entity
-  name: hatsune miku day box
-  parent: BoxCardboard
+  name: hatsune miku day bag
+  parent: ClothingBackpackDuffel
   id: BoxPerformer
   description: Happy Hatsune Miku Day!
   components:
-  - type: Storage
-    maxItemSize: Normal
-    whitelist:
-      components:
-      - Clothing
-      - Food
   - type: StorageFill
     contents:
       - id: ClothingShoesBootsPerformer
   - type: StorageFill
     contents:
       - id: EncryptionKeyCommon
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
   - type: StorageFill
     contents:
       - id: EncryptionKeyCargo
-        amount: 6
+        amount: 4
 
 - type: entity
   name: engineering encryption key box
   - type: StorageFill
     contents:
       - id: EncryptionKeyEngineering
-        amount: 6
+        amount: 4
 
 - type: entity
   name: med-sci encryption key box
   - type: StorageFill
     contents:
       - id: EncryptionKeyMedicalScience
-        amount: 6
+        amount: 4
 
 - type: entity
   name: medical encryption key box
   - type: StorageFill
     contents:
       - id: EncryptionKeyMedical
-        amount: 6
+        amount: 4
 
 - type: entity
   name: robotech encryption key box
   - type: StorageFill
     contents:
       - id: EncryptionKeyRobo
-        amount: 6
+        amount: 4
 
 - type: entity
   name: science encryption key box
   - type: StorageFill
     contents:
       - id: EncryptionKeyScience
-        amount: 6
+        amount: 4
 
 - type: entity
   name: security encryption key box
   - type: StorageFill
     contents:
       - id: EncryptionKeySecurity
-        amount: 6
+        amount: 4
 
 - type: entity
   name: service encryption key box
   - type: StorageFill
     contents:
       - id: EncryptionKeyService
-        amount: 6
+        amount: 4
 
 - type: entity
   name: syndicate encryption key box
index 02f4905693a083bb33d318a90968ce4df7b203f6..e35e9086ffeb405c174374e382dac8b9ad52f2d4 100644 (file)
@@ -22,7 +22,7 @@
   - type: StorageFill
     contents:
       - id: PillCanister
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
@@ -52,7 +52,7 @@
   - type: StorageFill
     contents:
       - id: ClothingMaskSterile
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box
   - type: StorageFill
     contents:
       - id: BodyBag_Folded
-        amount: 5
+        amount: 4
   - type: Sprite
     layers:
       - state: box
index 527194d104217a32f6a1cfc1831d92f2f9f894b7..2fa5c430465bf7c77b0d1dc3fd531d0cf6dcf3eb 100644 (file)
@@ -7,7 +7,7 @@
   - type: StorageFill
     contents:
       - id: Handcuffs
-        amount: 6
+        amount: 4
   - type: Sprite
     layers:
       - state: box_security
index 683162f9d47bcb457e79680801ffafaa05e7aea4..0e4fa72eedeb36ee8a84efd2d63a0d2b35e3e2fe 100644 (file)
   suffix: Filled
   components:
   - type: Item
-    size: Large
+    size: Ginormous
   - type: Storage
     maxSlots: 8
+    maxItemSize: Normal
   - type: StorageFill
     contents:
       - id: ExGrenade
index 714148a64d5c48e2352f9c51711b0ce7be6660d2..c36a4e6b79c1347378584a4ad123141fe1a64e0b 100644 (file)
@@ -16,9 +16,9 @@
   suffix: SniperBundle
   components:
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
   - type: StorageFill
     contents:
       - id: WeaponSniperHristov
index faa8535ab45a31332cddc306814049f46ba6ebbf..6400dce5b6abf9842784eb48c1be3ad6e772a537 100644 (file)
@@ -6,11 +6,8 @@
   components:
   - type: StorageFill
     contents:
-      - id: HandheldHealthAnalyzer
       - id: Brutepack
-        amount: 2
       - id: Ointment
-        amount: 2
       - id: Gauze
       - id: PillCanisterTricordrazine
       # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents
   components:
   - type: StorageFill
     contents:
-      - id: RegenerativeMesh
-        amount: 2
       - id: Ointment
         amount: 2
-      - id: SyringeSigynate
       - id: PillCanisterKelotane
       - id: PillCanisterDermaline
 
   components:
   - type: StorageFill
     contents:
-      - id: MedicatedSuture
       - id: Brutepack
       - id: Gauze
-      - id: Bloodpack
-      - id: SyringeTranexamicAcid
       - id: PillCanisterIron
       - id: PillCanisterCopper
-      - id: PillCanisterBicaridine
 
 - type: entity
   id: MedkitToxinFilled
   components:
   - type: StorageFill
     contents:
-      - id: GeigerCounter
       - id: SyringePhalanximine
       - id: RadAutoInjector
-        amount: 1
       - id: EmergencyMedipen
-        amount: 1
       - id: PillCanisterHyronalin
 
 - type: entity
@@ -95,9 +82,7 @@
   - type: StorageFill
     contents:
       - id: MedicatedSuture
-        amount: 2
       - id: RegenerativeMesh
-        amount: 2
       - id: Bloodpack
         amount: 2
 
   components:
   - type: StorageFill
     contents:
-      - id: HandheldHealthAnalyzer
       - id: MedicatedSuture
       - id: RegenerativeMesh
       - id: SyringeEphedrine
       - id: BruteAutoInjector
       - id: BurnAutoInjector
-      - id: EmergencyMedipen
 
 - type: entity
   id: StimkitFilled
index 12532523906fc62c004430289516eec1f935e472..6bdcc80517c86cc7767badcdd756b4a66898c7d9 100644 (file)
@@ -8,13 +8,13 @@
     sprite: Clothing/Back/Backpacks/backpack.rsi
     state: icon
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     quickEquip: false
     slots:
     - back
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 28
   - type: ContainerContainer
     containers:
   - type: Item
     size: Ginormous
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 56 #14 normal-sized items.
 
 - type: entity
index 8d2850172a3eed46f945c536ac84741ef2855416..3b153971f16b8fb417ae79a03915f65db613a09b 100644 (file)
@@ -7,7 +7,7 @@
   - type: Sprite
     sprite: Clothing/Back/Duffels/duffel.rsi
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 40
   - type: ClothingSpeedModifier
     walkModifier: 1
   - type: Item
     size: Ginormous
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 56 #14 normal-sized items.
   - type: ClothingSpeedModifier
     sprintModifier: 1 # makes its stats identical to other variants of bag of holding
   description: A duffel bag containing a variety of biological containment equipment.
   components:
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 40
   - type: ClothingSpeedModifier
     walkModifier: 1
index 245c9f9fa8cf8534cd422dd6317390ee300d3295..31756d5310e73dbfbf1fe60637db3c2bee72a28f 100644 (file)
   - type: Item
     size: Ginormous
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 56 #14 normal-sized items.
index c36ddde03b56f350dff7215696af433b021e821d..8af00039b5d56515f553b3f75fd258f74cfbd2e4 100644 (file)
@@ -33,7 +33,7 @@
     sprite: Clothing/Back/Backpacks/waterbackpack.rsi
     state: icon
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Clothing
     slots: BACK
     sprite: Clothing/Back/Backpacks/waterbackpack.rsi
index ec6b48bf8947833ee5dce45ee3fa040356616f36..b53c08159d61233da47eb5ba640e54301314f5b9 100644 (file)
@@ -25,7 +25,7 @@
     maxSlots: 7
     maxItemSize: Normal
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
index 28f8ed0dcad550f8a2a3b0f0e1e272d85005bcc5..2117c7916a366226197f5d864abdd28f5326c93f 100644 (file)
   - type: Clothing
     sprite: Clothing/Belt/bandolier.rsi
   - type: Item
-    size: Large
+    size: Huge
   - type: Storage
     whitelist:
       tags:
   - type: Clothing
     sprite: Clothing/Belt/syndieholster.rsi
   - type: Item
-    size: Large
+    size: Huge
   - type: Storage
     whitelist:
       components:
   - type: Clothing
     sprite: Clothing/Belt/militarywebbingmed.rsi
   - type: Item
-    size: Large
+    size: Huge
 
 - type: entity
   parent: ClothingBeltBase
index 63c8ac86ef7d9f5f0f2f73d303b5a56e23c4c646..8b86d8e253a5d7b72cfa9819ec3edcc6877f185d 100644 (file)
@@ -15,7 +15,7 @@
   id: ClothingOuterBaseLarge
   components:
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     slots:
     - outerClothing
@@ -70,7 +70,7 @@
     walkModifier: 0.4
     sprintModifier: 0.6
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Armor
     modifiers:
       coefficients:
     walkModifier: 0.8
     sprintModifier: 0.8
   - type: Item
-    size: Large
+    size: Huge
 
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterBaseMedium
   components:
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     slots:
     - outerClothing
index 75a9df8f0391049799a1210e82506de3fbd056c5..caa84e00eda9abaddb981863d874541e3be2b5a0 100644 (file)
   - type: Sprite
     sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
   - type: PressureProtection
index ee853777f5ac1345a2b9221c85ef24ad06a3a096..4e45061fb06142b916ab970bad379070ebf7a7e3 100644 (file)
     graph: SupplyBot
     node: bot
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 40
   - type: UserInterface
     interfaces:
index eff790cdd1963310d538659ca8366df0c9aebfa6..bea963b4b6c6890e7e870d933552620322395914 100644 (file)
@@ -13,6 +13,8 @@
   - type: Item\r
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi\r
     size: Normal\r
+  - type: Storage\r
+    maxSlots: 6\r
   - type: StorageFill\r
     contents:\r
       - id: CigPackGreen\r
index 65141af36fbba678bf1c44089ef8acf5b3c8a8b5..1f0e359192212340e26ba07ef6da48a72eb9a073 100644 (file)
@@ -9,6 +9,6 @@
     layers:
       - state: icon
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: StaticPrice
     price: 0
index 2ec93b9c9be9dff96f82032b177d6a372b39765d..46cc2dbd4fddb09efe1a535fbff15773b25f62d9 100644 (file)
     state: box
   - type: Storage
     maxSlots: 7
-    maxTotalWeight: 7
+    maxItemSize: Tiny
   - type: Item
     sprite: Objects/Fun/crayons.rsi
     size: Small
index b2c63f14a96c30c5e9991ec1a35fff62bbcda09f..442e712851a892afb34b4bae8e0a167d7172141e 100644 (file)
@@ -7,9 +7,10 @@
     sprite: Objects/Storage/boxes.rsi
   - type: Item
     sprite: Objects/Storage/boxes.rsi
-    size: Normal
+    size: Large
   - type: Storage
-    maxTotalWeight: 12
+    maxTotalWeight: 8
+    maxItemSize: Small
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
index ebf776a7b1e1da899959635dee13a1cdf4582775..c04801f0c7511ceb6696c67ad555ca74b1f26f44 100644 (file)
@@ -5,10 +5,9 @@
   description: Useful for carrying items in your hands.
   components:
   - type: Item
-    size: Large
+    size: Ginormous
   - type: Storage
-    maxSlots: 4
-    maxTotalWeight: 16
+    maxTotalWeight: 24
   - type: Tag
     tags:
     - Briefcase
@@ -33,7 +32,7 @@
   description: Useful for carrying items in your hands.
   components:
   - type: Item
-    size: Large
+    size: Huge
   - type: Storage
     maxSlots: 6
     maxTotalWeight: 24
index 0697281a0ff289b1ac567f58ac322ac7a7aa3c6f..1deafac00bfbc99bb3c7b85291003b8eaca7ab85 100644 (file)
@@ -11,7 +11,7 @@
           map: [ "enabled" ]
   - type: Item
     sprite: Objects/Misc/fire_extinguisher.rsi
-    size: Small
+    size: Normal
   - type: SolutionContainerManager
     solutions:
       spray:
index 4f2199bfa89825fdc226396f06530c7451d32783..569dddb47a354dc338717b536013b2fdc084ae8e 100644 (file)
@@ -62,8 +62,6 @@
   id: Zipties
   parent: Handcuffs
   components:
-  - type: Item
-    size: Tiny
   - type: Handcuff
     breakoutTime: 20  # halfway between improvised cablecuffs and metal ones
     cuffedRSI: Objects/Misc/cablecuffs.rsi  # cablecuffs will look fine
@@ -90,7 +88,7 @@
   abstract: true
   components:
   - type: Item
-    size: Tiny
+    size: Small
   - type: Tag
     tags:
     - Trash
index 6168fb9a5a03be549a42b481a985da0e9c4daea3..73025bdb01f13c5144be76d31b2175951e58d0cf 100644 (file)
@@ -39,6 +39,7 @@
     - type: Item
       sprite: Objects/Specific/Medical/implanter.rsi
       heldPrefix: 0
+      size: Small
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -97,7 +98,6 @@
   components:
     - type: Item
       sprite: Objects/Specific/Medical/syndi_implanter.rsi
-      size: Tiny
     - type: Sprite
       sprite: Objects/Specific/Medical/syndi_implanter.rsi
       state: implanter1
index fcf47d713da2f71be71df21b1859165bf7fc522f..3814ec29236442391b01aef3809bd1961267c8aa 100644 (file)
@@ -4,10 +4,6 @@
   id: MonkeyCubeBox
   description: Drymate brand monkey cubes. Just add water!
   components:
-  - type: Storage
-    whitelist:
-      tags:
-      - MonkeyCube
   - type: StorageFill
     contents:
       - id: MonkeyCubeWrapped
@@ -23,6 +19,8 @@
   id: MonkeyCubeWrapped
   description: Unwrap this to get a monkey cube.
   components:
+  - type: Item
+    size: Tiny
   - type: SpawnItemsOnUse
     items:
       - id: MonkeyCube
@@ -69,6 +67,8 @@
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
     state: wrapper
+  - type: Item
+    size: Tiny
   - type: Tag
     tags:
     - MonkeyCube
index 25c9e7fc587bd22fbc41eb8e524cf207934d0ba1..d8d808c8934f3d77a43ee9e591fe2b632ea1747b 100644 (file)
         components:
         - Hands # no use giving a mouse a storage implant, but a monkey is another story...
     - type: Item
-      size: Huge
+      size: Ginormous
     - type: Storage
       maxSlots: 4
       maxItemSize: Small
index 7d428bcc5a96ce285289076a4a222e61f4162101..b44779581314f5f633b61aa3a2c4852b6de1039e 100644 (file)
@@ -5,7 +5,7 @@
   description: A flatpack used for constructing an antimatter engine reactor. Use a multitool to unpack it.
   components:
   - type: Item
-    size: Small
+    size: Normal
     sprite: Objects/Power/AME/ame_part.rsi
   - type: Sprite
     sprite: Objects/Power/AME/ame_part.rsi
index c8684323a9046b5e6944a924e37f20941bacf20e..c44a167bcd659add42048cc230771fc6ba5d532f 100644 (file)
@@ -5,7 +5,7 @@
   description: Drains immense amounts of electricity from the grid.
   components:
     - type: Item
-      size: Large
+      size: Huge
     - type: NodeContainer
       examinable: true
       nodes:
index 5b3f5e90ce1d4b1509d346bbd717fea89e3dccdb..7c8e7fa495111d6e9dcb2ff411257c976f2c4b37 100644 (file)
@@ -4,7 +4,7 @@
   name: solar assembly part
   components:
   - type: Item
-    size: Small
+    size: Normal
   - type: Sprite
     sprite: Objects/Power/solar_parts.rsi
     state: solar_assembly_parts
index 76a8e576a5a421e1985d209509aea27d2f65ac79..c3e3ea44ead7e35c7e3bcdc00ed52fe4465d8460 100644 (file)
@@ -10,7 +10,7 @@
       state: riot-icon
     - type: Item
       sprite: Objects/Weapons/Melee/shields.rsi
-      size: Huge
+      size: Ginormous
       heldPrefix: riot
     - type: Blocking
       passiveBlockModifier:
index b7627e1016bed4780792d5eb52ac2e6b2a90d9f7..628ec7ee972a046fb1f8def8043155a1741a2e73 100644 (file)
@@ -5,7 +5,7 @@
   description: A forensic pad for collecting fingerprints or fibers.
   components:
   - type: Item
-    size: Tiny
+    size: Small
   - type: ForensicPad
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
index 20ec7354fb81eac881682bcc26d9716266f2aa4c..ac81cff248ea91265b1ba146feb91b2d950c2bff 100644 (file)
@@ -47,6 +47,8 @@
       - key: enum.StorageUiKey.Key
         type: StorageBoundUserInterface
     - type: Storage
+      maxItemSize: Normal
+      maxTotalWeight: 40
     - type: TileFrictionModifier
       modifier: 0.4 # makes it slide
 
index a2675ffaaf81a3c10dd69504d2572a603af2f3b5..939af4a304086d7b7df2ee086b5715c7f1f38fdd 100644 (file)
@@ -13,7 +13,7 @@
       slots:
         - belt
     - type: Item
-      size: Huge
+      size: Ginormous
     - type: Storage
       maxSlots: 15
       quickInsert: true
index a79e6e9037a8691cb851ebc5cc5c75f73a1d66c4..c40073c659d5d782277bd4031e1f860e3399cb44 100644 (file)
@@ -44,7 +44,7 @@
   abstract: true
   components:
   - type: Item
-    size: Huge
+    size: Ginormous
 
 - type: entity
   parent: BaseRipleyPart
   abstract: true
   components:
   - type: Item
-    size: Huge
+    size: Ginormous
 
 - type: entity
   parent: BaseHonkerPart
   abstract: true
   components:
   - type: Item
-    size: Large
+    size: Huge
 
 - type: entity
   parent: BaseHamtrPart
index ac550b8e61919a1e6cd2affc8c5dd4c4e226af56..c489dec1c5672c3694baedf01a344e8f6cf7b384 100644 (file)
@@ -7,7 +7,7 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
   - type: Item
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
-    size: Huge
+    size: Ginormous
   - type: MechEquipment
   - type: GuideHelp
     guides:
index 47d3c77024a283e5e06dcd2a257c4d69cab4265b..bfa6aa2ed22410c0e25460633c96d5dcc2acc49f 100644 (file)
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
-    size: Small
   - type: SolutionContainerManager
     solutions:
       pen:
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
-    size: Tiny
   - type: SolutionContainerManager
     solutions:
       pen:
index 34559b397750e6c8fc2368f27d86ede7c61de5ef..1e73c47f9a5e94455360a13a8e58638796f15ef3 100644 (file)
@@ -8,9 +8,10 @@
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     state: firstaid
   - type: Storage
-    maxTotalWeight: 15
+    maxTotalWeight: 8
+    maxItemSize: Small
   - type: Item
-    size: Normal
+    size: Large
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     heldPrefix: firstaid
   - type: Tag
index 814ddb30da0cf2b13943d4c9a9eea7b1da05be50..231d82fb76a04df5839be9e183f95338c173c8bd 100644 (file)
@@ -14,9 +14,9 @@
     slots:
     - belt
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Storage
-    maxSlots: 5
+    maxSlots: 10
     maxItemSize: Normal
     quickInsert: true
     areaInsert: true
index 16ae88a0680cfb0b565cfe1167a1aa50310f9e12..6ef85c015ee35243632e173979e49fe50abbeaf0 100644 (file)
@@ -40,6 +40,7 @@
   - type: Item
     sprite: Objects/Misc/flare.rsi
     heldPrefix: unlit
+    size: Tiny
   - type: Appearance
   - type: PointLight
     enabled: false
index d63225b2bd991a550a688ef14189a1b78c50b347..255090b923f1b322f107f4eaf131591081b6c612 100644 (file)
@@ -37,7 +37,7 @@
       state: icon
     - type: Item
       sprite: Objects/Tanks/Jetpacks/blue.rsi
-      size: Large
+      size: Huge
     - type: UserInterface
       interfaces:
         - key: enum.SharedGasTankUiKey.Key
index 8a1c33df769498ceeb40cc197c1951027579e944..f4149b5a6a170fd3ff55c35d1e60cea1f293af55 100644 (file)
@@ -12,7 +12,7 @@
     maxItemSize: Normal
     maxTotalWeight: 14
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: ItemCooldown
   - type: MeleeWeapon
     damage:
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
   - type: Storage
-    maxItemSize: Large
+    maxItemSize: Huge
     maxTotalWeight: 28
   - type: MeleeWeapon
     damage:
index 0469f966739667c0598d1f31561ab7a910d68272..dc920caec042e761913ffdb76f97014de908f3e2 100644 (file)
@@ -5,7 +5,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
     quickEquip: false
index 1b318beac85482f0df4b1b5292a33f354c1d32ed..9d685e1ddc0e0c31b816841067f9963b430ed2bd 100644 (file)
@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Gun
     fireRate: 20
     selectedMode: FullAuto
index 3d6cd680a0c0c90736f07ab3aa33266a6f0a0cf5..729f06389fba699592838b8e4339250be2bff632 100644 (file)
@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/LMGs/l6.rsi
     quickEquip: false
index 2dbf71840c9ab24bb330e51495441d5313f8bf37..371e89d4cfc22e0f9ce549e3b93af7332644b064 100644 (file)
@@ -12,7 +12,7 @@
     slots:
     - Back
   - type: Item
-    size: Large
+    size: Huge
   - type: StaticPrice
     price: 500
   - type: ContainerContainer
index d460c0c8f03fab92d5b2bde1ef41942a7d948059..bc3b65ff3a0ad1dc05e8c0a951c52d5c185414fb 100644 (file)
@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/Rifles/ak.rsi
     quickEquip: false
index 6bf6fcf695618a5780842b83fd03794c1c619f81..fbf56ec9e7aa3071397996cfb626b39e8a046947 100644 (file)
@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Normal
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
     quickEquip: false
index 5a08eb3636978fe9255f02838f2e11fd8354c340..8e816abb55c20dadf71564fe4ad386b8f7b6d6a0 100644 (file)
@@ -57,6 +57,8 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    size: Large
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
     quickEquip: false
index 4a16aadb6550beeb29384fa56acd48dfab08c2d5..ccccb633f695dfc2b5d97c88f325045083377613 100644 (file)
@@ -10,7 +10,7 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
     quickEquip: false
index fcd028a64e81eb7a42e47433286ef4d9f1a2c488..c978d2da05d3d462d69564669108533fa1a3feec 100644 (file)
@@ -12,7 +12,7 @@
       map: [ "tank" ]
       visible: false
   - type: Item
-    size: Large
+    size: Huge
   - type: Clothing
     quickEquip: false
     slots:
   suffix: Admeme
   components:
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Storage
     maxSlots: 100
-    maxItemSize: Huge
+    maxItemSize: Ginormous
     maxTotalWeight: 1600
     whitelist:
       tags: [] #dodging a test fail like the IRS
index ff80144f9fb966cac37709142d15d7d35a45e2e3..d6622d93323c398d116e16951e53a37f59338523 100644 (file)
@@ -75,7 +75,7 @@
         Slash: 12
         Structural: 30
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_halberd.rsi
     quickEquip: false
index 87eb40dfe5f7a94de11a1d0eba9162efa2a7c06c..efb85ec35e7bcfeb47a8a73c45da20fc25b1e871 100644 (file)
@@ -29,7 +29,7 @@
         Slash: 10.5
         Structural: 60
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Clothing
     sprite: Objects/Weapons/Melee/fireaxe.rsi
     quickEquip: false
index 98ecaa28a66625633cf55e6acc0d15b90342e0ed..ec813c1a40ae008daf7ee56de1857a6b04f588e1 100644 (file)
@@ -20,6 +20,7 @@
       path: /Audio/Weapons/bladeslice.ogg
   - type: Sprite
   - type: Item
+    size: Small
   - type: Tool
     qualities:
       - Slicing
@@ -39,7 +40,6 @@
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
     state: icon
   - type: Item
-    size: Small
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
   - type: GuideHelp
     guides:
@@ -64,7 +64,7 @@
       types:
         Slash: 10
   - type: Item
-    size: Small
+    size: Normal
     sprite: Objects/Weapons/Melee/cleaver.rsi
   - type: GuideHelp
     guides:
@@ -82,7 +82,6 @@
     - Knife
   - type: Sprite
     sprite: Objects/Weapons/Melee/combat_knife.rsi
-    size: Tiny
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
@@ -91,7 +90,6 @@
       types:
         Slash: 10
   - type: Item
-    size: Small
     sprite: Objects/Weapons/Melee/combat_knife.rsi
   - type: DisarmMalus
     malus: 0.225
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/survival_knife.rsi
-    size: Tiny
     state: icon
   - type: Item
-    size: Small
     sprite: Objects/Weapons/Melee/survival_knife.rsi
 
 - type: entity
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
-    size: Tiny
     state: icon
   - type: MeleeWeapon
     attackRate: 1.0
       types:
         Slash: 15
   - type: Item
-    size: Small
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
 
 - type: entity
     node: icon
   - type: Sprite
     sprite: Objects/Weapons/Melee/shiv.rsi
-    size: Tiny
     state: icon
   - type: MeleeWeapon
     attackRate: 1.5
       types:
         Slash: 5.5
   - type: Item
-    size: Tiny #as much as a regular glass shard
     sprite: Objects/Weapons/Melee/shiv.rsi
   - type: DisarmMalus
     malus: 0.225
   - type: Construction
     graph: ReinforcedShiv
     node: icon
-    size: Tiny
-    state: icon
   - type: MeleeWeapon
     attackRate: 1.5
     damage:
index e5046d5c1fa284412a96f59b70e6697a47184aab..17e52846041ebf711fd851d2dc1763ed3421781a 100644 (file)
@@ -57,7 +57,7 @@
         Slash: 2.5
   - type: GunRequiresWield
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: DisarmMalus
   - type: Tool
     qualities:
     wideAnimationRotation: -135
     attackRate: 1.25
   - type: Item
-    size: Huge
+    size: Ginormous
index 037844507ffca34759fec816716966c28cceca20..aa383b6f0c8d53f4e2cf2a0a7ee1ac0e5aeabd32 100644 (file)
@@ -47,7 +47,7 @@
       types:
         Piercing: 15
   - type: Item
-    size: Huge
+    size: Ginormous
   - type: Clothing
     quickEquip: false
     slots:
index 87b7c468c3cc4694b60ac5beefc8b13dc33130ec..b43ea5059c4198657277bd6d14e71fbc01ff7c66 100644 (file)
@@ -26,7 +26,7 @@
   - type: ItemCooldown
   - type: Item
     heldPrefix: off
-    size: Large
+    size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Melee/stunprod.rsi
     quickEquip: false
index e5a03d51367363f6c20fc30d1d7157df588bc14d..36259ddcc2256c9d5486a4c2c7c77f22ec7150ed 100644 (file)
@@ -9,7 +9,7 @@
     sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
     state: icon
   - type: Item
-    size: Huge
+    size: Ginormous
     sprite: Objects/Tools/Toolboxes/toolbox_red.rsi
   - type: MeleeWeapon
     wideAnimationRotation: -135
index 8d669ab6d23d10f40e5605a30bacdf1154739c76..e6ede719cf8821306b77a6b22cbc870543d389de 100644 (file)
       map: ["foldedLayer"]
       visible: false
   - type: Item
-    size: Large
+    size: Huge
   - type: Appearance
   - type: MeleeWeapon
     damage: