ashstorm mmi fix (#17065)

This commit is contained in:
SteelSlayer
2021-11-12 06:36:57 -06:00
committed by GitHub
parent 7285cef65c
commit de0853e2a0
2 changed files with 14 additions and 2 deletions
+12 -1
View File
@@ -287,5 +287,16 @@
return user.shared_living_ui_distance()
/obj/item/mmi/forceMove(atom/destination)
if(!brainmob)
return ..()
var/atom/old_loc = loc
if(issilicon(old_loc) && !issilicon(destination))
var/mob/living/silicon/S = old_loc
brainmob.weather_immunities -= S.weather_immunities
else if(issilicon(destination))
var/mob/living/silicon/S = destination
brainmob.weather_immunities |= S.weather_immunities
. = ..()
brainmob?.update_runechat_msg_location()
brainmob.update_runechat_msg_location()
@@ -277,7 +277,8 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
SStgui.close_uis(wires)
if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
var/turf/T = get_turf(loc)//To hopefully prevent run time errors.
if(T) mmi.loc = T
if(T)
mmi.forceMove(T)
if(mmi.brainmob)
mind.transfer_to(mmi.brainmob)
mmi.update_icon()