diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs index 2db579e71c..32d30bead6 100644 --- a/Content.Server/Light/Components/HandheldLightComponent.cs +++ b/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"); } } diff --git a/Resources/Locale/en-US/light/components/handheld-light-component.ftl b/Resources/Locale/en-US/light/components/handheld-light-component.ftl index 108d5fd60a..3ee5dcc0f3 100644 --- a/Resources/Locale/en-US/light/components/handheld-light-component.ftl +++ b/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 \ No newline at end of file +toggle-light-verb-get-data-text = Toggle light diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 38bdfae05f..a1f5c80362 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 2fcb644269..1b2606d3ba 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index 3ac0747b96..61f09d4b49 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index f76ff07956..444e61604e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml index 258c770e82..bc9bd51fce 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 80b822e0ba..1d92807a62 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index aa73f2aeca..5152af496d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index bfc2ddbc2b..1b3c9f7d7c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index 37160c400f..242a558154 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/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: diff --git a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-left.png index d9eb843709..cc43d30588 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-right.png index c3aa04560d..385d9ede1b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png new file mode 100644 index 0000000000..cf6e4684e9 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png new file mode 100644 index 0000000000..978d4f3c5f Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json index 84720d277e..354132ea11 100644 --- a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json +++ b/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" }, diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json index 49b407efa9..7e4a9dadbb 100644 --- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json +++ b/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" }, diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-inhand-left.png new file mode 100644 index 0000000000..184982360f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-inhand-right.png new file mode 100644 index 0000000000..60866c8d4c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/lamp_on.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/lamp_on.png rename to Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png diff --git a/Resources/Textures/Objects/Misc/lights.rsi/lamp.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/lamp.png rename to Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json new file mode 100644 index 0000000000..c4e8d0d2be --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/off-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/off-inhand-left.png new file mode 100644 index 0000000000..bd99422d55 Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/off-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/off-inhand-right.png new file mode 100644 index 0000000000..048947a6ea Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/on-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/on-inhand-left.png new file mode 100644 index 0000000000..a129336b3f Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/on-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/on-inhand-right.png new file mode 100644 index 0000000000..a610b72e3d Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/lampgreen_on.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/lampgreen_on.png rename to Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen-on.png diff --git a/Resources/Textures/Objects/Misc/lights.rsi/lampgreen.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/lampgreen.png rename to Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen.png diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json new file mode 100644 index 0000000000..f8f6bf246e --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png new file mode 100644 index 0000000000..e936ee2214 Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png new file mode 100644 index 0000000000..2aa9a84475 Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png new file mode 100644 index 0000000000..22c2c62be5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png new file mode 100644 index 0000000000..71d3696007 Binary files /dev/null and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/bananalamp.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/bananalamp.png rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp.png diff --git a/Resources/Textures/Objects/Misc/lights.rsi/bananalamp_on.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp_on.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/bananalamp_on.png rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp_on.png diff --git a/Resources/Textures/Objects/Misc/lights.rsi/floodlight.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/floodlight.png rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight.png diff --git a/Resources/Textures/Objects/Misc/lights.rsi/floodlight_broken.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/floodlight_broken.png rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_broken.png diff --git a/Resources/Textures/Objects/Misc/lights.rsi/floodlight_burned.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_burned.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/floodlight_burned.png rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_burned.png diff --git a/Resources/Textures/Objects/Misc/lights.rsi/floodlight_on.png b/Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png similarity index 100% rename from Resources/Textures/Objects/Misc/lights.rsi/floodlight_on.png rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/floodlight_on.png diff --git a/Resources/Textures/Objects/Misc/lights.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json similarity index 76% rename from Resources/Textures/Objects/Misc/lights.rsi/meta.json rename to Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json index 26781ab06d..24250c01dd 100644 --- a/Resources/Textures/Objects/Misc/lights.rsi/meta.json +++ b/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" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 32ed9fd76b..ba46cfa3c6 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/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" }, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen-inhand-left.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen-inhand-left.png new file mode 100644 index 0000000000..8bacdf0e5d Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen-inhand-right.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen-inhand-right.png new file mode 100644 index 0000000000..6ae04fd9d5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/utensils.rsi/inhand-left.png new file mode 100644 index 0000000000..19dbcd836f Binary files /dev/null and b/Resources/Textures/Objects/Misc/utensils.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/utensils.rsi/inhand-right.png new file mode 100644 index 0000000000..662c79d194 Binary files /dev/null and b/Resources/Textures/Objects/Misc/utensils.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/meta.json b/Resources/Textures/Objects/Misc/utensils.rsi/meta.json index 1e2ce7e9ca..30dd4e8564 100644 --- a/Resources/Textures/Objects/Misc/utensils.rsi/meta.json +++ b/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" }, diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/spoon-inhand-left.png b/Resources/Textures/Objects/Misc/utensils.rsi/spoon-inhand-left.png new file mode 100644 index 0000000000..546dbd4883 Binary files /dev/null and b/Resources/Textures/Objects/Misc/utensils.rsi/spoon-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/spoon-inhand-right.png b/Resources/Textures/Objects/Misc/utensils.rsi/spoon-inhand-right.png new file mode 100644 index 0000000000..fd8ee23b4a Binary files /dev/null and b/Resources/Textures/Objects/Misc/utensils.rsi/spoon-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/inhand-left.png new file mode 100644 index 0000000000..7c6f0aa284 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/inhand-right.png new file mode 100644 index 0000000000..4c278fbd22 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json index b394da5df1..53c7f0360f 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-left.png new file mode 100644 index 0000000000..7ea530abbe Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-right.png new file mode 100644 index 0000000000..863a40a493 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-left.png new file mode 100644 index 0000000000..0f1f047472 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-right.png new file mode 100644 index 0000000000..c55b8d6fd6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-left.png new file mode 100644 index 0000000000..0f1f047472 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-right.png new file mode 100644 index 0000000000..c55b8d6fd6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-left.png new file mode 100644 index 0000000000..3bbc9fe683 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-right.png new file mode 100644 index 0000000000..71ecded6f6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-left.png new file mode 100644 index 0000000000..2d4447acb7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-right.png new file mode 100644 index 0000000000..fa55e86eb9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png deleted file mode 100644 index 3960081269..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png deleted file mode 100644 index 9f582ffb21..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json index 1c97f526c5..cb51486fca 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json @@ -41,12 +41,44 @@ "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 + } ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png new file mode 100644 index 0000000000..71a75ca66e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png new file mode 100644 index 0000000000..c9c7de38f4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json index 6c1bb15973..7b251e87ff 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json index 45c1617efa..f981b7e426 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json +++ b/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" }, diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-inhand-left.png new file mode 100644 index 0000000000..2136e54995 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-inhand-right.png new file mode 100644 index 0000000000..2ef4b94da3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack-inhand-left.png new file mode 100644 index 0000000000..4a70f2f021 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack-inhand-right.png new file mode 100644 index 0000000000..daece26c5e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json index 39f206039c..93b7ea8ad7 100644 --- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-inhand-left.png new file mode 100644 index 0000000000..8f628f746f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-inhand-right.png new file mode 100644 index 0000000000..c5307f7e60 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png index 55f33b5171..48d44cbeb8 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png index d325a09d29..94f60d7113 100644 Binary files a/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/drill.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-left.png b/Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-left.png new file mode 100644 index 0000000000..6c95dc229a Binary files /dev/null and b/Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-right.png b/Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-right.png new file mode 100644 index 0000000000..c4742e9ced Binary files /dev/null and b/Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/rcd_ammo.png b/Resources/Textures/Objects/Tools/rcd.rsi/ammo.png similarity index 100% rename from Resources/Textures/Objects/Tools/rcd.rsi/rcd_ammo.png rename to Resources/Textures/Objects/Tools/rcd.rsi/ammo.png diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png index 1873ca3ccb..b305882226 100644 Binary files a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png index c0e0a8eb9e..a9cca584d2 100644 Binary files a/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/rcd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json b/Resources/Textures/Objects/Tools/rcd.rsi/meta.json index b5a1e00c59..8f64ec726d 100644 --- a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json +++ b/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",