cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes SaMMI possession not allowing re-entering old corpse (#31714)

Browse Source 
Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
kane-f
2021-12-25 17:29:15 +00:00
committed by GitHub
parent 32621630e7
commit 3394ff30b9
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/mob/dead/observer/observer.dm
View File

@@ -87,15 +87,9 @@ var/creating_arena = FALSE
overlays = body.overlays
*/
if(isSaMMI(body))
var/mob/living/silicon/robot/mommi/sammi/SM = body
icon = SM.ghost_icon
icon_state = SM.ghost_icon_state
overlays = SM.ghost_overlays
else
icon = body.icon
icon_state = body.icon_state
overlays = body.overlays
icon = body.icon
icon_state = body.icon_state
overlays = body.overlays
// No icon? Ghost icon time.
if(isnull(icon) || isnull(icon_state))
@@ -106,9 +100,6 @@ var/creating_arena = FALSE
// END BAY SPOOKY GHOST SPRITES
gender = body.gender
if(isSaMMI(body))
var/mob/living/silicon/robot/mommi/sammi/SM2 = body
name = SM2.ghost_name
if(body.mind && body.mind.name)
name = body.mind.name
else