Revert "Upstream (#148)"

This reverts commit 9f00d4b9aa.
2024-10-22 22:47:57 +03:00
parent 9f00d4b9aa
commit dbc492f3f3
96 changed files with 1080 additions and 1047 deletions
--- 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",
  "size": {
    "x": 32,
    "y": 32
@@ -19,10 +19,6 @@
        "name": "no-payload",
        "directions": 1
    },
-    {
-        "name": "no-trigger",
-        "directions": 1
-    },
    {
        "name": "complete",
        "directions": 1
--- a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png
+++ b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png