From 4fb8fa3f221ba9429d82a52130ceac1c6fda5335 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 14 Oct 2023 08:09:47 +0100
Subject: [PATCH] update landmine sprites from tg (#20977)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../Entities/Objects/Misc/land_mine.yml       |   4 +-
 .../Recipes/Construction/modular.yml          |   4 +-
 .../Misc/landmine.rsi/landmine-inactive.png   | Bin 0 -> 305 bytes
 .../Objects/Misc/landmine.rsi/landmine.png    | Bin 0 -> 555 bytes
 .../Objects/Misc/landmine.rsi/meta.json       |  24 ++++++++++++
 .../Objects/Misc/uglymine.rsi/meta.json       |  35 ------------------
 .../Misc/uglymine.rsi/uglymine-inactive.png   | Bin 247 -> 0 bytes
 .../Objects/Misc/uglymine.rsi/uglymine.png    | Bin 246 -> 0 bytes
 8 files changed, 28 insertions(+), 39 deletions(-)
 create mode 100644 Resources/Textures/Objects/Misc/landmine.rsi/landmine-inactive.png
 create mode 100644 Resources/Textures/Objects/Misc/landmine.rsi/landmine.png
 create mode 100644 Resources/Textures/Objects/Misc/landmine.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Misc/uglymine.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Misc/uglymine.rsi/uglymine-inactive.png
 delete mode 100644 Resources/Textures/Objects/Misc/uglymine.rsi/uglymine.png

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 0000000000000000000000000000000000000000..dcc68ec28b01e53c0e687bc445f9334f3b14138d
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQdZ
z#WAE}PI96|g2AhXK=vN1ge#1T`6OoXUAS)ir{DL_qotpFOiCRxCS3m?T|Up4gPXhg
z=Ogp^jW4Ia3Myz{xzfXEP2Be0jCO&y3=^K#FxeE?o%j?|>e%-D{XN4R#!ZQR3@aH|
zs$LUJS<X12wRifwrkiJ~f}Th@?_!>3Tix@(quAla_WX%YLNXsWh@X#d%(S;xZ}Xk~
zEisgN((f-1xnp!gWj{z|81Pu!m<bfyEEB1FRi@zaFJ3n`-`@W%R~mKLS1;Yh+)>J+
sIc@SAh9aE>yO>w-y2-*kb3m4X;rRNHmFilOpfF(YboFyt=akR{0NSZ{=>Px#

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1a95e1c37381f93e669632760d0511bb87ead813
GIT binary patch
literal 555
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn-
zPZ!6KiaBp*?e$`I6lp!*q|hO#+N9CZE0wz_Q%A?;sF$M00rwBAIkoKZ2iygkST=Iq
z>R4;v+j)btvz}AP<@Ai1JDhnK%gu|G5ATgP-h6ZRoW1g=Cp`MrXsN_-MvyU~kAtDu
zg<*y=(*YSlfv4WwCqwpLer~=!T&}9&?4JOpGNajFf43Vw`nY4Coc6RYzvj#^;5W0j
z?OXgtv$NydpYx})_wwoJyPf0LacJe|<)4*(^-o?B%hN1T_1?Yuj#pPi-4?p_IrQ`G
zV8cCEvvy>>spU-ktURA_)kEjMY!%CX#x0VvyO!UOKC9m;gK_Dl#W%y<e%G5#omOqU
zV2P=Gr{~_9(uwjB2ZDdPu7CN(s%YotKGRomZ~q>?a;rtlenZ3cWBk9@tkWr7^YL(W
zcCO=8`3Q%H>mDT5t@{@~m+Si0X$w#Bm$I=`a&$e@{Ol~>G==w{`@TP-Y;X@VJnLXE
zaA#@23=8$=%sH2?)*QH38MmH2Te@oLJpKg=pK2Pi>a>Nk<5E7mF<q@;5S@6Q;cmgV
z@6r#HV$ZU_Q4c=r%MaA|_zY0$+!^+OhaiUES@wVjcWN4PpR6~41T);$`x93DSy9b6
S?<g?#89ZJ6T-G@yGywoZ$?9kT

literal 0
HcmV?d00001

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 99157cd53b4022e79adb1f3f3e7a45c8e533159a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQu{nz978JRyuEDCb;v-3?Sp^8
z2cxEJ|DXbaO{YIAu?pT1-qY-@cY(R0UB`-*CA-~XYS8NmS<#OB?@zJUf6v{>-~t9;
z>eXWTJ3Lk#yZ8IrKEq|j=kuSri+6ie@Y$$JF&LZ=O}=Z%o}Ig%|D#s?YZitDA^*zi
zLMC>!+<nEib-#OT*=`%<v#0LKC7$?``9{^OUGmGWdGYIx@ABN3ab;Pg<ZZKC0YBwy
q8@r0vZ8bY4E@3>s0|Z_yw_zwPO`gnsjwKQ369!LLKbLh*2~7ZapJN&T

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 52da78b13b58b5e691d7b33d9fe33369664ce6cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmV<S015wzP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0002JNkl<Zc%1Fi
zKMKMy6vy!=ICvSs)sqw)#P0IENI?Ym2Jhg~3wQwUkVU70Q0)*0DW%pS)wY6uKU4m^
zyk7`J1ONa40PueXO%JH5E5>P>*7l7tjeCAG-@8~<-E&}Ujv^uwF2<F0Ypo<n(&|IJ
z%#Wv!{P6I0zE_c|y3IV3aC`H*?0R;RAj(^Ngf8=kzL!|-MiMW}`T4Rhn_MTA+91k(
w+j{FN|D!KZu-4Yr`uGBU<^uo#0KiYV19+`tlejWY<NyEw07*qoM6N<$f+DPI{r~^~

-- 
2.51.2