From 83e7253741202ab92b6ed60c181664679bc39861 Mon Sep 17 00:00:00 2001
From: Finket <va.ketola@gmail.com>
Date: Tue, 9 Jan 2024 18:28:51 +0200
Subject: [PATCH] Fix my git branch conflicts. Oopsy!

---
 .../Entities/Mobs/Player/admin_ghost.yml      |  11 ---------
 .../Mobs/Ghosts/ghost_admin.rsi/animated.png  | Bin 767 -> 0 bytes
 .../Mobs/Ghosts/ghost_admin.rsi/icon.png      | Bin 767 -> 0 bytes
 .../Mobs/Ghosts/ghost_admin.rsi/meta.json     |  21 ------------------
 4 files changed, 32 deletions(-)
 delete mode 100644 Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/animated.png
 delete mode 100644 Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/icon.png
 delete mode 100644 Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 331980d5d8..3f5a7af8d3 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -81,17 +81,6 @@
   - type: Stripping
   - type: SolutionScanner
   - type: IgnoreUIRange
-  - type: Sprite
-    overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-    netsync: false
-    noRot: true
-    drawdepth: Ghosts
-    sprite: SimpleStation14/Mobs/Ghosts/ghost_admin.rsi
-    state: animated
-    color: "#888888"
-    layers:
-      - state: animated
-        shader: unshaded
 
 - type: entity
   id: ActionAGhostShowSolar
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/animated.png b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/animated.png
deleted file mode 100644
index 4332192a919369386e80908bf25882eae2d17d7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008UNkl<Zc%1E;
zPi~_y6vjVh6t*Mv0+DiyG@3Ka8Wu=l$D$k5b7aFJJ0f+Ftb2wi93wYqN3)!6=pvXH
z;@GkApEmd>Ss32K->d6jlJ@|QXVe7BckX}HZU6T_^>MzX{^n;5;M`8<Bhk;%6({X<
z{m%8D&w_{E5kTG8t>`nGg8mN~=h<7{_7}Zl-);iY_@?zwBFmgP`_1*c*JlP{Ra~>a
z)b>Gyj++(BhQ?-WOLD4zZRz!!sny_Ezr0EO+)B+sIMtUG*ByjeeTi+b)a)mV8GXS7
zlr@k_3{Klq3||H2^|=%9i2u!T4ImB3Ip04GPX6cnRk5Kj^(J_a_zB<{r`Q7kDrATd
z*Hi2fA?Er=i0cYj=YCaK`qzjME9u|70(RJP?POv^eyWghdH(<veeMKI!g<?I!UB_U
zjvcl^5*AF~NjL{>qwiONrOz5O2@CA74OH~G6Y%o!)cIpyKAyPm*|a?g3!%RV*ZM6<
zSX}I<hlkgTx3A_J(_e=^Pg4}H5&8ig9$uLN>C$594IOvz61f({;{A`ducbCLJRXn7
z<MDV#ho1TXf~`EgOKkv``FWdpdY9S&uIJ}%<mnA)Yx_;`plcw@TGA6R`^(P3F9dcS
zkg*p6y9}fMRagm^MGCsLwXJ~JGB;WqKsatz0jUMhf&4RInb)iW1=k!mD;Qsaq9O&C
z9|21-^mFyhbHnJ3VZbw>L^pNqiWEa?5=Orb`U#M6rV9>O#Ro$RB4lG=U6YMLc?DF+
zKq@i1!K{rv2w7u4VhxfGSHXV-WSlEx0iB=k7a&ZrA6yi{gEc;V9wA1BOzLe^+X{#f
z8!L{W*<mXzl8`}q0_Xw>x&VRnhZaTfU}=y(DUvWIP9Q1jCI?UVt>oo<TAf%-rRG~q
x<>-gR(~m_qo|~7<SIyCX)wnz!kH_;J_yidkBjS9on%)2a002ovPDHLkV1i0*XGQ=3

diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/icon.png b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/icon.png
deleted file mode 100644
index 4332192a919369386e80908bf25882eae2d17d7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008UNkl<Zc%1E;
zPi~_y6vjVh6t*Mv0+DiyG@3Ka8Wu=l$D$k5b7aFJJ0f+Ftb2wi93wYqN3)!6=pvXH
z;@GkApEmd>Ss32K->d6jlJ@|QXVe7BckX}HZU6T_^>MzX{^n;5;M`8<Bhk;%6({X<
z{m%8D&w_{E5kTG8t>`nGg8mN~=h<7{_7}Zl-);iY_@?zwBFmgP`_1*c*JlP{Ra~>a
z)b>Gyj++(BhQ?-WOLD4zZRz!!sny_Ezr0EO+)B+sIMtUG*ByjeeTi+b)a)mV8GXS7
zlr@k_3{Klq3||H2^|=%9i2u!T4ImB3Ip04GPX6cnRk5Kj^(J_a_zB<{r`Q7kDrATd
z*Hi2fA?Er=i0cYj=YCaK`qzjME9u|70(RJP?POv^eyWghdH(<veeMKI!g<?I!UB_U
zjvcl^5*AF~NjL{>qwiONrOz5O2@CA74OH~G6Y%o!)cIpyKAyPm*|a?g3!%RV*ZM6<
zSX}I<hlkgTx3A_J(_e=^Pg4}H5&8ig9$uLN>C$594IOvz61f({;{A`ducbCLJRXn7
z<MDV#ho1TXf~`EgOKkv``FWdpdY9S&uIJ}%<mnA)Yx_;`plcw@TGA6R`^(P3F9dcS
zkg*p6y9}fMRagm^MGCsLwXJ~JGB;WqKsatz0jUMhf&4RInb)iW1=k!mD;Qsaq9O&C
z9|21-^mFyhbHnJ3VZbw>L^pNqiWEa?5=Orb`U#M6rV9>O#Ro$RB4lG=U6YMLc?DF+
zKq@i1!K{rv2w7u4VhxfGSHXV-WSlEx0iB=k7a&ZrA6yi{gEc;V9wA1BOzLe^+X{#f
z8!L{W*<mXzl8`}q0_Xw>x&VRnhZaTfU}=y(DUvWIP9Q1jCI?UVt>oo<TAf%-rRG~q
x<>-gR(~m_qo|~7<SIyCX)wnz!kH_;J_yidkBjS9on%)2a002ovPDHLkV1i0*XGQ=3

diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json
deleted file mode 100644
index ef523c8759..0000000000
--- a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by Pspritechologist?",
-    "states": [
-        {
-            "name": "animated",
-            "directions": 4,
-            "delays": [[], [], [], []]
-        },
-        {
-            "name": "icon",
-            "directions": 4,
-            "delays": [[], [], [], []]
-        }
-    ]
-}