From: SeamLesss Date: Thu, 20 Mar 2025 02:18:01 +0000 (-0700) Subject: Medical Item In-Hand Sprites (#34984) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a0c78e7b18f2d10af66e742c5f98228916142398;p=space-station-14.git Medical Item In-Hand Sprites (#34984) * Bruizepack fix and Gauze * tourniquet sprites added * medipen sprites * bodybag sprites * handheld crew moniter sprites * implanter sprites * rollerbed sprites * health analyzer sprite * bloodpack sprite * small rollerbed change * attributuions + spacing fix * fixed? * RAAAAAGH ITS DONE * actually good code * Update Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json * Update Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/meta.json --- diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index 0bb2fab308..29589cd7e8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -63,7 +63,7 @@ visible: false - type: Item sprite: Objects/Specific/Medical/implanter.rsi - heldPrefix: 0 + heldPrefix: implanter size: Small - type: Appearance - type: GenericVisualizer @@ -130,6 +130,7 @@ components: - type: Item sprite: Objects/Specific/Medical/syndi_implanter.rsi + heldPrefix: implanter - type: Sprite sprite: Objects/Specific/Medical/syndi_implanter.rsi state: implanter1 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml index fc252fd9f5..3593ce1df1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml @@ -6,6 +6,8 @@ id: HandheldCrewMonitor description: A hand-held crew monitor displaying the status of suit sensors. components: + - type: Item + heldPrefix: scanner - type: Sprite sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi state: scanner diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index cf0b5ee0c2..d9ee2dcd39 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -118,6 +118,8 @@ - Brutepack - type: Sprite state: brutepack + - type: Item + heldPrefix: brutepack - type: Healing damageContainers: - Biological @@ -200,6 +202,8 @@ id: Bloodpack suffix: Full components: + - type: Item + heldPrefix: bloodpack - type: Tag tags: - Bloodpack @@ -241,6 +245,8 @@ - SecBeltEquip - type: Sprite state: tourniquet + - type: Item + heldPrefix: tourniquet - type: Healing damageContainers: - Biological @@ -268,6 +274,8 @@ - Gauze - type: Sprite state: gauze + - type: Item + heldPrefix: gauze - type: Construction graph: Gauze node: gauze diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml index e3f2e1cd1e..37bbb8a664 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml @@ -14,6 +14,7 @@ visible: true map: [ "enum.PowerDeviceVisualLayers.Powered" ] - type: Item + heldPrefix: analyzer storedRotation: -90 - type: ActivatableUI key: enum.HealthAnalyzerUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index c002f9c671..5837c503a9 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -104,6 +104,17 @@ map: ["enum.SolutionContainerLayers.Fill"] - type: Item sprite: Objects/Specific/Medical/medipen.rsi + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#439822" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#439822" + - state: base-colorB-inhand-right size: Tiny - type: SolutionContainerManager solutions: @@ -166,6 +177,18 @@ id: AntiPoisonMedipen description: A rapid dose of anti-poison. Contains ultravasculine and epinephrine. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#573d9e" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#573d9e" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -193,6 +216,18 @@ id: BruteAutoInjector description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#c73333" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#c73333" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -225,6 +260,18 @@ id: BurnAutoInjector description: A rapid dose of dermaline and leporazine, intended for combat applications. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#427485" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#427485" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -257,6 +304,18 @@ id: RadAutoInjector description: A rapid dose of anti-radiation. Contains arithrazine and bicaridine. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#e3832f" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#e3832f" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -289,6 +348,18 @@ id: PunctAutoInjector description: A rapid dose of puncturase and tranexamic acid, intended for combat applications. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#c7be5d" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#c7be5d" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -321,6 +392,18 @@ id: PyraAutoInjector description: A rapid dose of pyrazine and dermaline, intended for combat applications. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#c7a45d" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#c7a45d" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -353,6 +436,18 @@ id: AirlossAutoInjector description: A rapid dose of saline and dexalin plus, intended to get someone up quickly. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#5d81c7" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#5d81c7" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -385,6 +480,18 @@ id: SpaceMedipen description: Contains a mix of chemicals that protect you from the deadly effects of space. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#a84597" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#a84597" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -418,6 +525,20 @@ id: Stimpack description: Contains enough hyperzine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#9a040e" + - state: base-colorB-inhand-left + color: "#c62933" + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#9a040e" + - state: base-colorB-inhand-right + color: "#c62933" - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -450,6 +571,20 @@ id: StimpackMini description: A microinjector of hyperzine that give you about 15 seconds of the chemical's effects. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#9a040e" + - state: base-colorB-inhand-left + color: "#c62933" + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#9a040e" + - state: base-colorB-inhand-right + color: "#c62933" - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: @@ -477,6 +612,18 @@ id: CombatMedipen description: A single-use medipen containing chemicals that regenerate most types of damage. components: + - type: Item + inhandVisuals: + left: + - state: base-needle-inhand-left + - state: base-colorA-inhand-left + color: "#5bcaca" + - state: base-colorB-inhand-left + right: + - state: base-needle-inhand-right + - state: base-colorA-inhand-right + color: "#5bcaca" + - state: base-colorB-inhand-right - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 32f997d50f..421a459b72 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -6,6 +6,7 @@ components: - type: Item size: Small + heldPrefix: bag - type: Sprite drawdepth: SmallObjects # I guess body bags need appear above a coroner's table? sprite: Objects/Specific/Medical/Morgue/bodybags.rsi diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index 9f3fbd7c45..e91f387d15 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -8,6 +8,7 @@ noRot: true - type: Item size: Normal + heldPrefix: rollerbed - type: Sprite sprite: Structures/Furniture/rollerbeds.rsi noRot: true @@ -88,6 +89,8 @@ parent: RollerBed description: A run-down rollerbed. Used to carry patients around. components: + - type: Item + heldPrefix: cheap_rollerbed - type: Sprite layers: - state: cheap_rollerbed @@ -116,6 +119,8 @@ parent: RollerBed description: A robust looking rollerbed used for emergencies. components: + - type: Item + heldPrefix: emergency_rollerbed - type: Sprite layers: - state: emergency_rollerbed diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bag-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bag-inhand-left.png new file mode 100644 index 0000000000..914b2a2906 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bag-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bag-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bag-inhand-right.png new file mode 100644 index 0000000000..0c46f37215 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bag-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json index e872787314..caf82f33ed 100644 --- a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.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/39659000f380583c35fb814ee2fadab24c2f8076, additional label sprites by Vermidia", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/39659000f380583c35fb814ee2fadab24c2f8076, additional label sprites by Vermidia, bag in-hand sprites by SeamLesss (github)", "size": { "x": 32, "y": 32 @@ -10,6 +10,14 @@ { "name": "bag" }, + { + "name": "bag-inhand-left", + "directions": 4 + }, + { + "name": "bag-inhand-right", + "directions": 4 + }, { "name": "bag_folded" }, diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json index 93459edf34..06107f2621 100644 --- a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/ab4abf318f293a701754656dd4e9261eb70f8824#diff-9ab5c8a5e47ab7cfaeadd859a23e32b05de1fe839e99ea767fd7e340b6385d67", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/ab4abf318f293a701754656dd4e9261eb70f8824#diff-9ab5c8a5e47ab7cfaeadd859a23e32b05de1fe839e99ea767fd7e340b6385d67, in-hands modified by SeamLesss (github) from Objects/Misc/qm_clipboard.rsi/inhand-(left/right)", "states": [ { "name": "scanner", @@ -17,6 +17,14 @@ ] ] }, + { + "name": "scanner-inhand-left", + "directions": 4 + }, + { + "name": "scanner-inhand-right", + "directions": 4 + }, { "name": "icon", "directions": 1 diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner-inhand-left.png new file mode 100644 index 0000000000..e5ffd7ab43 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner-inhand-right.png new file mode 100644 index 0000000000..301a05f195 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/analyzer-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/analyzer-inhand-left.png new file mode 100644 index 0000000000..f05e4f72b6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/analyzer-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/analyzer-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/analyzer-inhand-right.png new file mode 100644 index 0000000000..60d768ce69 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/analyzer-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/meta.json index bf3ad807d6..8440af2699 100644 --- a/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f07f847706d85b7cfa4b398e5175732212b69a63 and recolored", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f07f847706d85b7cfa4b398e5175732212b69a63 and recolored, in-hand sprites by SeamLesss (github)", "states": [ { "name": "analyzer", @@ -26,6 +26,14 @@ ] ] }, + { + "name": "analyzer-inhand-left", + "directions": 4 + }, + { + "name": "analyzer-inhand-right", + "directions": 4 + }, { "name": "icon" } diff --git a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter-inhand-left.png new file mode 100644 index 0000000000..0beb3564b5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter-inhand-right.png new file mode 100644 index 0000000000..bfc96fd908 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/meta.json index efcfc1c348..5c5279e5ad 100644 --- a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, resprite by @linkblyat", + "copyright": "Taken from tgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, resprite by @linkblyat, in-hand sprites by SeamLesss (github)", "size": { "x": 32, "y": 32 @@ -10,6 +10,14 @@ { "name": "broken" }, + { + "name": "implanter-inhand-left", + "directions": 4 + }, + { + "name": "implanter-inhand-right", + "directions": 4 + }, { "name": "implanter0" }, diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-inhand-left.png new file mode 100644 index 0000000000..33eea9d11e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-inhand-right.png new file mode 100644 index 0000000000..3888e2347c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze-inhand-left.png new file mode 100644 index 0000000000..311315196c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze-inhand-right.png new file mode 100644 index 0000000000..1da6309b2e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze-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 e4f039ada9..5c32c08d7d 100644 --- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json @@ -3,7 +3,7 @@ "license": "CC-BY-SA-3.0", "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser", "copyright": "Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi", - "copyright": "Tourniquet Sprite by PoorMansDreams", + "copyright": "Tourniquet Sprite by PoorMansDreams, in-hand sprites of tourniquet, gauze, and bloodpack made by SeamLesss (github)", "size": { "x": 32, "y": 32 @@ -26,9 +26,25 @@ { "name": "gauze" }, + { + "name": "gauze-inhand-left", + "directions": 4 + }, + { + "name": "gauze-inhand-right", + "directions": 4 + }, { "name": "tourniquet" }, + { + "name": "tourniquet-inhand-left", + "directions": 4 + }, + { + "name": "tourniquet-inhand-right", + "directions": 4 + }, { "name": "morphine" }, @@ -46,6 +62,14 @@ { "name": "bloodpack" }, + { + "name": "bloodpack-inhand-left", + "directions": 4 + }, + { + "name": "bloodpack-inhand-right", + "directions": 4 + }, { "name": "medicated-suture" }, @@ -60,11 +84,11 @@ { "name": "regenerative-mesh" }, - { + { "name": "regenerative-mesh-inhand-right", "directions": 4 }, - { + { "name": "regenerative-mesh-inhand-left", "directions": 4 }, diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet-inhand-left.png new file mode 100644 index 0000000000..d73369f8d8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet-inhand-right.png new file mode 100644 index 0000000000..eb56ebead5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorA-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorA-inhand-left.png new file mode 100644 index 0000000000..5733b6196e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorA-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorA-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorA-inhand-right.png new file mode 100644 index 0000000000..46183d118d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorA-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorB-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorB-inhand-left.png new file mode 100644 index 0000000000..b2d089f6f8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorB-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorB-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorB-inhand-right.png new file mode 100644 index 0000000000..3b6f73c8ad Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-colorB-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-needle-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-needle-inhand-left.png new file mode 100644 index 0000000000..926f99c66b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-needle-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-needle-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-needle-inhand-right.png new file mode 100644 index 0000000000..fb5819cdba Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/base-needle-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png deleted file mode 100644 index 993468f79b..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png deleted file mode 100644 index 9b62a31f1f..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json index 8872f25f52..a25dd9dcf2 100644 --- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka", + "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka, in-hand sprites by SeamLesss (github)", "size": { "x": 32, "y": 32 @@ -90,12 +90,6 @@ }, { "name": "arithpen_empty" - }, - { - "name": "medipen-inhand-left" - }, - { - "name": "medipen-inhand-right" }, { "name": "punctpen" @@ -114,6 +108,30 @@ }, { "name": "dexpen_empty" + }, + { + "name": "base-needle-inhand-left", + "directions": 4 + }, + { + "name": "base-needle-inhand-right", + "directions": 4 + }, + { + "name": "base-colorA-inhand-left", + "directions": 4 + }, + { + "name": "base-colorA-inhand-right", + "directions": 4 + }, + { + "name": "base-colorB-inhand-left", + "directions": 4 + }, + { + "name": "base-colorB-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter-inhand-left.png new file mode 100644 index 0000000000..1ba6a4a289 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter-inhand-right.png new file mode 100644 index 0000000000..ba988cf7f6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/meta.json index 38050ea310..4d8ca5e772 100644 --- a/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/PestoVerde322/tgstation/blob/37460afeeb24f84e591d538e40bb04e60aef9cf8/icons/obj/syringe.dmi", + "copyright": "Taken from tgstation at commit https://github.com/PestoVerde322/tgstation/blob/37460afeeb24f84e591d538e40bb04e60aef9cf8/icons/obj/syringe.dmi, in-hand sprites by SeamLesss (github)", "size": { "x": 32, "y": 32 @@ -13,6 +13,14 @@ { "name": "implanter0" }, + { + "name": "implanter-inhand-left", + "directions": 4 + }, + { + "name": "implanter-inhand-right", + "directions": 4 + }, { "name": "implanter1" } diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed-inhand-left.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed-inhand-left.png new file mode 100644 index 0000000000..aa33c3775f Binary files /dev/null and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed-inhand-left.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed-inhand-right.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed-inhand-right.png new file mode 100644 index 0000000000..7a42e1665a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed-inhand-right.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed-inhand-left.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed-inhand-left.png new file mode 100644 index 0000000000..e3cf36ec1a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed-inhand-left.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed-inhand-right.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed-inhand-right.png new file mode 100644 index 0000000000..d4c6c628ab Binary files /dev/null and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed-inhand-right.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json index 669e74f8e2..d1a5d2301c 100644 --- a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0, Baystation 12 and AuroraStation", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0, Baystation 12 and AuroraStation, in-hand sprites by SeamLesss (github)", "size": { "x": 32, "y": 32 @@ -10,6 +10,14 @@ { "name": "rollerbed" }, + { + "name": "rollerbed-inhand-left", + "directions": 4 + }, + { + "name": "rollerbed-inhand-right", + "directions": 4 + }, { "name": "rollerbed_buckled" }, @@ -19,6 +27,14 @@ { "name": "cheap_rollerbed" }, + { + "name": "cheap_rollerbed-inhand-left", + "directions": 4 + }, + { + "name": "cheap_rollerbed-inhand-right", + "directions": 4 + }, { "name": "cheap_rollerbed_buckled" }, @@ -28,6 +44,14 @@ { "name": "emergency_rollerbed" }, + { + "name": "emergency_rollerbed-inhand-left", + "directions": 4 + }, + { + "name": "emergency_rollerbed-inhand-right", + "directions": 4 + }, { "name": "emergency_rollerbed_buckled" }, diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/rollerbed-inhand-left.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/rollerbed-inhand-left.png new file mode 100644 index 0000000000..bc9b7f47e4 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/rollerbed-inhand-left.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/rollerbed-inhand-right.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/rollerbed-inhand-right.png new file mode 100644 index 0000000000..c9b606f541 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/rollerbed-inhand-right.png differ