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

26
code/modules/mob/living/silicon/mommi/mommi_subtypes/sammi.dm
View File

@@ -11,9 +11,11 @@
canmove = 0
anchored = 0
var/ghost_name
var/ghost_gender
var/ghost_icon
var/ghost_icon_state
var/ghost_overlays
var/mob/ghost_body
var/cellhold = null
var/unsafe = 0
@@ -229,7 +231,19 @@
/mob/living/silicon/robot/mommi/sammi/ghost()
//if(src.subtype == "sammi")
if(client && key)
ghostize(1)
var/mob/dead/observer/ghost = ghostize(1)
if(ghost_body)
ghost.mind.current = ghost_body
if(ghost_name)
ghost.name = ghost_name
if(ghost_gender)
ghost.gender = ghost_gender
if(ghost_icon)
ghost.icon = ghost_icon
if(ghost_icon_state)
ghost.icon_state = ghost_icon_state
if(ghost_overlays)
ghost.overlays = ghost_overlays
//src.mind.current = src.mind.original
src.visible_message("<span class=\"warning\">[src] disconnects from the network...attempting to reconnect!</span>")
if(icon_state == "sammi_online_a")
@@ -243,16 +257,18 @@
var/response = alert(O,"Do you want to take it over?","This SAMMI is mindless","Yes","No")
if(response == "Yes")
if(!(src.key))
ghost_name = O.mind.name
ghost_gender = O.gender
ghost_icon = O.icon
ghost_icon_state = O.icon_state
ghost_overlays = O.overlays
ghost_body = O.mind.current
src.transfer_personality(O.client)
src.visible_message("<span class=\"warning\">[src] is connected to the SAMMI network!</span>")
if(icon_state == "sammi_offline_a")
icon_state = "sammi_online_a"
else
icon_state = "sammi_online"
ghost_name = O.mind.name
ghost_icon = O.icon
ghost_icon_state = O.icon_state
ghost_overlays = O.overlays
updateicon()
else if(src.key)
to_chat(src, "<span class='notice'>Someone has already began controlling this SAMMI. Try another! </span>")