cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9887 from Sharkmare/patch-6

Browse Source 
Shadekin Trait apply bugfix
This commit is contained in:
Novacat
2021-03-09 17:32:23 -05:00
committed by GitHub
parent 59abfcb084 7e314656b6
commit 58859d2d8e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/shadekin/shadekin_trait.dm
+2 -1
View File
@@ -58,6 +58,7 @@
/datum/trait/kintype/apply(var/datum/species/shadekin/S,var/mob/living/carbon/human/H)
if(color && istype(S)) //Sanity check to see if they're actually a shadekin, otherwise just don't do anything. They shouldn't be able to spawn with the trait.
S.kin_type = color
..(S,H)
switch(color)
if(BLUE_EYES)
H.shapeshifter_set_eye_color("0000FF")
@@ -87,4 +88,4 @@
var/obj/item/organ/internal/brain/shadekin/shade_organ = user.internal_organs_by_name[O_BRAIN]
if(!istype(shade_organ))
return
shade_organ.dark_energy = CLAMP(shade_organ.dark_energy + attack_damage,0,shade_organ.max_dark_energy) //Convert Damage done to Energy Gained
shade_organ.dark_energy = CLAMP(shade_organ.dark_energy + attack_damage,0,shade_organ.max_dark_energy) //Convert Damage done to Energy Gained