fix

Dripstation-Dev · Feb 1, 2024 · a6627b5 · a6627b5
1 parent d4b9abc
commit a6627b5
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 36 deletions.
diff --git a/modular_dripstation/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/modular_dripstation/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -2,7 +2,6 @@
 #define HEART_SPECIAL_SHADOWIFY 2
 #define LIGHT_HEAL_THRESHOLD 2
 #define LIGHT_DAMAGE_TAKEN 6
-#define LIGHT_DAM_THRESHOLD 0.25
 
 /datum/species/shadow
 	burnmod = 1.1

diff --git a/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm
@@ -171,40 +171,40 @@
 	var/turf/T = get_turf(owner)
 	for(var/datum/light_source/LS in T.get_affecting_lights())
 		var/atom/LO = LS.source_atom
-		//if(isitem(LO))		//dripstation edit
-		//	extinguishItem(LO)	//dripstation edit
-		//	continue			//dripstation edit
+		/*if(isitem(LO))		//dripstation edit start
+			extinguishItem(LO)	
+			continue*/			//dripstation edit end
 		if(istype(LO, /obj/machinery/light))
 			var/obj/machinery/light/L = LO
 			L.on = FALSE
 			L.visible_message(span_warning("[L] flickers and falls dark."))
 			L.update(0)
 			L.set_light(0)
 			continue
-		//if(istype(LO, /obj/machinery/computer) || istype(LO, /obj/machinery/power/apc))	//dripstation edit start
-		//	LO.set_light(0)
-		//	LO.visible_message(span_warning("[LO] grows dim, its screen barely readable."))
-		//	continue
-		//if(ismob(LO))
-		//	extinguish_mob(LO)
-		//if(istype(LO, /mob/living/silicon/robot))
-		//	var/mob/living/silicon/robot/borg = LO
-		//	if(!borg.lamp_cooldown)
-		//		borg.smash_headlamp()
-		//if(istype(LO, /obj/machinery/camera))
-		//	LO.set_light(0)
-		//	if(prob(10))
-		//		LO.emp_act(2)
-		//	continue
-		//if(istype(LO, /obj/mecha))
-		//	var/obj/mecha/M = LO
-		//	M.set_light(0)
-		//	M.lights = FALSE
-		//if(istype(LO, /obj/machinery/power/floodlight))
-		//	var/obj/machinery/power/floodlight/FL = LO
-		//	FL.change_setting(2) // Set floodlight to lowest setting
-		//if(istype(LO, /obj/structure/light_prism))
-		//	qdel(LO)
+		/*if(istype(LO, /obj/machinery/computer) || istype(LO, /obj/machinery/power/apc))	//dripstation edit start
+			LO.set_light(0)
+			LO.visible_message(span_warning("[LO] grows dim, its screen barely readable."))
+			continue
+		if(ismob(LO))
+			extinguish_mob(LO)
+		if(istype(LO, /mob/living/silicon/robot))
+			var/mob/living/silicon/robot/borg = LO
+			if(!borg.lamp_cooldown)
+				borg.smash_headlamp()
+		if(istype(LO, /obj/machinery/camera))
+			LO.set_light(0)
+			if(prob(10))
+				LO.emp_act(2)
+			continue
+		if(istype(LO, /obj/mecha))
+			var/obj/mecha/M = LO
+			M.set_light(0)
+			M.lights = FALSE
+		if(istype(LO, /obj/machinery/power/floodlight))
+			var/obj/machinery/power/floodlight/FL = LO
+			FL.change_setting(2) // Set floodlight to lowest setting
+		if(istype(LO, /obj/structure/light_prism))
+			qdel(LO)*/													//dripstation edit end
 		if(istype(LO, /obj/machinery))
 			var/obj/machinery/M = LO
 			M.light_on = FALSE
@@ -546,13 +546,13 @@
 		empower.Grant(M)
 		var/datum/action/cooldown/spell/blindness_smoke/smoke = new(M)
 		smoke.Grant(M)
-	//if(thralls >= CEILING(7 * SSticker.mode.thrall_ratio, 1) && !null_charge_acquired)	//dripstation edit start
-	//	null_charge_acquired = TRUE
-	//	to_chat(user, "<span class='shadowling'><i>The power of your thralls has granted you the <b>Null Charge</b> ability. This ability will drain an APC's contents to the void, preventing it from recharging \
-	//	or sending power until repaired.</i></span>")
-	//	var/datum/action/cooldown/spell/null_charge/null_charge = new(M)
-	//	null_charge.Grant(M)
-	//if(thralls >= CEILING(9 * SSticker.mode.thrall_ratio, 1) && !reviveThrallAcquired)
+	/*if(thralls >= CEILING(7 * SSticker.mode.thrall_ratio, 1) && !null_charge_acquired)	//dripstation edit start
+		null_charge_acquired = TRUE
+		to_chat(user, "<span class='shadowling'><i>The power of your thralls has granted you the <b>Null Charge</b> ability. This ability will drain an APC's contents to the void, preventing it from recharging \
+		or sending power until repaired.</i></span>")
+		var/datum/action/cooldown/spell/null_charge/null_charge = new(M)
+		null_charge.Grant(M)
+	if(thralls >= CEILING(9 * SSticker.mode.thrall_ratio, 1) && !reviveThrallAcquired)*/
 	if(thralls >= CEILING(7 * SSticker.mode.thrall_ratio, 1) && !reviveThrallAcquired)
 		reviveThrallAcquired = TRUE
 		to_chat(user, "<span class='shadowling'><i>The power of your thralls has granted you the <b>Black Recuperation</b> ability. This will, after a short time, bring a dead thrall completely back to life \

diff --git a/yogstation/code/modules/antagonists/shadowling/thrall.dm b/yogstation/code/modules/antagonists/shadowling/thrall.dm
@@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(thrall_spell_types, typecacheof(list(/datum/action/cooldown/spe
 	var/datum/action/cooldown/spell/pointed/lesser_glare/lglare = new(owner.current)
 	lglare.Grant(owner.current)
 
-	var/datum/action/cooldown/spell/jaunt/lesser_shadow_walk/walk = new(owner.current)
+	var/datum/action/cooldown/spell/lesser_shadow_walk/walk = new(owner.current)
 	walk.Grant(owner.current)
 
 	var/datum/objective/helpsling/O = new