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

SaMMI fixes (#31477)

Browse Source 
* SaMMI fixes

* Preserved ghost stuff

* Removing pointless fix

* Missed a line

* Actual fix

* Stop SaMMIs bumping open doors

* Typo fix

Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
kane-f
2021-12-05 11:23:00 +00:00
committed by GitHub
parent 254496d174
commit 69c9745670
5 changed files with 98 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,10 +86,16 @@ var/creating_arena = FALSE
icon_state = body.icon_state
overlays = body.overlays
*/
icon = body.icon
icon_state = body.icon_state
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
// No icon? Ghost icon time.
if(isnull(icon) || isnull(icon_state))
@@ -100,6 +106,9 @@ 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