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>

Content.Server/Light/Components/HandheldLightComponent.cs

@@ -177,12 +177,12 @@ namespace Content.Server.Light.Components
 
             if (Owner.TryGetComponent(out ClothingComponent? clothing))
             {
-                clothing.ClothingEquippedPrefix = Loc.GetString(on ? "handheld-light-component-on-state" : "handheld-light-component-off-state");
+                clothing.ClothingEquippedPrefix = Loc.GetString(on ? "on" : "off");
             }
 
             if (Owner.TryGetComponent(out ItemComponent? item))
             {
-                item.EquippedPrefix = Loc.GetString(on ? "handheld-light-component-on-state" : "handheld-light-component-off-state");
+                item.EquippedPrefix = Loc.GetString(on ? "on" : "off");
             }
         }
 

Resources/Locale/en-US/light/components/handheld-light-component.ftl

@@ -2,8 +2,6 @@ handheld-light-component-on-examine-is-on-message = The light is currently [colo
 handheld-light-component-on-examine-is-off-message = The light is currently [color=darkred]off[/color].
 handheld-light-component-cell-missing-message = Cell missing...
 handheld-light-component-cell-dead-message = Dead cell...
-handheld-light-component-on-state = on
-handheld-light-component-off-state = off
 
 # ToggleLightVerb
 toggle-light-verb-get-data-text = Toggle light

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

@@ -217,7 +217,10 @@
   - type: RCDAmmo
   - type: Sprite
     sprite: Objects/Tools/rcd.rsi
-      state: rcd_ammo
+    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:

Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json

@@ -16,6 +16,14 @@
     {
       "name": "brain"
     },
+    {
+      "name": "brain-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "brain-inhand-right",
+      "directions": 4
+    },
     {
       "name": "ears"
     },

Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json

@@ -89,6 +89,14 @@
     {
       "name": "popcorn"
     },
+    {
+      "name": "popcorn-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "popcorn-inhand-left",
+      "directions": 4
+    },
     {
       "name": "popcorn-trash"
     },

Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json

@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "lamp"
+    },
+    {
+      "name": "lamp-on"
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json

@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "lampgreen"
+    },
+    {
+      "name": "lampgreen-on"
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json

@@ -24,18 +24,6 @@
     },
     {
       "name": "floodlight_broken"
-    },
-    {
-      "name": "lamp"
-    },
-    {
-      "name": "lamp_on"
-    },
-    {
-      "name": "lampgreen"
-    },
-    {
-      "name": "lampgreen_on"
     }
   ]
 }

Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json

@@ -234,6 +234,14 @@
     {
       "name": "pen_red"
     },
+    {
+      "name": "pen-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "pen-inhand-right",
+      "directions": 4
+    },
     {
       "name": "scrap"
     },

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,25 @@
     {
       "name": "spoon"
     },
+    {
+      "name": "spoon-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "spoon-inhand-right",
+      "directions": 4
+    },
     {
       "name": "fork"
     },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
     {
       "name": "loadedfood"
     },

Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json

@@ -72,6 +72,14 @@
     },
     {
       "name": "pill_canister"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json

@@ -41,11 +41,43 @@
 			"name": "syringe4"
 		},
 		{
-      "name": "inhand-left",
+      "name": "0-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-right",
+      "name": "0-inhand-right",
+      "directions": 4
+    },
+		{
+			"name": "1-inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "1-inhand-right",
+			"directions": 4
+		},
+		{
+			"name": "2-inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "2-inhand-right",
+			"directions": 4
+		},
+		{
+			"name": "3-inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "3-inhand-right",
+			"directions": 4
+		},
+		{
+			"name": "4-inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "4-inhand-right",
 			"directions": 4
 		}
 	]

Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json

@@ -12,6 +12,14 @@
     },
     {
       "name": "vial"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json

@@ -25,6 +25,14 @@
     {
       "name": "peel3"
     },
+    {
+      "name": "peel-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "peel-inhand-right",
+      "directions": 4
+    },
     {
       "name": "seed"
     },

Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json

@@ -10,6 +10,14 @@
 		{
 			"name": "brutepack"
 		},
+		{
+			"name": "brutepack-inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "brutepack-inhand-right",
+			"directions": 4
+		},
 		{
 			"name": "cast"
 		},
@@ -21,6 +29,14 @@
 		},
 		{
 			"name": "ointment"
+		},
+		{
+			"name": "ointment-inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "ointment-inhand-right",
+			"directions": 4
 		}
 	]
 }

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f07f847706d85b7cfa4b398e5175732212b69a63",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
@@ -11,7 +11,15 @@
       "name": "icon"
     },
     {
-      "name": "rcd_ammo"
+      "name": "ammo"
+    },
+    {
+      "name": "ammo-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ammo-inhand-right",
+      "directions": 4
     },
     {
       "name": "equipped-BELT",