cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 00:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes accessories individually examinable when you examine someone (#10842)

Browse Source
This commit is contained in:
fernerr
2020-12-23 18:13:30 +01:00
committed by GitHub
parent 1b5ad28615
commit 1e5dcbb7e5
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -45,8 +45,17 @@
if(istype(w_uniform,/obj/item/clothing/under)) if(istype(w_uniform,/obj/item/clothing/under))
var/obj/item/clothing/under/U = w_uniform var/obj/item/clothing/under/U = w_uniform
if(LAZYLEN(U.accessories)) if(LAZYLEN(U.accessories))
tie_msg += ". Attached to it is [lowertext(english_list(U.accessories))]" tie_msg += ". Attached to it is"
tie_msg_warn += "! Attached to it is [lowertext(english_list(U.accessories))]" tie_msg_warn += "! Attached to it is"
var/list/accessory_descs = list()
for(var/accessory in U.accessories)
if(istype(accessory, /obj/item/clothing/accessory/holster)) //so you can't see what kind of gun a holster is holding from afar
accessory_descs += "\a [accessory]"
else
accessory_descs += "<a href='?src=\ref[src];lookitem_desc_only=\ref[accessory]'>\a [accessory]</a>"
tie_msg += " [lowertext(english_list(accessory_descs))]"
tie_msg_warn += " [lowertext(english_list(accessory_descs))]"
if(w_uniform.blood_color) if(w_uniform.blood_color)
msg += "<span class='warning'>[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained <a href='?src=\ref[src];lookitem_desc_only=\ref[w_uniform]'>[w_uniform.name]</a>[tie_msg_warn].</span>\n" msg += "<span class='warning'>[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained <a href='?src=\ref[src];lookitem_desc_only=\ref[w_uniform]'>[w_uniform.name]</a>[tie_msg_warn].</span>\n"
@@ -71,8 +80,14 @@
if(istype(wear_suit,/obj/item/clothing/suit)) if(istype(wear_suit,/obj/item/clothing/suit))
var/obj/item/clothing/suit/U = wear_suit var/obj/item/clothing/suit/U = wear_suit
if(LAZYLEN(U.accessories)) if(LAZYLEN(U.accessories))
tie_msg += ". Attached to it is [lowertext(english_list(U.accessories))]" tie_msg += ". Attached to it is"
tie_msg_warn += "! Attached to it is [lowertext(english_list(U.accessories))]" tie_msg_warn += "! Attached to it is"
var/list/accessory_descs = list()
for(var/accessory in U.accessories)
accessory_descs += "<a href='?src=\ref[src];lookitem_desc_only=\ref[accessory]'>\a [accessory]</a>"
tie_msg += " [lowertext(english_list(accessory_descs))]"
tie_msg_warn += " [lowertext(english_list(accessory_descs))]"
if(wear_suit.blood_color) if(wear_suit.blood_color)
msg += "<span class='warning'>[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained <a href='?src=\ref[src];lookitem_desc_only=\ref[wear_suit]'>[wear_suit.name]</a>[tie_msg_warn].</span>\n" msg += "<span class='warning'>[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained <a href='?src=\ref[src];lookitem_desc_only=\ref[wear_suit]'>[wear_suit.name]</a>[tie_msg_warn].</span>\n"

4
html/changelogs/Ferner-201220-coding_examineaccessories.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Ferner
delete-after: True
changes:
- tweak: "You can now also examine a person's accessories individually when you examine someone."