From 8dce6c083a98fa384b3032497013a2c3de8b8797 Mon Sep 17 00:00:00 2001
From: JDtrimble <igor.mamaev1@gmail.com>
Date: Fri, 14 Jun 2024 08:41:17 +0300
Subject: [PATCH 1/2] medibot goes vomp-vomp

---
 .../Prototypes/Entities/Mobs/NPCs/silicon.yml |   2 +-
 .../Mobs/Silicon/Bots/medibot.rsi/medibot.png | Bin 0 -> 749 bytes
 .../Mobs/Silicon/Bots/medibot.rsi/meta.json   |  23 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/medibot.png
 create mode 100644 Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index b18b07f7ca1..9d42ec52e1f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -275,7 +275,7 @@
         reagent: SpaceDrugs
         quantity: 25
   - type: Sprite
-    sprite: Mobs/Silicon/Bots/medibot.rsi
+    sprite: _Sunrise/Mobs/Silicon/Bots/medibot.rsi  # Sunrise-medibot
     state: medibot
   - type: HTN
     rootTask:
diff --git a/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/medibot.png b/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/medibot.png
new file mode 100644
index 0000000000000000000000000000000000000000..df5d63d6e3d6dbe0939ab483c14a0b47803b8836
GIT binary patch
literal 749
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xVpQC
z?Kp5sSw**^rqil)e&*_noE$u=cByOb{d@7|eWj4lnQ+lR*J^;u+bd4!04ctbAiv=M
z$biB1z?~Be3{2skE{-7)t$U|EoVHqlr^Pwr^6F{d>+f1KvTQl^BinMf?e23W90E4;
zm#8~CaTHZ7GCcOjWrpH^;kftVCO>MPsDG-gP2!#*+4b+=_dYctF`lbaeEvu~AK1Il
ze?erd$kkP`p#`}bUw<@(Ok)lDQL(ivXe+x9kE!Ds6^@#)RbMYMr?u^BQ~2Rpd+-y>
ztNR`xjcN&*fnJ>}#ERB@JjCPMKZB*{!&ONidq(p%tCWL!2bpB&rv>&ges8lnv;F#Q
z-wAJj>2VvE$kqyNbok0?ax4G9)`f4I<bxd&Ux>db<J)1{6Podk?|S>$#I`_v=Ijz%
zpo*!95iIjoXT9AJE0*@cXco)Y%FRa>wI?6wU8pa1{^Eyccb7%z^}UrSNY40qF!bwN
z*U4X3E1kLU_0r<h=^HQA#-&N972K`g^KzEXnG3=f?);pxVb8+zt&*Q2?!3IaH*fX+
z_m3<S%-7r&=bJo#_J$vt%3@W2wfCQjK9Co&|Ni?blZrh%`;N~z`1I4di4$(e_O)$U
zI{9GfS@lW!H=b!1Fs4t{o<3P|E^lT1QS+-yUcQp;HeWEcVWpyaMRSC;<o=?4*K;|8
zo$tEJS|{&$bBL$<&{tmhdmiO%W-ZbGR2n`o@+Q<ca6Xlk4{)0Kfl*cD5c`w>2_R=7
zP_*?UP~a50z%ih}rc4ki^px34qlI5%p@H3k7N;K#LR^o50{lS6sVP8FpPvav2aWA!
r_<Vq=IRsPF1C&;Q8&Pt{?}Pl_!q%f5M|9@`6CZ=8tDnm{r-UW|itAMz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json b/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json
new file mode 100644
index 00000000000..db418ae8dec
--- /dev/null
+++ b/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "copyright": "Sprited by discord: odlieerr",
+	"license": "CLA",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "directions": 1,
+            "name": "medibot",
+            "delays": [
+                [
+                    0.2,
+                    0.3,
+                    0.2,
+                    0.3
+                ]
+            ]
+        }
+    ],
+    "version": 1
+}

From 620bcf103f6965d86a7d06a325d31afe02e6ba66 Mon Sep 17 00:00:00 2001
From: JDtrimble <igor.mamaev1@gmail.com>
Date: Fri, 14 Jun 2024 08:44:59 +0300
Subject: [PATCH 2/2] finish merge

---
 .../_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json      | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json b/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json
index 10598120073..db418ae8dec 100644
--- a/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Mobs/Silicon/Bots/medibot.rsi/meta.json
@@ -12,20 +12,12 @@
             "delays": [
                 [
                     0.2,
-<<<<<<< HEAD
                     0.3,
                     0.2,
                     0.3
-=======
-                    0.2
->>>>>>> upstream/master
                 ]
             ]
         }
     ],
     "version": 1
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> upstream/master