Merge pull request #1447 from Yawn-Wider/shadekinnerfs

Shadekin nerfs
Yawn-Wider · Apr 7, 2024 · 2cfd685 · 2cfd685
2 parents 07187fa + ad17657
commit 2cfd685
Show file tree

Hide file tree

Showing 9 changed files with 363 additions and 6 deletions.
diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
@@ -8,6 +8,7 @@
 #define INVISIBILITY_LIGHTING             20
 #define INVISIBILITY_LEVEL_ONE            35
 #define INVISIBILITY_LEVEL_TWO            45
+#define INVISIBILITY_SHADEKIN			  55 //CHOMPStation change
 #define INVISIBILITY_OBSERVER             60
 #define INVISIBILITY_EYE		          61
 

diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm
@@ -42,6 +42,8 @@
 
 #define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience)
 #define TEMPERATURE_SHIELDED 4 // YW Addition: Temperature change shielding
+// YW Addition: 8 used for persistence block somewhere else
+#define PHASE_SHIELDED 16 // YW Addition: Prevents shadekin phasing in/out in this area
 
 //Assistant/Visitor/Whatever
 #define USELESS_JOB "Visitor"

diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
@@ -113,6 +113,9 @@
 	var/energy_light = 0.25
 	var/energy_dark = 0.75
 
+	var/phase_gentle = TRUE //CHOMPEdit - Add gentle phasing, defaults to on.
+	var/doing_phase = FALSE //CHOMPEdit - Prevent bugs when spamming phase button
+
 /datum/species/shadekin/New()
 	..()
 	for(var/power in shadekin_abilities)
@@ -303,27 +306,27 @@
 
 	switch(eyecolor_type)
 		if(BLUE_EYES)
-			total_health = 100
+			total_health = 75 //ChompEDIT - balance tweaks
 			energy_light = 0.5
 			energy_dark = 0.5
 		if(RED_EYES)
-			total_health = 200
+			total_health = 150 //ChompEDIT - balance tweaks
 			energy_light = -1
 			energy_dark = 0.1
 		if(PURPLE_EYES)
-			total_health = 150
+			total_health = 100 //ChompEDIT - balance tweaks
 			energy_light = -0.5
 			energy_dark = 1
 		if(YELLOW_EYES)
-			total_health = 100
+			total_health = 50 //ChompEDIT - balance tweaks
 			energy_light = -2
 			energy_dark = 3
 		if(GREEN_EYES)
-			total_health = 100
+			total_health = 100 //ChompEDIT - balance tweaks
 			energy_light = 0.125
 			energy_dark = 2
 		if(ORANGE_EYES)
-			total_health = 175
+			total_health = 125 //ChompEDIT - balance tweaks
 			energy_light = -0.5
 			energy_dark = 0.25
 

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
@@ -26,6 +26,7 @@
 	verbpath = /mob/living/carbon/human/proc/phase_shift
 	ability_icon_state = "tech_passwall"
 
+/* //ChompEDIT - Moved to modular_chomp
 /mob/living/carbon/human/proc/phase_shift()
 	set name = "Phase Shift (100)"
 	set desc = "Shift yourself out of alignment with realspace to travel quickly to different areas."
@@ -164,6 +165,13 @@
 		density = FALSE
 		force_max_speed = TRUE
 		ability_flags &= ~AB_PHASE_SHIFTING
+*/ //ChompEDIT END - moved to modular_chomp
+
+//CHOMPEdit Start - Shadekin probably shouldn't be hit while phasing
+/datum/modifier/shadekin_phase
+	name = "Shadekin Phasing"
+	evasion = 100
+//CHOMPEdit End
 
 /datum/modifier/shadekin_phase_vision
 	name = "Shadekin Phase Vision"

diff --git a/code/modules/telesci/bscyrstal.dm b/code/modules/telesci/bscyrstal.dm
@@ -35,6 +35,7 @@
 		s.start()
 		if(isliving(hit_atom))
 			blink_mob(hit_atom)
+		dephase_shadekin() //ChompEDIT - mess with shadekins
 		qdel(src)
 
 // Artifical bluespace crystal, doesn't give you much research.

diff --git a/maps/yw/yw_vrstuff/vrmaps_turfs.dm b/maps/yw/yw_vrstuff/vrmaps_turfs.dm
@@ -15,3 +15,12 @@
 /turf/unsimulated/floor/irongrass
 	icon ='icons/obj/clockwork_objects.dmi'
 	icon_state = "grass"
+
+
+//YW Addition - no VR for shadekins
+/mob/living/carbon/human/shadekin_ability_check()
+	. = ..()
+	if(. && istype(get_area(src), /area/vrworld))
+		to_chat(src, "<span class='danger'>The VR systems cannot comprehend this power! This is useless to you!</span>")
+		. = FALSE
+//YW add End