Merge pull request #4858 from Krausus/ExamineInconsistencies

Fixes Mob Examination Inconsistencies
This commit is contained in:
Fox McCloud
2016-07-04 12:05:14 -04:00
committed by GitHub
8 changed files with 17 additions and 36 deletions
@@ -144,11 +144,12 @@
/obj/item/device/mmi/posibrain/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
if(!..(user))
to_chat(user, "<span class='info'>*---------*</span>")
return
var/msg = "<span class='info'>*---------*\nThis is [bicon(src)] \a <EM>[src]</EM>!\n[desc]\n"
msg += "<span class='warning'>"
var/msg = "<span class='info'>"
if(src.brainmob && src.brainmob.key)
switch(src.brainmob.stat)
@@ -158,7 +159,7 @@
if(DEAD) msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
else
msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
msg += "<span class='info'>*---------*</span>"
msg += "*---------*</span>"
to_chat(user, msg)
/obj/item/device/mmi/posibrain/emp_act(severity)
@@ -1,6 +1,7 @@
/mob/living/carbon/slime/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
..(user)
var/msg = ""
var/msg = "<span class='info'>"
if (src.stat == DEAD)
msg += "<span class='deadsay'>It is limp and unresponsive.</span>\n"
else
@@ -1,8 +1,10 @@
/mob/living/silicon/ai/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
if(!..(user))
to_chat(user, "<span class='info'>*---------*</span>")
return
var/msg = ""
var/msg = "<span class='info'>"
if (src.stat == DEAD)
msg += "<span class='deadsay'>It appears to be powered-down.</span>\n"
else
@@ -1,25 +0,0 @@
/mob/living/silicon/pai/examine(mob/user) //removed as it was pointless...moved to the pai-card instead.
/*..(user) //This is totally pointless because this mob is contained inside a card!
var/msg = ""
if (src.stat == DEAD)
msg += "<span class='deadsay'>It appears to be offline.</span>\n"
else
msg += "<span class='warning'>"
if (src.getBruteLoss())
if (src.getBruteLoss() < 30)
msg += "It looks slightly dented.\n"
else
msg += "<B>Its casing appears cracked and broken!</B>\n"
if (src.getFireLoss())
if (src.getFireLoss() < 30)
msg += "It looks slightly charred!\n"
else
msg += "<B>Its casing is melted and heat-warped!</B>\n"
if (src.stat == UNCONSCIOUS)
msg += "It doesn't seem to be responding and its text-output is lagging.\n"
msg += "</span>"
msg += "*---------*</span>"
to_chat(user, msg)
*/
+4 -3
View File
@@ -521,23 +521,24 @@
density = 0 //this is reset every canmove update otherwise
/mob/living/silicon/pai/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
..(user)
var/msg = ""
var/msg = "<span class='info'>"
switch(src.stat)
if(CONSCIOUS)
if(!src.client) msg += "\nIt appears to be in stand-by mode." //afk
if(UNCONSCIOUS) msg += "\n<span class='warning'>It doesn't seem to be responding.</span>"
if(DEAD) msg += "\n<span class='deadsay'>It looks completely unsalvageable.</span>"
msg += "\n*---------*</span>"
if(print_flavor_text()) msg += "\n[print_flavor_text()]\n"
if(print_flavor_text()) msg += "\n[print_flavor_text()]"
if (pose)
if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\nIt is [pose]"
msg += "\n*---------*</span>"
to_chat(user, msg)
@@ -1,7 +1,8 @@
/mob/living/silicon/robot/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
..(user)
var/msg = ""
var/msg = "<span class='info'>"
var/obj/act_module = get_active_hand()
if(act_module)
msg += "It is holding [bicon(act_module)] \a [act_module].\n"
@@ -40,9 +40,10 @@
return
/mob/living/simple_animal/construct/examine(mob/user)
to_chat(user, "<span class='info'>*---------*</span>")
..(user)
var/msg = ""
var/msg = "<span class='info'>"
if (src.health < src.maxHealth)
msg += "<span class='warning'>"
if (src.health >= src.maxHealth/2)