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

Merge branch 'master' into upstream-merge-14336

Browse Source
This commit is contained in:
Nadyr
2023-01-27 09:43:44 -05:00
committed by GitHub
parent 092c7025fd 309889b705
commit 7d25e70249
193 changed files with 185823 additions and 201869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1411,14 +1411,11 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!istype(I,/obj/item/weapon/implant) && !istype(I,/obj/item/device/nif)) //VOREStation Add - NIFs
return 1
/obj/item/organ/external/proc/is_hidden_by_tail()
/obj/item/organ/external/proc/is_hidden_by_sprite_accessory(var/clothing_only = FALSE) // Clothing only will mean the check should only be used in places where we want to hide clothing icon, not organ itself.
if(owner && owner.tail_style && owner.tail_style.hide_body_parts && (organ_tag in owner.tail_style.hide_body_parts))
return 1
<<<<<<< HEAD
=======
if(clothing_only && markings.len)
for(var/M in markings)
var/datum/sprite_accessory/marking/mark = markings[M]["datum"]
if(mark.hide_body_parts && (organ_tag in mark.hide_body_parts))
return 1
>>>>>>> fd94efe521... Merge pull request #14336 from VOREStation/upstream-merge-8870
return 1