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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,8 @@
var/body_hair // Icon blend for body hair if any.
var/mob/living/applied_pressure
var/list/markings = list() // Markings (body_markings) to apply to the icon
var/skip_robo_icon = FALSE //to force it to use the normal species icon
var/digi_prosthetic = FALSE //is it a prosthetic that can be digitigrade
// Wound and structural data.
var/wound_update_accuracy = 1 // how often wounds should be updated, a higher number means less often
@@ -201,6 +203,12 @@
O = O.parent
return 0
//new function to check for markings
/obj/item/organ/external/proc/is_hidden_by_markings()
for(var/M in markings)
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))
return 1
/obj/item/organ/external/proc/dislocate()
if(dislocated == -1)