From 009347076cc1171c2be047bbb86f24750acbd8a6 Mon Sep 17 00:00:00 2001
From: Timothy Lowe <twlowe06@gmail.com>
Date: Wed, 24 Jul 2024 11:39:19 -0700
Subject: [PATCH] Fix merge issues.

---
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  |  2 +-
 .../Entities/Objects/Misc/arabianlamp.yml     |  2 +-
 .../Objects/Specific/Medical/surgery.yml      |  4 ++--
 .../Objects/Weapons/Melee/e_sword.yml         |  4 ++--
 .../Entities/Structures/Wallmounts/shelfs.yml | 20 ++++---------------
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index e2adedf4b7..55158e6277 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -323,7 +323,7 @@ private void OnInsertAttempt(Entity<MicrowaveComponent> ent, ref ContainerIsInse
 
             if (TryComp<ItemComponent>(args.EntityUid, out var item))
             {
-                if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(ent.Comp.MaxItemSize))
+                if (item.Size > ent.Comp.MaxItemSize)
                 {
                     args.Cancel();
                     return;
diff --git a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
index a15e30fbc7..b3b1168504 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
@@ -21,7 +21,7 @@
     containers:
       entity_storage: !type:Container
   - type: Item
-    size: Normal
+    size: 10
     heldPrefix: lamp
     sprite: Objects/Misc/arabianlamp.rsi
     inhandVisuals:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 350cc69568..83a9d4ca31 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -166,7 +166,7 @@
     sprite: Objects/Specific/Medical/Surgery/saw.rsi
     state: saw
   - type: Item
-    size: Normal
+    size: 5
     sprite: Objects/Specific/Medical/Surgery/saw.rsi
   - type: Tool
     qualities:
@@ -182,7 +182,7 @@
   - type: Sprite
     state: improv
   - type: Item
-    size: Small
+    size: 10
     heldPrefix: improv
   - type: MeleeWeapon
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 5412eaa370..13e379097a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -136,7 +136,7 @@
       types:
         Blunt: 1
   - type: Item
-    size: 2
+    size: 1
     sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
   - type: UseDelay
     delay: 1.0
@@ -190,7 +190,7 @@
         shader: unshaded
         map: [ "blade" ]
   - type: Item
-    size: Tiny
+    size: 1
     sprite: Objects/Weapons/Melee/e_dagger.rsi
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
index af68f5898d..a98941b5c9 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
@@ -37,10 +37,7 @@
   - type: WallMount
     arc: 175
   - type: Storage
-    grid:
-    - 0,0,3,1
-    - 0,3,3,4
-    maxItemSize: Normal
+    capacity: 120
   - type: UserInterface
     interfaces:
      enum.StorageUiKey.Key:
@@ -325,10 +322,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Storage
-    grid:
-    - 0,0,5,1
-    - 0,3,5,4
-    maxItemSize: Normal
+    capacity: 120
     whitelist:
       tags:
         - DrinkGlass
@@ -379,10 +373,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Storage
-    grid:
-    - 0,0,5,1
-    - 0,3,5,4
-    maxItemSize: Normal
+    capacity: 120
     whitelist:
       tags:
         - DrinkGlass
@@ -447,10 +438,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Storage
-    grid:
-    - 0,0,5,1
-    - 0,3,5,4
-    maxItemSize: Normal
+    capacity: 120
     whitelist:
       tags:
         - ChemDispensable