From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 14 Oct 2023 07:09:47 +0000 (+0100)
Subject: update landmine sprites from tg (#20977)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4fb8fa3f221ba9429d82a52130ceac1c6fda5335;p=space-station-14.git

update landmine sprites from tg (#20977)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---

diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index 10dd229606..9088edc815 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -21,8 +21,8 @@
           - LowImpassable
   - type: Sprite
     drawdepth: Items
-    sprite: Objects/Misc/uglymine.rsi
-    state: uglymine
+    sprite: Objects/Misc/landmine.rsi
+    state: landmine
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
diff --git a/Resources/Prototypes/Recipes/Construction/modular.yml b/Resources/Prototypes/Recipes/Construction/modular.yml
index 73d0869372..affacb098b 100644
--- a/Resources/Prototypes/Recipes/Construction/modular.yml
+++ b/Resources/Prototypes/Recipes/Construction/modular.yml
@@ -20,6 +20,6 @@
   category: construction-category-weapons
   description: Construct a landmine using a payload.
   icon:
-    sprite: Objects/Misc/uglymine.rsi
-    state: uglymine
+    sprite: Objects/Misc/landmine.rsi
+    state: landmine
   objectType: Item
diff --git a/Resources/Textures/Objects/Misc/landmine.rsi/landmine-inactive.png b/Resources/Textures/Objects/Misc/landmine.rsi/landmine-inactive.png
new file mode 100644
index 0000000000..dcc68ec28b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/landmine.rsi/landmine-inactive.png differ
diff --git a/Resources/Textures/Objects/Misc/landmine.rsi/landmine.png b/Resources/Textures/Objects/Misc/landmine.rsi/landmine.png
new file mode 100644
index 0000000000..1a95e1c373
Binary files /dev/null and b/Resources/Textures/Objects/Misc/landmine.rsi/landmine.png differ
diff --git a/Resources/Textures/Objects/Misc/landmine.rsi/meta.json b/Resources/Textures/Objects/Misc/landmine.rsi/meta.json
new file mode 100644
index 0000000000..3e9740d445
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/landmine.rsi/meta.json
@@ -0,0 +1,24 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b764f0e8c3004ad5e7726e7ff27a52a0c893beff/icons/obj/weapons/grenade.dmi",
+  "states": [
+    {
+      "name": "landmine",
+      "delays": [
+        [
+          0.4,
+          0.15,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "landmine-inactive"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/uglymine.rsi/meta.json b/Resources/Textures/Objects/Misc/uglymine.rsi/meta.json
deleted file mode 100644
index 1a7dcae417..0000000000
--- a/Resources/Textures/Objects/Misc/uglymine.rsi/meta.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "version": 1,
-    "size":
-    {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/blob/4323540b6bec3ae93bbf13d685c2dbe0cb40a36e/icons/obj/items_and_weapons.dmi",
-    "states":
-    [
-        {
-            "name": "uglymine",
-            "directions": 1,
-            "delays":
-            [
-                [
-                    0.3,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "uglymine-inactive",
-            "directions": 1,
-            "delays":
-            [
-                [
-                    0.3,
-                    0.1
-                ]
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Misc/uglymine.rsi/uglymine-inactive.png b/Resources/Textures/Objects/Misc/uglymine.rsi/uglymine-inactive.png
deleted file mode 100644
index 99157cd53b..0000000000
Binary files a/Resources/Textures/Objects/Misc/uglymine.rsi/uglymine-inactive.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/uglymine.rsi/uglymine.png b/Resources/Textures/Objects/Misc/uglymine.rsi/uglymine.png
deleted file mode 100644
index 52da78b13b..0000000000
Binary files a/Resources/Textures/Objects/Misc/uglymine.rsi/uglymine.png and /dev/null differ