[MIRROR-FIX] Upstream merge 15464 (#7176)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
This commit is contained in:
Selis
2023-11-07 13:33:44 +01:00
committed by GitHub
parent 58d26cc799
commit 2ba38d60af
40 changed files with 272 additions and 332 deletions
@@ -1,18 +0,0 @@
/obj/item/organ/external
var/skip_robo_icon = FALSE //CHOMPStation edit - to force it to use the normal species icon
var/digi_prosthetic = FALSE //is it a prosthetic that can be digitigrade
//new function to check for markings
/obj/item/organ/external/proc/is_hidden_by_markings()
//code that checked all limbs.
/*
for(var/obj/item/organ/external/organ in owner.organs)
for(var/M in organ.markings)
var/datum/sprite_accessory/marking/mark_style = organ.markings[M]["datum"]
if (mark_style.hide_body_parts && (organ_tag in mark_style.hide_body_parts))
return 1
*/
for(var/M in markings)
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
if(istype(mark_style,/datum/sprite_accessory/marking/ch) && (organ_tag in mark_style.hide_body_parts))
return 1