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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-08 18:15:35 +00:00
parent 601e852c3b 0353c01e46
commit 5b13642c12
214 changed files with 52675 additions and 16169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,10 @@ var/global/list/limb_icon_cache = list()
/obj/item/organ/external/head/sync_colour_to_human(var/mob/living/carbon/human/human)
..()
var/obj/item/organ/internal/eyes/eyes = owner.internal_organs_by_name[O_EYES]
if(eyes) eyes.update_colour()
if(owner)
var/obj/item/organ/internal/eyes/eyes = owner.internal_organs_by_name[O_EYES]
if(eyes) eyes.update_colour()
/obj/item/organ/external/head/get_icon()
..()

35
code/modules/organs/subtypes/shadekin_vr.dm Normal file
View File

@@ -0,0 +1,35 @@
/obj/item/organ/external/chest/crewkin
min_broken_damage = 20
/obj/item/organ/external/groin/crewkin
min_broken_damage = 20
/obj/item/organ/external/head/vr/crewkin
min_broken_damage = 15
eye_icons_vr = 'icons/mob/human_face_vr.dmi'
eye_icon_vr = "eyes_shadekin_station"
/obj/item/organ/external/arm/crewkin
min_broken_damage = 15
/obj/item/organ/external/arm/right/crewkin
min_broken_damage = 15
/obj/item/organ/external/leg/crewkin
min_broken_damage = 15
/obj/item/organ/external/leg/right/crewkin
min_broken_damage = 15
/obj/item/organ/external/foot/crewkin
min_broken_damage = 7
/obj/item/organ/external/foot/right/crewkin
min_broken_damage = 7
/obj/item/organ/external/hand/crewkin
min_broken_damage = 7
/obj/item/organ/external/hand/right/crewkin
min_broken_damage = 7