From ef4a3986c3264cdd4fe5c83f9a9d59a1be7a1ef2 Mon Sep 17 00:00:00 2001
From: foboscheshir <156405958+foboscheshir@users.noreply.github.com>
Date: Sat, 3 Aug 2024 15:24:10 +0700
Subject: [PATCH 1/5] Add files via upload

---
 .../Mask/sadmime.rsi/equipped-MASK-vox.png    | Bin 0 -> 475 bytes
 .../Clothing/Mask/sadmime.rsi/meta.json       |  48 ++++++++++--------
 2 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png

diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..87fc58a70a3d2771389b3a776107828ab63883ea
GIT binary patch
literal 475
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr+T_LhE&XX
zd&|)8uz?8MgZmt9-&kTJikiI6MXU@zaqNuZF2$qF(=)`c^}Xkq7GeE`C+z`Ss>35g
zmUfm<j~$#QPySC^HSN!%?~hat8#|a}sg*7&_UrFaJuWTsd`{K-ttYG3AMg6~UdFrb
zgzFBEnOkD?7#WVuxRx&?KWPb*MDm7{pRe6eJOA2=$1{j=&vy-V?G<6WV?zV|!am$9
z-?=S*Vh966Mcp384?F)p{vX((e`xMjE{F1Ke4kh=CPlC?JodKx<xw@~q_7|y@cQfD
zJ(D(n!D?sW+9PjTi`SK=E$Ck6DQ{SPF-D`|*M%c13m-T3NNhf>6f@80=efJDQld;}
z#PeU*I4$IG)i5rao8iPJ9;HRDfhxJtf){m8GcaUlC-$to_3`S~FIm4>7%D9HJiKT7
z=kDT<rLz|mZg=9)QnKHdth7k6WwGJ;Pk{yJGIfsRY`iMqw7Pemz^1&t?E)p+Zd~gu
zpIY-izVT-bAA?4h($gv}C5DE-b@zMf_r*8ntGsPE7w+f+1B<`$U0&$F?MsNc7BIFL
NJYD@<);T3K0RT6p&zt}N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
index 165fd2d46bd0bc..b26333c8c015d5 100644
--- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
@@ -1,22 +1,26 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-MASK",
-      "directions": 4
-    },
-    {
-      "name": "equipped-MASK-reptilian",
-      "directions": 4
-    }
-  ]
-}
+{
+  "version": 1,
+  "license": null,
+  "copyright": null,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vox",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
\ No newline at end of file

From a8afbba0b140ea875f5bc5776476b4671bf9bc23 Mon Sep 17 00:00:00 2001
From: foboscheshir <156405958+foboscheshir@users.noreply.github.com>
Date: Sat, 3 Aug 2024 15:42:41 +0700
Subject: [PATCH 2/5] voxmask lic

---
 Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
index 165fd2d46bd0bc..07aa915a137f49 100644
--- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
@@ -18,5 +18,8 @@
       "name": "equipped-MASK-reptilian",
       "directions": 4
     }
+    {"name":"equipped-mask-vox",
+      "directions": 4
+    }
   ]
 }

From a70f040d1bd6801d29002c917b86e7f4ae43b308 Mon Sep 17 00:00:00 2001
From: foboscheshir <156405958+foboscheshir@users.noreply.github.com>
Date: Sat, 3 Aug 2024 16:10:38 +0700
Subject: [PATCH 3/5] dsdsad

---
 .../Clothing/Mask/sadmime.rsi/meta.json       | 36 +++----------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
index d8ec7f411fdbad..f7aa0c78b0e579 100644
--- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
@@ -1,8 +1,7 @@
-<<<<<<< HEAD
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). Vox edit by foboscheshir (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -18,37 +17,12 @@
     {
       "name": "equipped-MASK-reptilian",
       "directions": 4
-    }
-    {"name":"equipped-mask-vox",
-      "directions": 4
-    }
-  ]
-}
-=======
-{
-  "version": 1,
-  "license": null,
-  "copyright": null,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "equipped-MASK",
-      "directions": 4
     },
     {
-      "name": "equipped-MASK-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-MASK-vox",
-      "directions": 4
-    },
-    {
-      "name": "icon"
+      "name":"equipped-MASK-vox",
+      "directions":4
     }
+  
+    
   ]
 }
->>>>>>> ef4a3986c3264cdd4fe5c83f9a9d59a1be7a1ef2

From 12f89fb351f8d0f935ee5c3360f256e356488bed Mon Sep 17 00:00:00 2001
From: foboscheshir <156405958+foboscheshir@users.noreply.github.com>
Date: Sat, 3 Aug 2024 16:44:22 +0700
Subject: [PATCH 4/5] sadmaskvox

---
 .../Mask/scaredmime.rsi/equipped-MASK-vox.png     | Bin 0 -> 496 bytes
 .../Clothing/Mask/scaredmime.rsi/meta.json        |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png

diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..3591f30f92bf8c4c9e45515489d4ec2082ae3f50
GIT binary patch
literal 496
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zS9!WPhE&XX
zduwCXp#TxK2lp=}y<U?nXk@|7dVS4Ny?svdPRpCpHTbTp7rfF=c{9VcprmY1Y-~)<
zk_(p|l|3gqU6NjX_J3~NnUj|7vr~4kD`;)?n%C{(!oTKeS817x%VC2nOAL6v1_b|`
z>wI*6wXoi%xCg)Oq`taktqsgS@Vz$OQ#SY+Th6g$6Zg|sqKda1NwX=NcEvC?@4%YN
z2TM|evM*0PxaM*pScrik<aaH@0q3QYe#LTq?B2kw!SI$T{WsGYUl$W2H^z(<pPgO(
zZ@cu;Ke`~m^OHXVoIlMuaP@+Vpdq)S(#n~P;_Yg#M|50_0vUcU?7V-hm)+>mjCHdM
zW_~}UUU_Bqt#1WClWV&l7H}k3+ZUMM{CE7b4U6M~y>a^2xA8VP*q&!*xZ}HR<LbY4
zHTrv3?PX-RcYS`vwCVe+P4?wqJ|VI7+PmYKW$GtqmI&`Y5w&`v;qt#49UW@Yg6gvJ
zi=T6>ynFZM=B;L-J5E31{>!!HcJ3X0u^n<epYC`oCx5t=m1s9#{qg*F;Sbn%mNk6V
f>41S1U-mKBGz5CB=h=M#7=;X;u6{1-oD!M<j;i5n

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
index 165fd2d46bd0bc..bb854d8f897367 100644
--- a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)Vox edit by foboscheshir (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -17,6 +17,10 @@
     {
       "name": "equipped-MASK-reptilian",
       "directions": 4
+    },
+    {
+      "name":"equipped-MASK-vox",
+      "directions":4
     }
   ]
 }

From 4ed8304339f68a42fe77a1726486d12204aa98c4 Mon Sep 17 00:00:00 2001
From: foboscheshir <156405958+foboscheshir@users.noreply.github.com>
Date: Sat, 3 Aug 2024 17:21:28 +0700
Subject: [PATCH 5/5] Update meta.json

---
 Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
index bb854d8f897367..3205c135cc32b9 100644
--- a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)Vox edit by foboscheshir (github)",
+  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). Vox edit by foboscheshir (github)",
   "size": {
     "x": 32,
     "y": 32