cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mirrors #72337 (#18647)

Browse Source 
Fixes clothing not showing armor (#72337)

So the linter didn't detect usage of a private var for some reason.
We never want to directly access the armor var because ideally its null
unless being used

Inspecting armor should work now.

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
This commit is contained in:
Zonespace
2023-01-12 01:16:32 -05:00
committed by GitHub
co-authored by Zephyr
parent 4fc45c95be
commit ca3fb2aea6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+2 -1
View File
@@ -286,7 +286,7 @@
how_cool_are_your_threads += "</span>"
. += how_cool_are_your_threads.Join()
if(armor.has_any_armor() || flags_cover & HEADCOVERSMOUTH || flags_cover & PEPPERPROOF)
if(get_armor().has_any_armor() || (flags_cover & (HEADCOVERSMOUTH|PEPPERPROOF)))
. += span_notice("OOC: Click <a href='?src=[REF(src)];list_armor=1'>here</a> to see its protection classes.") // SKYRAT EDIT ORIGINAL: ("It has a <a href='?src=[REF(src)];list_armor=1'>tag</a> listing its protection classes.")
/obj/item/clothing/Topic(href, href_list)
@@ -295,6 +295,7 @@
if(href_list["list_armor"])
var/list/readout = list("<span class='notice'><u><b>PROTECTION CLASSES</u></b>")
var/datum/armor/armor = get_armor()
var/added_damage_header = FALSE
for(var/damage_key in ARMOR_LIST_DAMAGE())
var/rating = armor.get_rating(damage_key)