mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-25 17:42:26 +00:00
Simple animal flavour text will now show instead of desc, if set.
This commit is contained in:
@@ -212,6 +212,8 @@ var/global/list/pre_init_created_atoms // atom creation ordering means some stuf
|
||||
found += A.search_contents_for(path,filter_path)
|
||||
return found
|
||||
|
||||
/atom/proc/get_examine_desc()
|
||||
return desc
|
||||
|
||||
/atom/proc/examine(mob/user, infix = "", suffix = "")
|
||||
var/f_name = "\a [src][infix]."
|
||||
@@ -224,7 +226,7 @@ var/global/list/pre_init_created_atoms // atom creation ordering means some stuf
|
||||
f_name += "<span class='danger'>blood-stained</span> [name][infix]!"
|
||||
else
|
||||
f_name += "oil-stained [name][infix]."
|
||||
var/list/output = list("[bicon(src)] That's [f_name] [suffix]", desc)
|
||||
var/list/output = list("[bicon(src)] That's [f_name] [suffix]", get_examine_desc())
|
||||
if (user.client?.prefs.examine_text_mode == EXAMINE_MODE_SWITCH_TO_PANEL)
|
||||
user.client.statpanel = "Examine"
|
||||
else if (user.client)
|
||||
|
||||
@@ -131,12 +131,10 @@
|
||||
|
||||
/mob/living/simple_mob/animal/examine(mob/living/user)
|
||||
. = ..()
|
||||
if (!harness)
|
||||
return
|
||||
. += "\The [src] is wearing \a [harness]."
|
||||
for (var/obj/item/item in harness.GetAttachedItems())
|
||||
. += "There is \a [item] attached."
|
||||
|
||||
if (harness)
|
||||
. += "\The [src] is wearing \a [harness]."
|
||||
for (var/obj/item/item in harness.GetAttachedItems())
|
||||
. += "There is \a [item] attached."
|
||||
|
||||
/mob/living/simple_mob/animal/proc/RemoveAttachmentVerb()
|
||||
set name = "Remove Harness Attachment"
|
||||
|
||||
@@ -32,10 +32,8 @@
|
||||
/decl/mob_organ_names/quadruped //Most subtypes have this basic body layout.
|
||||
hit_zones = list("head", "torso", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail")
|
||||
|
||||
/mob/living/simple_mob/animal/examine(var/mob/user)
|
||||
. = ..()
|
||||
if(flavor_text)
|
||||
. += flavor_text
|
||||
/mob/living/simple_mob/animal/get_examine_desc()
|
||||
return flavor_text || desc
|
||||
|
||||
/mob/living/simple_mob/animal/verb/set_flavour_text()
|
||||
set name = "Set Flavour Text"
|
||||
|
||||
Reference in New Issue
Block a user