Merge pull request #6194 from Heroman3003/shadekin-mini-fix

Fixes minor issues with shadekin

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)

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)

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

code/modules/organs/subtypes/shadekin.dm

@@ -2,4 +2,5 @@
 	can_assist = FALSE
 
 	var/dark_energy = 100
-	var/max_dark_energy = 100
+	var/max_dark_energy = 100
+	var/dark_energy_infinite = FALSE