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-11-17 12:42:55 +00:00
parent 964f575c05 5a2e2c6150
commit a5c7909ed7
135 changed files with 193190 additions and 151466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/organs/subtypes/shadekin.dm Normal file
View File

@@ -0,0 +1,5 @@
/obj/item/organ/internal/brain/shadekin
can_assist = FALSE
var/dark_energy = 100
var/max_dark_energy = 100

10
code/modules/organs/subtypes/standard_vr.dm
View File

@@ -46,7 +46,6 @@
if(hair_style.do_colouration && islist(h_col) && h_col.len >= 3)
hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY)
overlays |= image(hair_s, "pixel_y" = head_offset)
return mob_icon
/obj/item/organ/external/head/vr
@@ -61,4 +60,11 @@
/obj/item/organ/external/head/vr/werebeast
eye_icons_vr = 'icons/mob/werebeast_face_vr.dmi'
eye_icon_vr = "werebeast_eyes"
head_offset = 6
head_offset = 6
/obj/item/organ/external/head/vr/shadekin
cannot_gib = 1
cannot_amputate = 1
eye_icons_vr = 'icons/mob/human_face_vr.dmi'
eye_icon_vr = "eyes_shadekin"