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

Merge branch 'master' into upstream-merge-14343

Browse Source
This commit is contained in:
Nadyr
2023-01-27 09:19:11 -05:00
committed by GitHub
parent 47b530c593 f08f632ed4
commit 43ed184a5c
178 changed files with 189039 additions and 298546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1410,6 +1410,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
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

3
code/modules/organs/organ_icon.dm
View File

@@ -81,8 +81,6 @@ var/global/list/limb_icon_cache = list()
/obj/item/organ/external/proc/get_icon(var/skeletal)
<<<<<<< HEAD
=======
for(var/M in markings)
var/datum/sprite_accessory/marking/mark = markings[M]["datum"]
if(mark.organ_override)
@@ -96,7 +94,6 @@ var/global/list/limb_icon_cache = list()
icon = mob_icon
return mob_icon
>>>>>>> 43b1746a29... Merge pull request #14343 from BonniePandora/override-fail-fix
var/gender = "m"
if(owner && owner.gender == FEMALE)
gender = "f"