Merge pull request #9867 from Ghommie/Ghommie-cit375

Ports "examine-code refactor"
This commit is contained in:
BlackMajor
2019-11-25 11:31:03 +13:00
committed by GitHub
332 changed files with 1296 additions and 1350 deletions
+4 -4
View File
@@ -188,17 +188,17 @@
qdel(src)
/obj/item/mmi/examine(mob/user)
..()
. = ..()
if(brainmob)
var/mob/living/brain/B = brainmob
if(!B.key || !B.mind || B.stat == DEAD)
to_chat(user, "<span class='warning'>The MMI indicates the brain is completely unresponsive.</span>")
. += "<span class='warning'>The MMI indicates the brain is completely unresponsive.</span>"
else if(!B.client)
to_chat(user, "<span class='warning'>The MMI indicates the brain is currently inactive; it might change.</span>")
. += "<span class='warning'>The MMI indicates the brain is currently inactive; it might change.</span>"
else
to_chat(user, "<span class='notice'>The MMI indicates the brain is active.</span>")
. += "<span class='notice'>The MMI indicates the brain is active.</span>"
/obj/item/mmi/relaymove(mob/user)
return //so that the MMI won't get a warning about not being able to move if it tries to move
+1 -1
View File
@@ -157,7 +157,7 @@
/obj/item/organ/brain/examine(mob/user)//BUG_PROBABLE_CAUSE to_chats changed to . +=
/obj/item/organ/brain/examine(mob/user)
. = ..()
if(user.suiciding)
+1 -1
View File
@@ -161,7 +161,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
else
msg = "[dead_message]"
to_chat(user, msg)
. += msg
/obj/item/mmi/posibrain/Initialize()
. = ..()