From: Tiniest Shark Date: Fri, 21 Mar 2025 09:37:02 +0000 (-0400) Subject: Grenade + Throwable Inhands (#35974) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e72a08681590b486562ad268f7b4b8b0b241a03c;p=space-station-14.git Grenade + Throwable Inhands (#35974) * Added inhands to grenades, bolas, ninja stars, and some bombs. * whoops bolas were wrong hands * Couple more quick fixes whoops --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml index a0e6fe7728..f3ab27fb60 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml @@ -15,7 +15,7 @@ - state: fuel - state: wires - type: Item - sprite: Objects/Consumable/Drinks/cola.rsi + sprite: Objects/Weapons/Bombs/ied.rsi - type: OnUseTimerTrigger delay: 5 examinable: false diff --git a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-left.png new file mode 100644 index 0000000000..b4970b6f76 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-right.png new file mode 100644 index 0000000000..2c07060372 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json index bf1554bef9..6a373a4412 100644 --- a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by deltanedas (github) for SS14, icon and base based on cola sprite from cev-eris", + "copyright": "Created by deltanedas (github) for SS14, icon and base based on cola sprite from cev-eris, Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -27,6 +27,14 @@ 0.5 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-left.png new file mode 100644 index 0000000000..b39803657a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-right.png new file mode 100644 index 0000000000..f4d4d6503b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json index b7585556c6..8b34653482 100644 --- a/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Pipebomb sprites made by girthquake", + "copyright": "Pipebomb sprites made by girthquake. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -26,6 +26,14 @@ 0.2 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-left.png new file mode 100644 index 0000000000..87d69f9070 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-right.png new file mode 100644 index 0000000000..6d307797f2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json index c017ee2117..1a01fe023d 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept. Inhands by TiniestShark (github).", "size": { "x": 32, "y": 32 @@ -35,6 +35,14 @@ 0.1 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-left.png new file mode 100644 index 0000000000..26e5d5df1d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-right.png new file mode 100644 index 0000000000..f69a87aef3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/meta.json index a4d1e8aeb9..0cf3c5b448 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -24,6 +24,14 @@ 0.1 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-left.png new file mode 100644 index 0000000000..9396245d3c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-right.png new file mode 100644 index 0000000000..8fb3081e2e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json index b5584b9e38..c5380e9d70 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-left.png new file mode 100644 index 0000000000..3ba17d7988 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-right.png new file mode 100644 index 0000000000..09e6d03d94 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json index b5584b9e38..add865472f 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/8231234a64b80635369e8da43011ad20bde631ce/icons/obj/grenade.dmi, created by K-Dynamic (github)", + "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/8231234a64b80635369e8da43011ad20bde631ce/icons/obj/grenade.dmi, created by K-Dynamic (github). Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-left.png new file mode 100644 index 0000000000..31fdfa5229 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-right.png new file mode 100644 index 0000000000..70dfa6fdf8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json index ba5198513b..0d4f114a03 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/13630", + "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/13630. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -12,6 +12,14 @@ }, { "name": "primed" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-left.png new file mode 100644 index 0000000000..d030686852 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-right.png new file mode 100644 index 0000000000..80be53b357 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json index 28d3e6969a..007ec65f51 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/grenade.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/b13d244d761a07e200a9a41730bd446e776020d5", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-left.png new file mode 100644 index 0000000000..8b9aef6f93 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-right.png new file mode 100644 index 0000000000..4616fa12df Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json index d3547be774..9258ff1813 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by slava0135 (github) for ss14", + "copyright": "Made by slava0135 (github) for ss14. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-left.png new file mode 100644 index 0000000000..a8fa6c29ba Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-right.png new file mode 100644 index 0000000000..cb0181e72f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json index 28d3e6969a..007ec65f51 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/janitor.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/b13d244d761a07e200a9a41730bd446e776020d5", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-left.png new file mode 100644 index 0000000000..ec49b737d8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-right.png new file mode 100644 index 0000000000..7d8e604e25 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json index 139eebb04d..bd0dfc3f10 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by EmoGarbage404", + "copyright": "Created by EmoGarbage404. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-left.png new file mode 100644 index 0000000000..e2807ef032 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-right.png new file mode 100644 index 0000000000..594e9857e2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json index b0b12127c5..464949afb6 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/modular.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/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept & ElectroSR", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept & ElectroSR. Inhands by TiniestShark (Github)", "size": { "x": 32, "y": 32 @@ -33,6 +33,14 @@ "delays": [ [ 0.2, 0.2 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-left.png new file mode 100644 index 0000000000..d10aa61156 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-right.png new file mode 100644 index 0000000000..c0eec2164d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json index 52f62726ec..cb95749344 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -18,6 +18,14 @@ 0.1 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-left.png new file mode 100644 index 0000000000..0347528548 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-right.png new file mode 100644 index 0000000000..10e990f3da Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json index 28d3e6969a..007ec65f51 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.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/b13d244d761a07e200a9a41730bd446e776020d5", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-left.png new file mode 100644 index 0000000000..b43797fee8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-right.png new file mode 100644 index 0000000000..b929874983 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json index 28d3e6969a..007ec65f51 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.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/b13d244d761a07e200a9a41730bd446e776020d5", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-left.png new file mode 100644 index 0000000000..9e0a46dc35 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-right.png new file mode 100644 index 0000000000..dcfd90d055 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json index 2be285f94e..0902d83772 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Changed sprites taken from infinity baystation 12, https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/grenade.dmi", + "copyright": "Changed sprites taken from infinity baystation 12, https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/grenade.dmi. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -19,6 +19,14 @@ 0.1 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-left.png new file mode 100644 index 0000000000..f9f49462dd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-right.png new file mode 100644 index 0000000000..56ac895bef Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json index cfe6901719..9009ab4eb2 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/83624574e59e68746965ef528604663b16983473/icons/obj/grenade.dmi, created by K-Dynamic (github)", + "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/83624574e59e68746965ef528604663b16983473/icons/obj/grenade.dmi, created by K-Dynamic (github). Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -16,6 +16,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-left.png new file mode 100644 index 0000000000..79f1040a4f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-right.png new file mode 100644 index 0000000000..951d4ea6f1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json index 2f3dee4f0a..890db56436 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Derived from Arendian (https://github.com/space-wizards/space-station-14/commit/3e766402b9d6c17f41f9e7e814b70eef83a95568), created by K-Dynamic", + "copyright": "Derived from Arendian (https://github.com/space-wizards/space-station-14/commit/3e766402b9d6c17f41f9e7e814b70eef83a95568), created by K-Dynamic. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-left.png new file mode 100644 index 0000000000..b87438cff9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-right.png new file mode 100644 index 0000000000..ffc905f460 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json index a7f808a399..d20d310e07 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.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/b13d244d761a07e200a9a41730bd446e776020d5", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -23,6 +23,14 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-left.png new file mode 100644 index 0000000000..30d0dc8e48 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-right.png new file mode 100644 index 0000000000..a88a9eae57 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json index 69413f3b8c..58dc6db18b 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Derived from deltanedas (https://github.com/space-wizards/space-station-14/commit/7dd472c934e61e4087a3f991ed9b51f0eb99271c), created by K-Dynamic (github)", + "copyright": "Derived from deltanedas (https://github.com/space-wizards/space-station-14/commit/7dd472c934e61e4087a3f991ed9b51f0eb99271c), created by K-Dynamic (github). Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -12,6 +12,14 @@ }, { "name": "primed" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-left.png new file mode 100644 index 0000000000..f56e338154 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-right.png new file mode 100644 index 0000000000..5c7b3c7e77 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json index 2be285f94e..0902d83772 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Changed sprites taken from infinity baystation 12, https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/grenade.dmi", + "copyright": "Changed sprites taken from infinity baystation 12, https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/grenade.dmi. Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -19,6 +19,14 @@ 0.1 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-left.png new file mode 100644 index 0000000000..3b07e6af16 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-right.png new file mode 100644 index 0000000000..14f024a4b5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json index 9efc29f585..95057e2234 100644 --- a/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/3cfea7eb92246d311de8b531347795bc76d6dab6", + "copyright": "Taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/3cfea7eb92246d311de8b531347795bc76d6dab6, Inhands taken from TG Station at https://github.com/tgstation/tgstation/commit/8facec32c9716ec43819057b868bd5c03a05d13d", "size": { "x": 32, "y": 32 @@ -9,6 +9,14 @@ "states": [ { "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-left-festive.png b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-left-festive.png new file mode 100644 index 0000000000..d162ae5da1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-left-festive.png differ diff --git a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-left.png new file mode 100644 index 0000000000..41481bf439 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right-festive.png b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right-festive.png new file mode 100644 index 0000000000..49123cf836 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right-festive.png differ diff --git a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right.png new file mode 100644 index 0000000000..97fd0226ad Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json index c716710532..a3800109c5 100644 --- a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created for SS14 by deltanedas (github), festive by Alekshhh (Github)", + "copyright": "Created for SS14 by deltanedas (github), festive by Alekshhh (Github), Inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -10,8 +10,24 @@ { "name": "icon" }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, { "name": "festive" + }, + { + "name": "inhand-left-festive", + "directions": 4 + }, + { + "name": "inhand-right-festive", + "directions": 4 } ] }