From eeb121a9b1ea02a5871e207961dbfbaf35f2739d Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 16 Nov 2019 13:04:01 +1000 Subject: [PATCH] Fixes minor issues with shadekin --- code/modules/mob/living/carbon/human/human_defines_vr.dm | 5 +++-- .../mob/living/carbon/human/species/shadekin/shadekin.dm | 8 ++++++++ .../carbon/human/species/shadekin/shadekin_abilities.dm | 4 ++-- code/modules/organs/subtypes/shadekin.dm | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm index d13d44110f..b9200877c3 100644 --- a/code/modules/mob/living/carbon/human/human_defines_vr.dm +++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm @@ -48,5 +48,6 @@ if(!istype(SK)) return 0 - var/new_amount = SK.get_energy(src) + amount - SK.set_energy(src, new_amount) + if(amount > 0 || !(SK.check_infinite_energy(src))) + var/new_amount = SK.get_energy(src) + amount + SK.set_energy(src, new_amount) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index b034bae104..f2e7ad188b 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -210,6 +210,14 @@ shade_organ.max_dark_energy = new_max_energy +/datum/species/shadekin/proc/check_infinite_energy(var/mob/living/carbon/human/H) + var/obj/item/organ/internal/brain/shadekin/shade_organ = H.internal_organs_by_name[O_BRAIN] + + if(!istype(shade_organ)) + return 0 + + return shade_organ.dark_energy_infinite + /datum/species/shadekin/proc/update_shadekin_hud(var/mob/living/carbon/human/H) var/turf/T = get_turf(H) if(!T) diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index 485b988445..7d354db330 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -17,13 +17,13 @@ /datum/power/shadekin/phase_shift name = "Phase Shift (100)" - desc = "Shift yourself out of alignment with realspace to travel quickly areas." + desc = "Shift yourself out of alignment with realspace to travel quickly to different areas." verbpath = /mob/living/carbon/human/proc/phase_shift ability_icon_state = "tech_passwall" /mob/living/carbon/human/proc/phase_shift() set name = "Phase Shift (100)" - set desc = "Shift yourself out of alignment with realspace to travel quickly areas." + set desc = "Shift yourself out of alignment with realspace to travel quickly to different areas." set category = "Shadekin" var/ability_cost = 100 diff --git a/code/modules/organs/subtypes/shadekin.dm b/code/modules/organs/subtypes/shadekin.dm index d130102d91..fd1dd0a8c0 100644 --- a/code/modules/organs/subtypes/shadekin.dm +++ b/code/modules/organs/subtypes/shadekin.dm @@ -2,4 +2,5 @@ can_assist = FALSE var/dark_energy = 100 - var/max_dark_energy = 100 \ No newline at end of file + var/max_dark_energy = 100 + var/dark_energy_infinite = FALSE \ No newline at end of file