cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes invisible markings (#10979)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-05-31 18:01:28 -07:00
committed by GitHub
parent cfeab936b9
commit f7f88e74fa
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/organ_external.dm
View File

@@ -216,6 +216,8 @@
//new function to check for markings //new function to check for markings
/obj/item/organ/external/proc/is_hidden_by_markings() /obj/item/organ/external/proc/is_hidden_by_markings()
for(var/M in markings) for(var/M in markings)
if(!markings[M]["on"]) //If the marking is off, the organ isn't hidden by it.
continue
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
if(istype(mark_style,/datum/sprite_accessory/marking) && (organ_tag in mark_style.hide_body_parts)) if(istype(mark_style,/datum/sprite_accessory/marking) && (organ_tag in mark_style.hide_body_parts))
return 1 return 1
@@ -1483,6 +1485,8 @@ Note that amputating the affected organ does in fact remove the infection from t
return 1 return 1
if(clothing_only && markings.len) if(clothing_only && markings.len)
for(var/M in markings) for(var/M in markings)
if(!markings[M]["on"]) //If the marking is off, the organ isn't hidden by it.
continue
var/datum/sprite_accessory/marking/mark = markings[M]["datum"] var/datum/sprite_accessory/marking/mark = markings[M]["datum"]
if(mark.hide_body_parts && (organ_tag in mark.hide_body_parts)) if(mark.hide_body_parts && (organ_tag in mark.hide_body_parts))
return 1 return 1