Заменил для некоторых вещей клик СКМ на Альт+СКМ, в целом ни на что н…

…е влияет, т.к. у них были аналоги в виде обычного Альт клика
ss220-space · Jul 2, 2021 · 92e5e30 · 92e5e30
1 parent 1bbb3df
commit 92e5e30
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
@@ -65,6 +65,9 @@
 	if(modifiers["middle"])
 		MiddleClickOn(A)
 		return 1
+	if(modifiers["middle"] && modifiers["alt"])
+		AltMiddleClickOn(A)
+		return 1
 	if(modifiers["shift"])
 		ShiftClickOn(A)
 		return 0
@@ -222,6 +225,9 @@
 	pointed(A)
 	return
 
+/mob/proc/AltMiddleClickOn(var/atom/A)
+	return
+
 // In case of use break glass
 /*
 /atom/proc/MiddleClick(var/mob/M as mob)

diff --git a/code/_onclick/click_inf.dm b/code/_onclick/click_inf.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/MiddleClickOn(atom/A)
+/mob/living/carbon/AltMiddleClickOn(atom/A)
 	if(!stat && mind && iscarbon(A) && A != src)
 		var/datum/changeling/C = mind.changeling
 		if(C?.chosen_sting)

diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
@@ -96,8 +96,9 @@
 			return
 	return
 
-//Middle click cycles through selected modules.
-/mob/living/silicon/robot/MiddleClickOn(var/atom/A)
+//Alt Middle click cycles through selected modules.
+//Though we have "X" marcos for it and humans now can't swap hands using middle click, I'll let it be here
+/mob/living/silicon/robot/AltMiddleClickOn(var/atom/A)
 	cycle_modules()
 	return
 

diff --git a/code/_onclick/rig.dm b/code/_onclick/rig.dm
@@ -1,4 +1,4 @@
-/mob/living/MiddleClickOn(atom/A)
+/mob/living/AltMiddleClickOn(atom/A)
 	if(get_preference_value(/datum/client_preference/hardsuit_activation) == GLOB.PREF_MIDDLE_CLICK)
 		if(HardsuitClickOn(A))
 			return
@@ -51,4 +51,4 @@
 		if(ismob(A)) // No instant mob attacking - though modules have their own cooldowns
 			setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		return 1
-	return 0
+	return 0