mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-21 04:57:57 +01:00
Reworks examine (a little) (#86506)
## About The Pull Request Basically, reworks how examining things looks to the user. #86497 is required even though this pretty much replaces the entire PR. Examining random objects and simplemobs:   Examining a person:   Examining an ID card a person is wearing (by clicking the hyperlink adorning the ID card when examining them): (Note, you can only pull up this if you are within 3 tiles of the person)  ## Why It's Good For The Game Examine is very old and very inconsistent between atoms and mobs. So I thought I could spruce it up a bit while bringing some consistency along. This should also help with losing certain details in massive walls of examine text - stuff like names will stick out more. ## Changelog 🆑 Melbert qol: The way examine looks has been updated. qol: A person's ID card no longer appears with a big icon on examine. You can now click on their ID card (in the chat box) to get a bigger picture of it, as well as information about them. refactor: Much of examine backend code has been refactored, report any odd looking text. /🆑
This commit is contained in:
@@ -174,10 +174,10 @@
|
||||
|
||||
/obj/item/card/id/get_id_examine_strings(mob/user)
|
||||
. = ..()
|
||||
. += list("[icon2html(get_cached_flat_icon(), user, extra_classes = "bigicon")]")
|
||||
. += list("[icon2html(get_cached_flat_icon(), user, extra_classes = "hugeicon")]")
|
||||
|
||||
/obj/item/card/id/get_examine_string(mob/user, thats = FALSE)
|
||||
return "[icon2html(get_cached_flat_icon(), user)] [thats? "That's ":""][get_examine_name(user)]"
|
||||
/obj/item/card/id/get_examine_icon(mob/user)
|
||||
return icon2html(get_cached_flat_icon(), user)
|
||||
|
||||
/**
|
||||
* Helper proc, checks whether the ID card can hold any given set of wildcards.
|
||||
@@ -1924,10 +1924,10 @@
|
||||
|
||||
/obj/item/card/cardboard/get_id_examine_strings(mob/user)
|
||||
. = ..()
|
||||
. += list("[icon2html(get_cached_flat_icon(), user, extra_classes = "bigicon")]")
|
||||
. += list("[icon2html(get_cached_flat_icon(), user, extra_classes = "hugeicon")]")
|
||||
|
||||
/obj/item/card/cardboard/get_examine_string(mob/user, thats = FALSE)
|
||||
return "[icon2html(get_cached_flat_icon(), user)] [thats? "That's ":""][get_examine_name(user)]"
|
||||
/obj/item/card/cardboard/get_examine_icon(mob/user)
|
||||
return icon2html(get_cached_flat_icon(), user)
|
||||
|
||||
/obj/item/card/cardboard/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -397,7 +397,7 @@
|
||||
var/cyberimp_detect
|
||||
for(var/obj/item/organ/internal/cyberimp/cyberimp in carbontarget.organs)
|
||||
if(IS_ROBOTIC_ORGAN(cyberimp) && !(cyberimp.organ_flags & ORGAN_HIDDEN))
|
||||
cyberimp_detect += "[!cyberimp_detect ? "[cyberimp.get_examine_string(user)]" : ", [cyberimp.get_examine_string(user)]"]"
|
||||
cyberimp_detect += "[!cyberimp_detect ? "[cyberimp.examine_title(user)]" : ", [cyberimp.examine_title(user)]"]"
|
||||
if(cyberimp_detect)
|
||||
render_list += "<span class='notice ml-1'>Detected cybernetic modifications:</span>\n"
|
||||
render_list += "<span class='notice ml-2'>[cyberimp_detect]</span>\n"
|
||||
|
||||
@@ -111,10 +111,8 @@
|
||||
cached_flat_icon = getFlatIcon(src)
|
||||
return cached_flat_icon
|
||||
|
||||
/obj/item/storage/wallet/get_examine_string(mob/user, thats = FALSE)
|
||||
if(front_id)
|
||||
return "[icon2html(get_cached_flat_icon(), user)] [thats? "That's ":""][get_examine_name(user)]" //displays all overlays in chat
|
||||
return ..()
|
||||
/obj/item/storage/wallet/get_examine_icon(mob/user)
|
||||
return icon2html(get_cached_flat_icon(), user)
|
||||
|
||||
/obj/item/storage/wallet/proc/update_label()
|
||||
if(front_id)
|
||||
@@ -175,4 +173,3 @@
|
||||
/obj/item/storage/wallet/money/PopulateContents()
|
||||
for(var/iteration in 1 to pick(3, 4))
|
||||
new /obj/item/holochip(src, rand(50, 450))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user