Fix my git branch conflicts. Oopsy!

Simple-Station · Jan 9, 2024 · 83e7253 · 83e7253
1 parent 20856a5
commit 83e7253
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 32 deletions.
diff --git 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
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/icon.png b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/icon.png
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json