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-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

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

@@ -81,6 +81,19 @@ var/global/list/limb_icon_cache = list()
/obj/item/organ/external/proc/get_icon(var/skeletal)
for(var/M in markings)
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]")
mob_icon = new /icon("icon" = mark.icon, "icon_state" = "blank")
mark_s.Blend(markings[M]["color"], mark.color_blend_mode) // VOREStation edit
mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
icon_cache_key = "[M][markings[M]["color"]]"
dir = EAST
icon = mob_icon
return mob_icon
var/gender = "m"
if(owner && owner.gender == FEMALE)
gender = "f"

18
code/modules/organs/robolimbs_vr.dm
View File

@@ -81,4 +81,20 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
monitor_styles = cyberbeast_monitor_styles
/obj/item/weapon/disk/limb/cyber_beast
company = "Cyber Tech"
company = "Cyber Tech"
/datum/robolimb/zenghu_glacier
company = "Zeng-Hu Glacier"
desc = "This limb has a rubbery white covering with visible seams."
icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_glacier_main.dmi'
species_alternates = list(SPECIES_TAJ = "Zeng-Hu - Tajaran")
unavailable_to_build = 1
skin_tone = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC
/datum/robolimb/zenghu_taj_glacier
company = "Zeng-Hu Glacier - Tajaran"
desc = "This limb has a rubbery white covering with visible seams."
icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_glacier_taj.dmi'
unavailable_to_build = 1
parts = list(BP_HEAD)