Conflict fixes

Fluffy-Frontier · Feb 1, 2025 · ca488ae · ca488ae
1 parent 6d7a8cc
commit ca488ae
Show file tree

Hide file tree

Showing 6 changed files with 130 additions and 101 deletions.
diff --git a/tff_modular/modules/deadspace/code/corruption/action.dm b/tff_modular/modules/deadspace/code/corruption/action.dm
@@ -35,12 +35,6 @@
 			unset_click_ability(clicker, refund_cooldown = TRUE)
 		clicker.next_click = world.time + click_cd_override
 		return FALSE
-	if(LAZYACCESS(modifiers, MIDDLE_CLICK))
-		if(template.dir == 8)
-			template.dir = 1
-		else
-			template.dir *= 2
-		clicker.balloon_alert(clicker, "new direction - [dir2text(template.dir)]")
 	if(!IsAvailable(feedback = TRUE))
 		return FALSE
 	if(!target)

diff --git a/tff_modular/modules/deadspace/code/marker/abilities/absorb.dm b/tff_modular/modules/deadspace/code/marker/abilities/absorb.dm
@@ -6,22 +6,22 @@
 	cost = 10
 
 /datum/action/cooldown/necro/psy/absorb/PreActivate(turf/target)
-	var/mob/camera/marker_signal/caller = owner
+	var/mob/camera/marker_signal/signal = owner
 	target = get_turf(target)
 	if(!target)
 		return FALSE
 	if(target.necro_corrupted)
 		return ..()
-	if(IN_GIVEN_RANGE(target, caller.marker, 5) && can_see(target, caller.marker, 5))
+	if(IN_GIVEN_RANGE(target, signal.marker, 5) && can_see(target, signal.marker, 5))
 		return ..()
 	for(var/turf/neraby as anything in RANGE_TURFS(2, target))
 		if(neraby.necro_corrupted)
 			return ..()
-	to_chat(caller, span_warning("Biomass may only be claimed when the target is <b>near the marker, or corruption</b>"))
+	to_chat(signal, span_warning("Biomass may only be claimed when the target is <b>near the marker, or corruption</b>"))
 	return FALSE
 
 /datum/action/cooldown/necro/psy/absorb/Activate(turf/target)
-	var/mob/camera/marker_signal/caller = owner
+	var/mob/camera/marker_signal/signal = owner
 	target = get_turf(target)
 	var/absorbed_biomass = 0
 	var/list/absorbed_atoms = list()
@@ -43,15 +43,15 @@
 	FOR_DVIEW_END
 
 	if(!absorbed_biomass)
-		to_chat(caller, span_warning("No things containing asborbable biomass found."))
+		to_chat(signal, span_warning("No things containing asborbable biomass found."))
 		return TRUE
 	..()
 	for(var/obj/item/item as anything in absorbed_atoms)
 		new /obj/effect/temp_visual/decoy/absorb(get_turf(item), item, target)
 		qdel(item)
-	caller.marker.change_marker_biomass(absorbed_biomass * 0.4)
-	caller.marker.change_signal_biomass(absorbed_biomass * 0.6)
-	to_chat(caller, span_notice("Gained total of [absorbed_biomass] biomass from absorbing [length(absorbed_atoms)] thing\s!"))
+	signal.marker.change_marker_biomass(absorbed_biomass * 0.4)
+	signal.marker.change_signal_biomass(absorbed_biomass * 0.6)
+	to_chat(signal, span_notice("Gained total of [absorbed_biomass] biomass from absorbing [length(absorbed_atoms)] thing\s!"))
 	return TRUE
 
 /obj/effect/temp_visual/decoy/absorb

diff --git a/tff_modular/modules/deadspace/code/marker/abilities/false_sound.dm b/tff_modular/modules/deadspace/code/marker/abilities/false_sound.dm
@@ -7,19 +7,19 @@
 	marker_flags = SIGNAL_ABILITY_PRE_ACTIVATION
 
 /datum/action/cooldown/necro/psy/false_sound/Activate(turf/target)
-	var/mob/camera/marker_signal/caller = owner
+	var/mob/camera/marker_signal/signal = owner
 	target = get_turf(target)
 	if(!target)
 		return
 	..() //This comes earlier due to spam potential, starts cooldown and cost
 	//Add more necromorphs here, perhaps we should make it a define to make sure it's updated
 	var/list/category = tgui_input_list(owner, "Pick a necromorph type", "False Sound", GLOB.necromorph_sounds)
 	if(!category)
-		caller.change_psy_energy(cost) //Refund the cost if nothing is picked
+		signal.change_psy_energy(cost) //Refund the cost if nothing is picked
 		return TRUE
 	var/list/picked_sound = tgui_input_list(owner, "Pick sound type to play", "False Sound", GLOB.necromorph_sounds[category])
 	if(!picked_sound)
-		caller.change_psy_energy(cost) //Refund the cost if nothing is picked
+		signal.change_psy_energy(cost) //Refund the cost if nothing is picked
 		return TRUE
 	var/volume = VOLUME_MID
 	if (picked_sound == SOUND_SHOUT || picked_sound == SOUND_SHOUT_LONG || picked_sound == SOUND_DEATH)

diff --git a/tff_modular/modules/deadspace/code/marker/abilities/psy_ability.dm b/tff_modular/modules/deadspace/code/marker/abilities/psy_ability.dm
@@ -31,7 +31,7 @@
 	if(istype(target, /atom/movable/screen/plane_master/marker_static))
 		if(!click_through_static)
 			return FALSE
-		var/new_target = parse_caught_click_modifiers(modifiers, get_turf(caller), caller.client)
+		var/new_target = parse_caught_click_modifiers(modifiers, get_turf(signal), signal.client)
 		params = list2params(modifiers)
 		if(!new_target)
 			return FALSE
@@ -49,6 +49,6 @@
 	return TRUE
 
 /datum/action/cooldown/necro/psy/Activate(atom/target)
-	var/mob/camera/marker_signal/caller = owner
-	caller.change_psy_energy(-cost)
+	var/mob/camera/marker_signal/signal = owner
+	signal.change_psy_energy(-cost)
 	..()
diff --git a/tff_modular/modules/deadspace/code/marker/abilities/whisper.dm b/tff_modular/modules/deadspace/code/marker/abilities/whisper.dm
@@ -13,10 +13,10 @@
 	return ..()
 
 /datum/action/cooldown/necro/psy/whisper/Activate(mob/living/target)
-	var/mob/camera/marker_signal/caller = owner
-	var/message = tgui_input_text(caller, "Write a message to send to [target.name]", "Whisper")
+	var/mob/camera/marker_signal/signal = owner
+	var/message = tgui_input_text(signal, "Write a message to send to [target.name]", "Whisper")
 	if(!message)
 		return TRUE
 	.=..()
 	to_chat(target, "<span class='necromorph'>[message]</span>")
-	caller.marker.hive_mind_message(caller, "[caller] -> [target] <span class='necromorph'>[message]</span>")
+	signal.marker.hive_mind_message(signal, "[signal] -> [target] <span class='necromorph'>[message]</span>")