]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Grenade + Throwable Inhands (#35974)
authorTiniest Shark <head.rebel@yahoo.com>
Fri, 21 Mar 2025 09:37:02 +0000 (05:37 -0400)
committerGitHub <noreply@github.com>
Fri, 21 Mar 2025 09:37:02 +0000 (12:37 +0300)
* Added inhands to grenades, bolas, ninja stars, and some bombs.

* whoops bolas were wrong hands

* Couple more quick fixes whoops

72 files changed:
Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json
Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json
Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json
Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-left-festive.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right-festive.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json

index a0e6fe772873b83c1998363203ce17c27047e543..f3ab27fb601c18b4c020f2e1c26b530dab8c6ddc 100644 (file)
@@ -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 (file)
index 0000000..b4970b6
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 (file)
index 0000000..2c07060
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/inhand-right.png differ
index bf1554bef9041e91e409886cbf17b6dd231dceb2..6a373a4412f55ab2730ad1bbfd4ac45e6b7f5c7a 100644 (file)
@@ -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
           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 (file)
index 0000000..b398036
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 (file)
index 0000000..f4d4d65
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/inhand-right.png differ
index b7585556c63496810245caa46ad437cfece9cf6e..8b3465348239677766eaeaff71a137b0017011d3 100644 (file)
@@ -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
           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 (file)
index 0000000..87d69f9
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 (file)
index 0000000..6d30779
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/inhand-right.png differ
index c017ee2117d49d442ddec065a9f5c15a8a007d7f..1a01fe023d7e5b9afa10ede2165f8434d82faa4d 100644 (file)
@@ -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
           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 (file)
index 0000000..26e5d5d
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 (file)
index 0000000..f69a87a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/clusterbomb.rsi/inhand-right.png differ
index a4d1e8aeb91aaef5262fe1372efc41bd2efea68a..0cf3c5b4480453962122896f57bfc25a920e2ff9 100644 (file)
@@ -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
           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 (file)
index 0000000..9396245
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 (file)
index 0000000..8fb3081
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/inhand-right.png differ
index b5584b9e38c35a9eba726fd95d5e8caef815598d..c5380e9d709bc8d7ba5caed946ade602845291c9 100644 (file)
     {
       "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 (file)
index 0000000..3ba17d7
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 (file)
index 0000000..09e6d03
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/inhand-right.png differ
index b5584b9e38c35a9eba726fd95d5e8caef815598d..add865472f080b367c4ccca9cabb4c913803001d 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..31fdfa5
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 (file)
index 0000000..70dfa6f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/inhand-right.png differ
index ba5198513b637748f453a9c7ade8a2b742f0d153..0d4f114a0326a95aa69dd2d721ba83f5192859b9 100644 (file)
@@ -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
     },
     {
       "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 (file)
index 0000000..d030686
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 (file)
index 0000000..80be53b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/inhand-right.png differ
index 28d3e6969a9d4f92980b4a322bcb1ca503751aaf..007ec65f512cca13a09cd8bf68ec919198a87a1e 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..8b9aef6
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 (file)
index 0000000..4616fa1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/inhand-right.png differ
index d3547be77449272e2001c3dbcd0b08c0598c9bef..9258ff1813dd9236970ff3b1d71b01d85c9452ce 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..a8fa6c2
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 (file)
index 0000000..cb0181e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/inhand-right.png differ
index 28d3e6969a9d4f92980b4a322bcb1ca503751aaf..007ec65f512cca13a09cd8bf68ec919198a87a1e 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..ec49b73
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 (file)
index 0000000..7d8e604
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/inhand-right.png differ
index 139eebb04da79d7b95166675efcdf015788f7f5b..bd0dfc3f106f01043aee900991e190a8f1aabffc 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..e2807ef
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 (file)
index 0000000..594e985
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/inhand-right.png differ
index b0b12127c5949d0d3f3769f4b67d49a0d0184b96..464949afb6f0e2b142477ec438f47f4d75c4119c 100644 (file)
@@ -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
         "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 (file)
index 0000000..d10aa61
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 (file)
index 0000000..c0eec21
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/inhand-right.png differ
index 52f62726ec01531497099b9319246da5d1dd2238..cb95749344d1384fb05f768a205e77bec9de1613 100644 (file)
@@ -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
           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 (file)
index 0000000..0347528
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 (file)
index 0000000..10e990f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/inhand-right.png differ
index 28d3e6969a9d4f92980b4a322bcb1ca503751aaf..007ec65f512cca13a09cd8bf68ec919198a87a1e 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..b43797f
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 (file)
index 0000000..b929874
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/inhand-right.png differ
index 28d3e6969a9d4f92980b4a322bcb1ca503751aaf..007ec65f512cca13a09cd8bf68ec919198a87a1e 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..9e0a46d
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 (file)
index 0000000..dcfd90d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/inhand-right.png differ
index 2be285f94e0986df847a6fd1f93d2c81152cc081..0902d837722a5bc15f494acca540901e56154aa9 100644 (file)
@@ -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
           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 (file)
index 0000000..f9f4946
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 (file)
index 0000000..56ac895
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/inhand-right.png differ
index cfe6901719fe221f3f33da6ab62670b36421aaa5..9009ab4eb28d698116ca9897cc2a20bd3d8fb16a 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..79f1040
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 (file)
index 0000000..951d4ea
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/inhand-right.png differ
index 2f3dee4f0a8866e7d46cceb972e696f10b9cd1ce..890db56436fe938e63c66f1e4b1a9676f6ea0f7d 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..b87438c
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 (file)
index 0000000..ffc905f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/inhand-right.png differ
index a7f808a399f514acbfa847ae69b5c9c5587ee8bb..d20d310e078e3793dbfc50ad6b11a5a319c60547 100644 (file)
@@ -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
     {
       "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 (file)
index 0000000..30d0dc8
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 (file)
index 0000000..a88a9ea
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/inhand-right.png differ
index 69413f3b8c4986d2ae543cac6c6f40ff0e757777..58dc6db18b1c3e7e5ac529835a9d9b1c44e7d86b 100644 (file)
@@ -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
     },
     {
       "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 (file)
index 0000000..f56e338
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 (file)
index 0000000..5c7b3c7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/inhand-right.png differ
index 2be285f94e0986df847a6fd1f93d2c81152cc081..0902d837722a5bc15f494acca540901e56154aa9 100644 (file)
@@ -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
           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 (file)
index 0000000..3b07e6a
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 (file)
index 0000000..14f024a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-right.png differ
index 9efc29f58504c1ab24ef48896744d68f894ec6d6..95057e22348c6e478524638492775905b16fabc3 100644 (file)
@@ -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 (file)
index 0000000..d162ae5
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 (file)
index 0000000..41481bf
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 (file)
index 0000000..49123cf
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 (file)
index 0000000..97fd022
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/inhand-right.png differ
index c7167105328929ac52681852a30dbb7e1abdf508..a3800109c55a6f8684194954a78bcad8611cf974 100644 (file)
@@ -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
     {
       "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
     }
   ]
 }