cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

adds body marking zone customization

Browse Source
This commit is contained in:
Seris02
2023-08-09 00:39:25 +08:00
parent 8ef4ccf3be
commit 4860518c1a
9 changed files with 151 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+8
View File
@@ -82,6 +82,8 @@ var/global/list/limb_icon_cache = list()
/obj/item/organ/external/proc/get_icon(var/skeletal, var/can_apply_transparency = TRUE)
for(var/M in markings)
if (!markings[M]["on"])
continue
var/datum/sprite_accessory/marking/mark = markings[M]["datum"]
if(mark.organ_override)
var/icon/mark_s = new/icon("icon" = mark.icon, "icon_state" = "[mark.icon_state]-[organ_tag]")
@@ -90,6 +92,8 @@ var/global/list/limb_icon_cache = list()
mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
icon_cache_key = "[M][markings[M]["color"]]"
for(var/MM in markings)
if (!markings[MM]["on"])
continue
var/datum/sprite_accessory/marking/mark_style = markings[MM]["datum"]
if(mark_style.organ_override)
continue
@@ -143,6 +147,8 @@ var/global/list/limb_icon_cache = list()
//Body markings, actually does not include head this time. Done separately above.
if(!istype(src,/obj/item/organ/external/head))
for(var/M in markings)
if (!markings[M]["on"])
continue
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit
@@ -173,6 +179,8 @@ var/global/list/limb_icon_cache = list()
apply_colouration(mob_icon)
if(owner && owner.synth_markings)
for(var/M in markings)
if (!markings[M]["on"])
continue
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit
code/modules/organs/subtypes/standard.dm
+2
View File
@@ -386,6 +386,8 @@
//Head markings
for(var/M in markings)
if (!markings[M]["on"])
continue
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode)