From 9d22869e58af19d8f0addc21fc280a97e003c1ff Mon Sep 17 00:00:00 2001 From: Swept Date: Thu, 19 Aug 2021 22:36:32 -0700 Subject: [PATCH] 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 * Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json Co-authored-by: Paul Ritter Co-authored-by: Paul Ritter --- .../Components/HandheldLightComponent.cs | 4 +- .../components/handheld-light-component.ftl | 4 +- .../Objects/Consumable/Food/produce.yml | 3 ++ .../Objects/Consumable/Food/snacks.yml | 2 +- .../Entities/Objects/Misc/fluff_lights.yml | 21 ++++++---- .../Entities/Objects/Misc/paper.yml | 3 ++ .../Entities/Objects/Misc/utensils.yml | 11 +++++ .../Objects/Specific/Medical/healing.yml | 3 ++ .../Entities/Objects/Specific/chemistry.yml | 7 +++- .../Entities/Objects/Tools/tools.yml | 11 +++-- Resources/Prototypes/Recipes/Lathes/tools.yml | 2 +- .../Head/Hats/tophat.rsi/inhand-left.png | Bin 356 -> 395 bytes .../Head/Hats/tophat.rsi/inhand-right.png | Bin 364 -> 415 bytes .../Human/organs.rsi/brain-inhand-left.png | Bin 0 -> 300 bytes .../Human/organs.rsi/brain-inhand-right.png | Bin 0 -> 312 bytes .../Mobs/Species/Human/organs.rsi/meta.json | 8 ++++ .../Consumable/Food/snacks.rsi/meta.json | 8 ++++ .../Food/snacks.rsi/popcorn-inhand-left.png | Bin 0 -> 478 bytes .../Food/snacks.rsi/popcorn-inhand-right.png | Bin 0 -> 496 bytes .../lamp.rsi/lamp-on.png} | Bin .../{lights.rsi => Lights/lamp.rsi}/lamp.png | Bin .../Objects/Misc/Lights/lamp.rsi/meta.json | 33 +++++++++++++++ .../Misc/Lights/lamp.rsi/off-inhand-left.png | Bin 0 -> 473 bytes .../Misc/Lights/lamp.rsi/off-inhand-right.png | Bin 0 -> 459 bytes .../Misc/Lights/lamp.rsi/on-inhand-left.png | Bin 0 -> 381 bytes .../Misc/Lights/lamp.rsi/on-inhand-right.png | Bin 0 -> 376 bytes .../lampgreen.rsi/lampgreen-on.png} | Bin .../lampgreen.rsi}/lampgreen.png | Bin .../Misc/Lights/lampgreen.rsi/meta.json | 33 +++++++++++++++ .../Lights/lampgreen.rsi/off-inhand-left.png | Bin 0 -> 544 bytes .../Lights/lampgreen.rsi/off-inhand-right.png | Bin 0 -> 525 bytes .../Lights/lampgreen.rsi/on-inhand-left.png | Bin 0 -> 403 bytes .../Lights/lampgreen.rsi/on-inhand-right.png | Bin 0 -> 403 bytes .../{ => Lights}/lights.rsi/bananalamp.png | Bin .../{ => Lights}/lights.rsi/bananalamp_on.png | Bin .../{ => Lights}/lights.rsi/floodlight.png | Bin .../lights.rsi/floodlight_broken.png | Bin .../lights.rsi/floodlight_burned.png | Bin .../{ => Lights}/lights.rsi/floodlight_on.png | Bin .../Misc/{ => Lights}/lights.rsi/meta.json | 12 ------ .../Objects/Misc/bureaucracy.rsi/meta.json | 8 ++++ .../Misc/bureaucracy.rsi/pen-inhand-left.png | Bin 0 -> 283 bytes .../Misc/bureaucracy.rsi/pen-inhand-right.png | Bin 0 -> 283 bytes .../Objects/Misc/utensils.rsi/inhand-left.png | Bin 0 -> 330 bytes .../Misc/utensils.rsi/inhand-right.png | Bin 0 -> 231 bytes .../Objects/Misc/utensils.rsi/meta.json | 18 ++++++++- .../Misc/utensils.rsi/spoon-inhand-left.png | Bin 0 -> 347 bytes .../Misc/utensils.rsi/spoon-inhand-right.png | Bin 0 -> 271 bytes .../Chemistry/pills.rsi/inhand-left.png | Bin 0 -> 251 bytes .../Chemistry/pills.rsi/inhand-right.png | Bin 0 -> 251 bytes .../Specific/Chemistry/pills.rsi/meta.json | 8 ++++ .../Chemistry/syringe.rsi/0-inhand-left.png | Bin 0 -> 298 bytes .../Chemistry/syringe.rsi/0-inhand-right.png | Bin 0 -> 300 bytes .../Chemistry/syringe.rsi/1-inhand-left.png | Bin 0 -> 316 bytes .../Chemistry/syringe.rsi/1-inhand-right.png | Bin 0 -> 320 bytes .../Chemistry/syringe.rsi/2-inhand-left.png | Bin 0 -> 316 bytes .../Chemistry/syringe.rsi/2-inhand-right.png | Bin 0 -> 320 bytes .../Chemistry/syringe.rsi/3-inhand-left.png | Bin 0 -> 322 bytes .../Chemistry/syringe.rsi/3-inhand-right.png | Bin 0 -> 315 bytes .../Chemistry/syringe.rsi/4-inhand-left.png | Bin 0 -> 321 bytes .../Chemistry/syringe.rsi/4-inhand-right.png | Bin 0 -> 321 bytes .../Chemistry/syringe.rsi/inhand-left.png | Bin 183 -> 0 bytes .../Chemistry/syringe.rsi/inhand-right.png | Bin 185 -> 0 bytes .../Specific/Chemistry/syringe.rsi/meta.json | 38 ++++++++++++++++-- .../Chemistry/vial.rsi/inhand-left.png | Bin 0 -> 352 bytes .../Chemistry/vial.rsi/inhand-right.png | Bin 0 -> 356 bytes .../Specific/Chemistry/vial.rsi/meta.json | 8 ++++ .../Specific/Hydroponics/banana.rsi/meta.json | 8 ++++ .../banana.rsi/peel-inhand-left.png | Bin 0 -> 401 bytes .../banana.rsi/peel-inhand-right.png | Bin 0 -> 417 bytes .../medical.rsi/brutepack-inhand-left.png | Bin 0 -> 343 bytes .../medical.rsi/brutepack-inhand-right.png | Bin 0 -> 345 bytes .../Specific/Medical/medical.rsi/meta.json | 16 ++++++++ .../medical.rsi/ointment-inhand-left.png | Bin 0 -> 363 bytes .../medical.rsi/ointment-inhand-right.png | Bin 0 -> 368 bytes .../Objects/Tools/drill.rsi/inhand-left.png | Bin 143 -> 686 bytes .../Objects/Tools/drill.rsi/inhand-right.png | Bin 144 -> 668 bytes .../Tools/rcd.rsi/ammo-inhand-left.png | Bin 0 -> 237 bytes .../Tools/rcd.rsi/ammo-inhand-right.png | Bin 0 -> 266 bytes .../Tools/rcd.rsi/{rcd_ammo.png => ammo.png} | Bin .../Objects/Tools/rcd.rsi/inhand-left.png | Bin 157 -> 459 bytes .../Objects/Tools/rcd.rsi/inhand-right.png | Bin 163 -> 454 bytes .../Textures/Objects/Tools/rcd.rsi/meta.json | 12 +++++- 83 files changed, 242 insertions(+), 39 deletions(-) create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-left.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/brain-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-inhand-right.png rename Resources/Textures/Objects/Misc/{lights.rsi/lamp_on.png => Lights/lamp.rsi/lamp-on.png} (100%) rename Resources/Textures/Objects/Misc/{lights.rsi => Lights/lamp.rsi}/lamp.png (100%) create mode 100644 Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/Lights/lamp.rsi/off-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/Lights/lamp.rsi/off-inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/Lights/lamp.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/Lights/lamp.rsi/on-inhand-right.png rename Resources/Textures/Objects/Misc/{lights.rsi/lampgreen_on.png => Lights/lampgreen.rsi/lampgreen-on.png} (100%) rename Resources/Textures/Objects/Misc/{lights.rsi => Lights/lampgreen.rsi}/lampgreen.png (100%) create mode 100644 Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png rename Resources/Textures/Objects/Misc/{ => Lights}/lights.rsi/bananalamp.png (100%) rename Resources/Textures/Objects/Misc/{ => Lights}/lights.rsi/bananalamp_on.png (100%) rename Resources/Textures/Objects/Misc/{ => Lights}/lights.rsi/floodlight.png (100%) rename Resources/Textures/Objects/Misc/{ => Lights}/lights.rsi/floodlight_broken.png (100%) rename Resources/Textures/Objects/Misc/{ => Lights}/lights.rsi/floodlight_burned.png (100%) rename Resources/Textures/Objects/Misc/{ => Lights}/lights.rsi/floodlight_on.png (100%) rename Resources/Textures/Objects/Misc/{ => Lights}/lights.rsi/meta.json (76%) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pen-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pen-inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/utensils.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/utensils.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/utensils.rsi/spoon-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/utensils.rsi/spoon-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/pills.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/pills.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-right.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-right.png rename Resources/Textures/Objects/Tools/rcd.rsi/{rcd_ammo.png => ammo.png} (100%) 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 d9eb843709dedfe9b33ced9349ba84e7ab1322d6..cc43d30588aa2dca89a7b2f23487a761a9fa06f7 100644 GIT binary patch delta 369 zcmaFD)Xh9Wxt@Wuz$3Dlfr0M`2s2LA=96Y%V6^pgaSW-L^LEz8-c|JIbQ{TQ%k0O!nOhhVcgKObLE02j*}zSPC)}D=|EC zVK~#tFhg0~fah?n%<<(@V^%iod!HY7^{CPMPv<{R@v6|NU(hw{`OkabWv`bmd~G$e zC2QW!me)F`KLwtw&}nepAYo?jD}1eVs^^dUHBYtYvz!#u;MD1J&AZKZ^zM3|E{WqG zxBradS4v4g5YPFl)=SWSXZhO2XQs(DsWR#>%$s*2zFE~V@{RQJ`j4mDC+xbheU|!9 zp%!GvWz7&~#NuqJ=P&thEMwJpCOAuY!94d2zlJKgg_evimi-r&Ff5woo)N|nct+Vo qx4~wvdqy0?#=A^haPKDTKag&{b0Jme%kC)*K;Y@>=d#Wzp$Pz_)R>b1 delta 330 zcmeBXe!?_Cxt>wm)5S5QV$R!JhF#4L608rldvmE;Hl}=(n%0#5!#`8|+B7q{Bq_z{ zuIA?6Xx)_QI{wIP2p-{NR)U~VzX$w z*kOYMmhCp@)9c^g`)T64_tXAr-~Y@y4%Q9Z4&UNVi)^dc=$fFy`N*QpkgYU!aqey3 zXYaS(Qqxend}(I%?3;@}@0&fbZGwsf$f4O$ZvVGlagFfX`oBn*ZeCF3z_P<|%`vTvB+^@eG&xeSx_81x* zTaYPL6Q}pWdF|Jz&#GKAc3Xe=`*)Ie#Qwc5jQut@f_C3$j%X-j$OSpoOl*OygEYv1 Zx7Q1;uumf=k2VGy)6a;uK&HnFR&|y z3I;KR1~4efUf@-%olt1*p}bZv!SZx?R~~9h*yqs4(jddhU@6202>?o3FYxF-~F`pf~@n@m|VB`aK~HC#$(Q)*$oVqh$wsIy?& z%*K#S=NqKb*n%p48%Gp>cH7pl?bGG^C&fN+o|XP3%z_AppKNg^hiYGOF}gAUfv2mV J%Q~loCIC2en+E^@ delta 338 zcmbQw{Dx_Qay_H5r;B4q#hkad4D*^D1XwS;KjD}?)=%`-xh6R{{LM$1NQ_zgEV@yk!J(3wOF+y$c znD*_=>yZ@P&bu8l8cdf#H zzTk1g9z$<~V+Sn1hyVO{cMa3KypPklPi>O%t4feo{~pPj^YCcg*59%RU^Xq;$ncWk eQba=uLuULGySM~vH#ao~An-dY8c-~ z&d*E@m5c}WFeJn=80a(15N9~U&G3ws;WN_$xr#U21Ft_nUi*7{<$X`aXJ`9Pe=Xj- zciyI*rk`&}X0@nBJM8>1E1cui6Nar7S0~RZel~ll+u9`z+TUKB+PS%g71cN#wm3W% zNoT*swBnr77S+M>$M;J7 zgBvzQ#O`2U%O8J+P2+!s=I)e>^{am8%)PRVQ^LC9d$;NDGvTO)Vz(-yIywJ2+rFD7 zjC&MAJUo&{R L`njxgN@xNAKc#tm literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..184982360f6dc4f78ed080bb38a29378e29157d7 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vm( zPZ!6KiaBp@ZPaH@lsNwJKBu&|uA14@88djCl$NL}rY2_^Y>-e9s&962Qj+D}Dxtz7 zyX9rBnzw7mT;IntmUdo$y{J&){_;m>-~ZG*TUv4H_m`rbPv(_PSk9o}&*(6ZslkSo zp^}T?lL*5TO@gG@1YV z=8qdi4jn%erowe$>!+rPjWU&Df`=loPsZGhg@Q}Au%#T>Hu z4|+GuujbIJAw!0i zWCo7o3<7|HmLJ1#JUUuE&y%=_jp&m)D)2fqE}&eN5D8)M9DS&k%;1)D3w)7YCNST9VL_;o)5%#LTi^!n{$?aj=0dzi0y6{M9ZbObi+ z{F}eDU+*kmi80rMsoVvbK*5{-2QK>lKPs(=2(TUUi{2I5{kVAL3@{2AJYD@<);T3K F0RTD^(GCCr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bd99422d55237fd9a9d3ff69dc7bb30606d7be57 GIT binary patch literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5X zr;B4q#hkaZ_VzYA2(->$s@*U{=tQS}0b@zR672&AMN5Ri+M%Kezt;T8|a4cb#Uq8-C6?L2H5hngx;*R6ND^uvlzsUo)}6 zwBjy%qk*tO{EuIi7Wyk~R4blNt)Hh~$+PeC|mJim@+vwQvC>lc2C_^@X1*5^gmXnp4uasJEk_tYneWlVb0z0LJB zyZs+VGPimO7#16dUhvIm1uD{~2P$zTY%_r3jOKcp9+V8x^H?#MA+`=B=YvK5oz~f8Orw;a~c2>2Xlxr@&`@Q(OcFrT)gmcT!sIi>sgaphNrhklv9(T(7Wi9)G PvBTi$>gTe~DWM4f{lUAL literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a129336b3f8cb2e14bc1d2fb7f8045582c2dcef4 GIT binary patch literal 381 zcmV-@0fPRCP)Zq}6oBF9O5K?`0y}e#z!9jToS^54s<3w`N65_15t!LCIC>~XE=p4%PMU`QlPn8l zJ@cNC7#;!u0000003e7g%k1JRIZS$L5p=y9X`0$OG5*Z(f!(b4{lqRkpFQktp6C7W z*X#8yax|x(cZ<`OP>sqR+GA>TjH2rl* zFCl~Z$to>|CgLYQB8+L<_FJ+V=N8G|jh>*Mt{az(S@SPFZDIfb00000003aQ7TFdb zx@Qp{uHbXp;@9r=)AblZJFeQpFN(rUZHtfPC+OPcdQZE@Zq~w2=_Chjk84|7=C{Rv z_4WDQwcvFmNg^(3x96NUAZP*npCj}XP6Y}1mYGvQyB{e0{p8I52@fG;TinIsO9KGF b^+eZq}7=~d}sXH@AU}w$|I09AG6ZAY$RrU_$2$|VA0yBFCst;kykVb7Cl#=j1l9f0z zt>Je<@X`4cU8dUpC(kr2|Tm#MP~Nnx^J`|2*^?J?5|Txgo6nKUnP9Iv%+M~CCrt+@_ze%RmYkB4F0;~$^xZMlU20000000000Te9is z+`9HAtZLJPGWZ3)@7z2@aLlc|y)4T}Mfj=lxfnWx-=K}<^_kLN`>M^qB(9&w!J5NMsR>i2+6+>${^m3OMzKmX176>eQ%e3oa2bLjhS2E!7c-+$dS>MNRJ z9n6D%&%Dt3pF`u4?B&S{th*cjR83zae`%H6M!k;o+F45cvab5QS%JPBibb3<9tt%R z_DD!1ygTe~ HDWM4f&kx_B literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2aa9a84475fced4e33a0cc261e9a2dbc7314b6af GIT binary patch literal 525 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VoJ zPZ!6KiaBp*8u}eJ5NZ4GHAjJ4(t<%qnLAkG&fKZOTb4giP~baoiZN)RpH7cQ$4=)6 zr9uXg9P`F)W`4JBEIn5}KP0p(>G=EVLZO%TOob5)9fz45WW*RAZD0^+XKk?1VK|b= zsKCd~0F+{L3tZq8+_P)m{m28`g#U}b_wS6!zFE0;SwnQlullMVM{k{2clvAT>MEJ7 zGnm9am4C9{@N$n4_mqyVWi$CW+ZujGHoe&#GdtnmgpjtI%v zo_*E1<6(Q8)<${Ts$NTFErw`01xccA^pM=xLT%LE{1<`oD0r6pj$4AlY?{yAv_&ObZHLddM z*2`D?(>88ySoY)9>qSy`?e+Qf9?b9EQTO$h-HWZPA?kHq?y_sE`GUA9!3R^khO|?fdHw?g>3{ oD69>+�KP)Vz?2h`YT7xV3<$Q@S4$^ukk`y)o| z^@*}~!0@DeA%;X|5kab7_bSR>fbya>&112YKy#GP!ZQ&cONr46+-^A-TA%Z{+#TufVXfbul;X$B2QwPvtldB zs~g^5`%(7?0000000000KrUL}5CmHqWTuS8L#&9KIz&|&KiSU{YaXWGe_{rsp>D*= z#9e#6S?uhy!R|@;(&^@ti*P$zdId}Iu(vJ>Vi$i==rC^sZ-%d_O|xxl+SH) xocsmY-gw)%BL5WqKN&{u+Mmz>0RAiy`2wDBe}__dRMY?f002ovPDHLkV1h9gwzL2M literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..71d3696007f1bb5e891a616d4d823b55ac02d53a GIT binary patch literal 403 zcmV;E0c`$>P)-{cQGW;R{0000006^Tc-y!XUt+}Q2E5s{^vqw6kUn(&)wqgNJUvdhF9zLRd#@+kjD z0000000000027?26c0k>{o{Q*pT8?Lq=V4~nHey{rXa_XSan&S`R-x;C+WgM! xH4i%WumxD!>UsR<2mVi8{~Ofx0DuvQ$Pe2Uf`<-zN%{Z)002ovPDHLkV1oYazqbGY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8bacdf0e5dfdd1dae61ce8bcf51ed4141f9eccdc GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gm$ zi(^Q|oVT|exeghKussyq6aUhgeJ+Po{aE*Y|M`ni zv*#w89k{f}tM2T>@P-05g*l8I=?sS?aWZdgTJdY;$K}3^eMU9gUkh3sn!7>!z=@x~ m_uu|2lymgI@&|2%o9=CHH;Ikcvl9k-jKR~@&t;ucLK6U&*lwf% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..19dbcd836f30c21ff0505d40f05c18cd450d1907 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;LpaSW-L^Y&IW-ysEo)i`3+aA zvrYBY6Wnc=J1{Vr?oeWAl!_5-aNu3X;jn-$oJAp^S(`~<#X(U_KOGH+AKXU z-rDlgclN0A!p{oN-ZB1pB-YtuE3PpWc?Ln`LHy>(i!$v}YNLT|Ep zmiZJ<^DNs!i-N-w8dey*m!0XEU_Ymf8K^qpN@=W}lhLzB7JIEr_TDL*-!jYMTrmId zeg1-l9efow?~`p#zuC&&_lf&||K604r;I>73=A1livPA`zAn5n>-Y0VGw$$9@LyF) zd>z|l`u+M5!=3UIg0fyUTs8jD@~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..546dbd4883935fe682bea40dfd00745a064f2882 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{vySaSW-L^Y+$5-X;Tqwueb~ z-0rs3YMeQ2_R7Ze`(i=f1+04Ir+%xbsRjM068UqH8>p3mA)#FBE$8*px#yO5*Q`yt zU1O?dmb>fj`i1X*Pp{Ejdb2Pz)NZcx#}1~-PewC^iuUwO{y6JrOBUmyVk6h>ZhiW? zv#g`oI{m?&<31vd$@?2>?`7jw}EG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fd8ee23b4a5f27aa610b4875f20e8c2b41ba8be4 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F0SuLn`LHy%osUWFX*rapi5s zvcq)^e@o0?Rb{D7WSP9pPgk(}`=1FO0nd2rY*~O>fF_*1EOe}pC!NFj`Gv}$=lUD@ z^S`hDa#vw(`-1Q5i(lAiUS#-{SFp1?>Ql_J)m|Hq9z6d^{GaSvl~d0c!TN!O!1Nqn zXO2g6)`rApXZ+n)IkT)cYIkjJ#oq7orhDE$>$vu~>f*N<$uA#dU)i%dVWzTFL+R($ zulVee`^!bWo>xxvet+9H=j8jydH42*r_6paQFhNg_q^RXazLZmls++(*`#hZ403e` OS?B5M=d#Wzp$PyMv2&&X literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7c6f0aa28408eef0a9724175e07beac457e37ab4 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP;jlM zi(^Q|oVT|Y@*Z{&IhNr5ib*ljFj%CtYh8tk@{*~iye3b$;nrUF!Snb%=1N8deTFBj z4SN_Sh%?HS8Dw_5?*K9pmiY63U{sG65fMq?Jppt$gQu&X%Q~loCIBNm BRx8e$kHXfqVCI;>*=3(nzvbGqov?bp>&>TMtFzCAs;CwKb2YN-e17f)GS%e=SF ze>)Ry&B!KhXYTo)|6u=Z#$&(DKg4Sz+f&Q1piKDR?X=CtK!-DUy85}Sb4q9e04Nq( A82|tP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7ea530abbe9b8ee2f705f566cb6f58f942e57fc8 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FhY zi(^Q|oVT|O`3@O~uv~O}^e>!mlZ#Y_(3{?lw0P(An}@@Lj`%;3V%W*%u#Ry;HUk;C*Rk3(Spl@EzpB}xb0>}^nFVdQ&MBb@0Ijcc AmjD0& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..863a40a4932e2c99de5896ae8ff3802dd5b9d66f GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G6o zi(^Q|oVT|w@--1 zbs4w){eH}9*6|wAgyh`RKUX={Za?4^zF*^U?yich4AZ~X-7)<3%H|x?8oQtA$FnM| z=Wk~CZ}ju#tGgGPlOnDvN-7BU|RLZf4to&zBufFxmob?Ig8C5KHL3KIIP?g z!RY(@!`x+mzn^GND3#xL_{#0T#M6YPpy*z|LRw-bFta+QK?Sx9HYQ2|h}X+qrK4 zftp7e^R6%YEL&jnW&du4-PL-LABAkn4$nQR6ZvP$E0G<$XQ+11ui;U`Z3o=yd2$N1 zfW zmNDwwL-rX(z4zP~{F14g@KDh04P)r@4|A9O{eHrCLj~Xc#8;0^f9V<|Usze)9p4Of c=?6x;Mm@PQ#fx=0K;JWXy85}Sb4q9e0K>C<)&Kwi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0f1f04747227f06e5c0c56f604645d6041d860c8 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G3n zi(^Q|oVT|exegofuwFF$;T#M6YPpy*z|LRw-bFta+QK?Sx9HYQ2|h}X+qrK4 zftp7e^R6%YEL&jnW&du4-PL-LABAkn4$nQR6ZvP$E0G<$XQ+11ui;U`Z3o=yd2$N1 zfW zmNDwwL-rX(z4zP~{F14g@KDh04P)r@4|A9O{eHrCLj~Xc#8;0^f9V<|Usze)9p4Of c=?6x;Mm@PQ#fx=0K;JWXy85}Sb4q9e0K>C<)&Kwi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3bbc9fe6839a6bb11a5086fae0cb79bd543437f2 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FYV zi(^Q|oVT+axegofupGZ2|MkEBi`iEsgfzBXST>0#vE0v+^ZkMd_SbC|VhuQvF4H@~ zj}pmseN9ChuO_b!4}9G##%TPf?uCN-Lk@rO*!>4?9A2*ZW=Vg^J;vh;|G#a@`Tplf zmv=#%g>;(dkCUr33(U?;`XJozcw{33VYG8s!CtJp0aj!(wKy?6_L4C2)f)nV#L#a#^>xHW}!D22WQ%mvv4F FO#oNkfnfju literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..71ecded6f6b4872f9268f8097ba3ffc3c1e8a308 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gp% zi(^Q|oVPcl`I-zw*d8hty1%RET(dH(<%qb(l3b>9|Mzx3_t|0dr7?y{VLHPJRfZzY z22^IbibLhJLpHv`<{#&6KXbouwefYPHK&W!=T}bO$vu_hs`Z16lif3?Jzf2cDdctR z9jo8(HIjldXKMi00o}rh;L632QH^UPlhMhQ=89zVHEdH@Ni>u(7 z%)VyD{}+F8$k?^NUsBy7_rAgT`G?-N*xk>)3%<+jJ9y#v>hIwRM;18W*Zs+(1abE- a27RSMO%X-GvyniLGkCiCxvX^=NXpx$-rBA;!HwY+ok%916723UOcX^^yBz`@j0e3-&PIn)hdaY{05* z_M0CGy>Y!W)u5_GZ*vyc9o;m~k8^t*&vY^nMwPo79^Pe~+929LJGhKpgsF@5%q`gf z4hx~6vV&XhGQMnLk>U(aUZwBo%I?$q^NXf|4@-g{7@ZUU-()B(bKw65p!XR(UHx3v IIVCg!06Cm`J^%m! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fa55e86eb97cf04d88a24bb2698eef0dec06b57c GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G*- zi(^Q|oVPc<`3@;axIT1#)OY8<&@MHdjlMD`v>lZ0{XQG|Pk9ToTt_j(5leBN!qC??TmK*SObxAxa|5H9Y&n z8;kd5{+MRJUPR&Dmbd#ku75ZhJApgku9dWBamw?PtUsnd%)e{x(1v6x4$CYLoM^9p z_pttIK*PN1ADq+v9D5;{v9Eo8N>z*G`G#fHKO9f*tA6IZp@QE&;pN9!f5jp;URaub gdc7mm^`98y*nb*ts=m*j4D>#Or>mdKI;Vst0ITVNC;$Ke literal 0 HcmV?d00001 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 3960081269397f9abf7866fdbb7394801eac0dce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=b)GJcAr*7p-ZB(oQsiO1@M7wo z|2LD8H@1rD)riggo|a+Hxx_~lsF17na+|J~%bMD_=GS2Fo zeGT-UBYXeGjrfPR)Bdfh1Sw}=NQfvYPdL)G=vRTC_Z#*#|0d>^vrppR`1Hp9$r@kM dXR$MU`^NHHMY?l`>yw8d^`5SNF6*2UngGKTN2mY* 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 9f582ffb210bbef3b459c7f5cc1812adf7bde53c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4W2HJAr*7p-g4w>RS;nf_#K_~ zKfBtuPQfuXa9I(bMbMYHf@PYFK$Q&AhVDnME3W(TT=$gC+%wN-&sm%6S@pv@$q)pFN#k~CAV7v7{uSxCgdpy@mKHiab e+^xya@FkT|UPZc7=klqIAPt_belF{r5}E*ucSR-u 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 0000000000000000000000000000000000000000..71a75ca66e9cc4fdb2924ac76750aa07b6cef084 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TRw zr;B4q#hkadbomZBh`2uVcJgq&EUQrPhOznh0|N_{SxXfJRc7p(mDk|g;Jkt9pNpe| zoTvGPnVxAy@6+c!O09CrzGZhplK}%cbS!N@`eV1w`Mo#FrQS2XS@8Bt=>q}l=zGj- zR-H~Tm*1OvY|m!VCt?*zKDi@;1NjTf#i!e>rpMy`SGtvKK66P*~33 zapUdJswtQEY`9tKeu=T?^wHT*n0Ev*Ob7;}#rz+b50%BIe(k@t2N+}wp00i_>zopr E02F_Z7ytkO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c9c7de38f4e7a47e808684239bdacfbf530f877a GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR& zr;B4q#hkad6!VxICE6ZNU!usd$=u<=4rktdY~jtT*F4kka1rL=JIq?e`AT38L)4LN zOhzhGbJNOL|NPu{yys@lzuL{4)1EUH@-_-=;p XV)3aHR#ff*1{;H?tDnm{r-UW|dVP^d literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2136e549954953272ab271edea30d593fd632fcd GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TS8 zr;B4q#hkad)@L;Z${hRnyur1*Bk`iijocTf99Cc5w|hqT#=O|j4J)=Q&gfwi>^^jA zV)LE^!IJ88-JfjkZ!7rs;~`J;ey$_N3^>tgrVFp@j(kj!k}KVRdIiJgpV2k%bq;^X zZv5D?J%3~TM*EIH#!FAP?ao^B=iA2n3fJP@68HY-f!v2M3PC1vCeb;{!zGVB>&<&mc+9sU3 z>Ffy!Hr+d^$4cAp-l^WzI>ejhhIood;gLS51y^U^?xbN)WUgGaJRQ~(B z=C9`eJ&$yEx-Yo<)AwBWHRnUA^Ys4P?8$H3;%2RovS*zmUiTp!-pX?1owSB>oFe1K z-)v6z{?>Ae3GB{)P_^f`?G-lej=SaoWqW4#IlS4|X!KZgA8XQg-jF2rKk9JL7PCaJ Wnpu`_@|YbM<_w;$elF{r5}E*f(WX2A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4a70f2f0213f966de94f148e9eba7d1bedb05d4e GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(c zr;B4q#hkY{H}W<)NVGkie&n33&fJ4XL^mWdhhJ!O3ol@nj%d_fbLX&>t#YT~#)t2? ze(YQRod5eF$3pHSmJE+%7z+6sEZ809Fe{v66nM_iQOp1qR`_}#Hu9VAZL!<4_N~@T zdd^$iwo_%A&4CR+zNT@0Rn|K6eaY_VKn3q^|%`a&XasN1( zPvD5$QGYuJfnpK+Zia(57Js?PB5@k#;FIhXOdT?@u@^0L4S*rV;OXk;vd$@?2>`>u BhXVir literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..daece26c5ed49de18be5dfd450a73ac464fee4b4 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(s zr;B4q#hkY{_wpVx5OIAd+}UTVF_W=V)M+wr1mi4|4NTG(RJ1p+idF}(_iShp_^BAW zrh32Cg71AvOF!@w@-SK9BN!ld9&v%c^AvvSAA z{qL;q-?_%{Ufy)N)!L_v1s3N2T=1D=Nx`$-JTvddGa^}p!+wW5FBn$F&fYF5s&F*> zvspd6$In}TrtfE7QkVNL_ln>Oq5Wq6pR9*F*WnIxIz#9~^(=J{U|2DDy85}Sb4q9e E0909p(*OVf literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8f628f746f5f4737bd66f8a9c9b0045b71b0af41 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TS1 zr;B4q#hkY{5B4515OKZOZIXLtnq9;N$7O6)9@jkiuQ*iAU<+cLy>Rk_e9q2N8SmtK zyM=_L-S4Y6>ilV~U~{lxR+z^qaGs$fo#BWv!y`$Ck30=P;XPUm_OaXVJ^T3~e*O1* z?-&flF^Rw}^w(rqwwi}N%_GLE2JPfS)%@BAn@J~9!hQAvBk{Pz8!Tj-r aaoz@xxDbn`kV(MMWAJqKb6Mw<&;$T0FPGc^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c5307f7e60c091663ab70c15410b49dad1960f08 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TRy zr;B4q#hkY{H})QK5OKZOy(KrtOP=L+<94bP0l+XkK(}0$6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/drill.rsi/inhand-left.png index 55f33b51714d50a6f7a7299eb9c846e2bf9af608..48d44cbeb898c2bde4960555aea3bfe8d700ab45 100644 GIT binary patch delta 674 zcmeBYT*o>=qMn0|fq`LFX5l>`#aZAHSn@ox#w@KtTuy>UB2!0%rCF7dg(RB>vz;Xu|s0R z5yg`s7E+wCOhuQR+OMtTTP9?BzIu6Ez><4U>&`3fzh9revzq_i?{{`K_iQWnTg*^q zIv^v+@T`Nuz@4SRQikU2C5D=jQsy zuhS(CpWvzZ_)@NF-*<({Co9%opSbCj*ZPHA{?pp`W{X{s5PYy}-Bcg7tLuBO*~gt% zS@7(CV4JwV&h2~3Gehf>bL1y@sGPH3RQl!f=hn$?^Egw~GqiR@=uCQ7e{02Oy$O=o zeT*6yZY(pj(m0I#iUVCI@Dwrb?3~dRB_qf(H~#j@-;ZA|-rW7~WO{DJKC?%iCsrv4 zonSpzLQsxj$>F5e0{SAKr~e`mcAe{F-8)`Pp- zdcS|Xv{lUg$5DxGYuT)2O6+X69r98TePGeYYMu5(;`ge;xy!!2s^HtqeQ=&?JhMi( z^1q|U*G4}1Tp6Mzy8fxzuk&15P0o4^i!78ltm@Zi{eEovU0+A`=k@>Jq^|^sxW}}f zlb7&Var)QcCnx+axU5*2#3uasgftIB@eOVZ)+2IzHcyS!d;v^_44$rjF6*2UngGs& BEffF% delta 126 zcmZ3-+Rr#aqMV7Dfq~&V`%GUT#S`EY;tHfqOiXHPYd@@F_7U`34&*bI1o;IsI6S+N z2ILrex;TbdoK8-VV12^CT+(Ro!fkPY#pyx@8>>l`2#inG8YvY3H^?+6GpPSxg|8hGA7&Ax2xfxnf)Vw%u738N_b=TERj@>!|C*T{}e01rIv1d$(Ja6of7`GJ*`xIv5Px zSsE;r7|sYXCiHPI6uU6YP-Z$XXBJc0v)NZ>Z!BU_e7I}h{Hld7YRb6hm3|iqxK+LC z)PB7QQoXC5ocB80Zp#w4k730};rH_wEbUzt9TxZX+AOBvbJ-%@uHQBK4K94w>f+bV z57ZF3aQjU~+-lW?`q~0<u;hZgB7Z7OlYZ`M+5_`{WJtOcSck{kHOF z@n+fI_YLNpWpZWAeK=IRaJxNyeppQCD zO{bV;t_a`HK5(&Uah2Vl->bwmEErt`MMCbCnP1tx^jGfH-(n8E^~*IkhHjc@d!zMk z-+=`Sjy<=P{wl+Ii)ml~l7gxr+jV*^d8%(R9#|jmd;Dj=>4Ur%50W?7#69LQ%Z3GxeOaCmkj z4ahO_ba4!^IGvmz!K%W{T+(Ro!oA@Di_?V+Hdd1=5gz#i=RPz}IFM+<$aajOBv^`V a;duszqa0n5Av!uh-3*?telF{r5}E*v{Ui$j 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 0000000000000000000000000000000000000000..6c95dc229a86253361aa82cfde0a145e75616e5c GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=TRdGHLn`LHy|t0I$w8#y;pH9d z)fNrBpDkEF->_&SIuFDP8mXRfN8uYw5k4 z;w#H?29w{&VPj_~N?lvg5USHXgA{3mcPec>FBTPW6s= iIAyGX84ZLn`LHy>*(m*?_0vVL)mB zn}ZB{4g8lU$m#JM;JCAyxm-(p0z>H0hf5=V*=s&Za^1!mBf}2V3IquUpS!;Qd?+SZ zCExdsv#`jkP35uG7AtR;tX)+xF_(3X)y&pqUc0_k?pwIh?Dgeb4O!W15C7_!KU?*e zW!@}>|5f$#7wQSGt1)<5b+7Fc^AvOYwO3r9NtH6WclHRSRuKHdvOu()sl+0UnFf97!KT>Q!KAx>~is9(3jsJ&7Q7) JF6*2UngDnLZ8QJ? literal 0 HcmV?d00001 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 1873ca3ccb7ddad83f0be5ac687606ef60825e9c..b305882226f57665b1a42b7a8a2369cc4b2c34b5 100644 GIT binary patch delta 445 zcmV;u0Yd(r0m}oB7=Hu<00013M{Ml?001XYOjJex0RM7DD!7C&AR{f_wmmR4Mo?8` z>f3`1y2pX(>$}Cr3q4+rkC?r`l{)|c00DGTPE!Ct=GbNc003xuR9JLGWpiV4X>fFD zZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDSycTa*U0*I5Sc+(=$pS zoZ^zil2jm5sVF%`iHkEOv#1!Pg^M$-C^0t`#5UwoR&e!m0UHVc_dXd%kHwBU0002q zNklVGaETU7%DgvuqKIvjbJLoWkry?28e1Z!KJ{+T@yr2 zDp9~L&%y*(;D3Ns0hgkZG>G1)B(wml0-l9FMIc)Jh|~e>b{rI12BNYQWpFr>IY0iP{78(3ZeoS5^yLO1*2e)0R=(|oRB$+SQLmO8NuXajHv*U`5{1EC>4tWO*oT7 z-6;UC0#0=&%D#g>qF{EP7+gpLW4Gugm2e}VruQGbIRE&>VML?t8 znCYI>jjcds3=DRwR>=xhFA^2py~-^ryw85o%$>Wcmt4K8ZR{QeR=~huknu|TL(22l pKNf#V1XJBaf?pNQY{kBfFD zZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDSycTa*U0*I5Sc+(=$pS zoZ^zil2jm5sVF%`iHkEOv#1!Pg^M$-C^0t`#5UwoR&e!m0UHVc_dXd%kHwBU0002l zNkl5DeodIfZ#9&VJavS3Pf-kgE1Ab3kNp9 zITNucU=a?SfLDP5vVui|3K$ADDhe%tbASZ`hJw?|M==rJz*ZpeC`l*4Iamt>cP4}h iSPO&%1{{UuAOHaDsvhu*G%wBo0000D$CQwF{EP7+glrXTO4>;4qO(0w=AZux{%x5i=|(n z{foVD^rurVt9XD)85-tx%m_8Tf3DCq^lZlut~4Tf&6FW_h~$xvX