Adds a ton more inhands (#4488)

* Removed useless loc and added inhands for some lamps

* Adds a ton of inhands to the game

* Actually adds the pill inhand

* Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -115,6 +115,9 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/banana.rsi
     state: peel
+  - type: Item
+    sprite: Objects/Specific/Hydroponics/banana.rsi
+    HeldPrefix: peel
   - type: Slippery
     intersectPercentage: 0.2
   - type: CollisionWake

Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

@@ -100,7 +100,7 @@
   - type: Sprite
     state: popcorn
   - type: Item
-    color: blue
+    HeldPrefix: popcorn
   - type: Food
     trash: FoodPacketPopcornTrash
 

Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml

@@ -9,10 +9,9 @@
     actions:
         - actionType: ToggleLight
   - type: Sprite
-    sprite: Objects/Misc/lights.rsi
+    sprite: Objects/Misc/Lights/lights.rsi
   - type: Item
-    sprite: Objects/Misc/lights.rsi
-    HeldPrefix: off
+    sprite: Objects/Misc/Lights/lights.rsi
 
 - type: entity
   name: lamp
@@ -21,11 +20,14 @@
   description: A light emitting device.
   components:
   - type: Sprite
+    sprite: Objects/Misc/Lights/lamp.rsi
     layers:
       - state: lamp
-      - state: lamp_on
+      - state: lamp-on
         shader: unshaded
         visible: false
+  - type: Item
+    sprite: Objects/Misc/Lights/lamp.rsi
   - type: PointLight
     enabled: false
     radius: 3
@@ -38,7 +40,7 @@
   name: banana lamp
   id: LampBanana
   parent: BaseLamp
-  description: A light emitting device, shaped like bannana.
+  description: A light emitting device, shaped like a banana.
   components:
   - type: Sprite
     layers:
@@ -58,14 +60,17 @@
   name: desk lamp
   id: LampGold
   parent: BaseLamp
-  description: A light emitting device, that would look great on a desk.
+  description: A light emitting device that would look great on a desk.
   components:
   - type: Sprite
+    sprite: Objects/Misc/Lights/lampgreen.rsi
     layers:
       - state: lampgreen
-      - state: lampgreen_on
+      - state: lampgreen-on
         shader: unshaded
         visible: false
+  - type: Item
+    sprite: Objects/Misc/Lights/lampgreen.rsi
   - type: PointLight
     enabled: false
     radius: 3
@@ -130,7 +135,7 @@
   description: A pole with powerful mounted lights on it. It's broken.
   components:
   - type: Sprite
-    sprite: Objects/Misc/lights.rsi
+    sprite: Objects/Misc/Lights/lights.rsi
     state: floodlight_broken
   - type: Anchorable
   - type: Damageable

Resources/Prototypes/Entities/Objects/Misc/paper.yml

@@ -35,3 +35,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: pen
+  - type: Item
+    sprite: Objects/Misc/bureaucracy.rsi
+    HeldPrefix: pen

Resources/Prototypes/Entities/Objects/Misc/utensils.yml

@@ -5,6 +5,8 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/utensils.rsi
+  - type: Item
+    sprite: Objects/Misc/utensils.rsi
 
 - type: entity
   parent: UtensilBase
@@ -29,6 +31,8 @@
   components:
   - type: Sprite
     state: plastic_fork
+  - type: Item
+    color: white
   - type: Utensil
     types:
     - Fork
@@ -42,6 +46,8 @@
   components:
   - type: Sprite
     state: spoon
+  - type: Item
+    HeldPrefix: spoon
   - type: Utensil
     types:
     - Spoon
@@ -54,6 +60,9 @@
   components:
   - type: Sprite
     state: plastic_spoon
+  - type: Item
+    color: white
+    HeldPrefix: spoon
   - type: Utensil
     types:
     - Spoon
@@ -67,6 +76,8 @@
   components:
   - type: Sprite
     state: plastic_knife
+  - type: Item
+    color: white
   - type: Utensil
     types:
     - Knife

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -10,6 +10,9 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/medical.rsi
     state: ointment
+  - type: Item
+    sprite: Objects/Specific/Medical/medical.rsi
+    HeldPrefix: ointment
   - type: Healing
     heal:
       Heat: 10

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

@@ -157,13 +157,14 @@
         visible: false
       - state: syringe_base0
         map: ["enum.SolutionContainerLayers.Base"]
+  - type: Item
+    sprite: Objects/Specific/Chemistry/syringe.rsi
+    HeldPrefix: 0
   - type: SolutionContainer
     maxVol: 15
   - type: Injector
     injectOnly: false
   - type: Spillable
-  - type: Item
-    sprite: Objects/Specific/Chemistry/syringe.rsi
   - type: Appearance
     visuals:
       # this visualizer used for reagent inside
@@ -187,6 +188,8 @@
   - type: Sprite
     sprite: Objects/Specific/Chemistry/pills.rsi
     state: pill
+  - type: Item
+    sprite: Objects/Specific/Chemistry/pills.rsi
   - type: Tag
     tags:
       - Pill

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -214,10 +214,13 @@
   id: RCDAmmo
   description: Ammo cartridge for an RCD.
   components:
-    - type: RCDAmmo
-    - type: Sprite
-      sprite: Objects/Tools/rcd.rsi
-      state: rcd_ammo
+  - type: RCDAmmo
+  - type: Sprite
+    sprite: Objects/Tools/rcd.rsi
+    state: ammo
+  - type: Item
+    sprite: Objects/Tools/rcd.rsi
+    HeldPrefix: ammo
 
 - type: entity
   name: shovel

Resources/Prototypes/Recipes/Lathes/tools.yml

@@ -126,7 +126,7 @@
   id: RCDAmmo
   icon:
     sprite: Objects/Tools/rcd.rsi
-    state: rcd_ammo
+    state: ammo
   result: RCDAmmo
   completetime: 600
   materials: