cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes minor issues with shadekin
This commit is contained in:
Novacat
2019-11-21 21:43:44 -05:00
committed by GitHub
parent 36523663aa eeb121a9b1
commit 9ac320a347
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/carbon/human/human_defines_vr.dm
View File

@@ -48,5 +48,6 @@
if(!istype(SK)) if(!istype(SK))
return 0 return 0
var/new_amount = SK.get_energy(src) + amount if(amount > 0 || !(SK.check_infinite_energy(src)))
SK.set_energy(src, new_amount) var/new_amount = SK.get_energy(src) + amount
SK.set_energy(src, new_amount)

8
code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
View File

@@ -210,6 +210,14 @@
shade_organ.max_dark_energy = new_max_energy 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) /datum/species/shadekin/proc/update_shadekin_hud(var/mob/living/carbon/human/H)
var/turf/T = get_turf(H) var/turf/T = get_turf(H)
if(!T) if(!T)

4
code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
View File

@@ -17,13 +17,13 @@
/datum/power/shadekin/phase_shift /datum/power/shadekin/phase_shift
name = "Phase Shift (100)" 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 verbpath = /mob/living/carbon/human/proc/phase_shift
ability_icon_state = "tech_passwall" ability_icon_state = "tech_passwall"
/mob/living/carbon/human/proc/phase_shift() /mob/living/carbon/human/proc/phase_shift()
set name = "Phase Shift (100)" 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" set category = "Shadekin"
var/ability_cost = 100 var/ability_cost = 100

3
code/modules/organs/subtypes/shadekin.dm
View File

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