Merge remote-tracking branch 'upstream/master' into vore_overlays

code/_onclick/click.dm

@@ -51,6 +51,9 @@
 	if(modifiers["shift"] && modifiers["ctrl"])
 		CtrlShiftClickOn(A)
 		return 1
+	if(modifiers["shift"] && modifiers["middle"])
+		ShiftMiddleClickOn(A)
+		return 1
 	if(modifiers["middle"])
 		MiddleClickOn(A)
 		return 1
@@ -111,12 +114,11 @@
 		trigger_aiming(TARGET_CAN_CLICK)
 		return 1
 
-	// VOREStation Addition Start: inbelly item interaction
+	// VOREStation Addition Start: inbelly interaction
 	if(isbelly(loc) && (loc == A.loc))
 		if(W)
-			var/resolved = W.resolve_attackby(A,src)
-			if(!resolved && A && W)
-				W.afterattack(A, src, 1, params) // 1: clicking something Adjacent
+			to_chat(src, "The firm confines prevent that kind of dexterity!")	//Only hand-based interactions in bellies
+			return
 		else
 			if(ismob(A)) // No instant mob attacking
 				setClickCooldown(get_attack_speed())
@@ -230,6 +232,15 @@
 	return
 */
 
+/*
+	Shift middle click
+	Used for pointing.
+*/
+
+/mob/proc/ShiftMiddleClickOn(atom/A)
+	pointed(A)
+	return
+
 /*
 	Shift click
 	For most mobs, examine.
@@ -271,12 +282,15 @@
 /atom/proc/AltClick(var/mob/user)
 	var/turf/T = get_turf(src)
 	if(T && user.TurfAdjacent(T))
-		if(user.listed_turf == T)
-			user.listed_turf = null
-		else
-			user.listed_turf = T
-			user.client.statpanel = "Turf"
+		user.ToggleTurfTab(T)
 	return 1
+	
+/mob/proc/ToggleTurfTab(var/turf/T)
+	if(listed_turf == T)
+		listed_turf = null
+	else
+		listed_turf = T
+		client.statpanel = "Turf"
 
 /mob/proc/TurfAdjacent(var/turf/T)
 	return T.AdjacentQuick(src)

code/_onclick/cyborg.dm

@@ -9,7 +9,7 @@
 /mob/living/silicon/robot/ClickOn(var/atom/A, var/params)
 	if(!checkClickCooldown())
 		return
-	
+
 	setClickCooldown(1)
 
 	if(client.buildmode) // comes after object.Click to allow buildmode gui objects to be clicked
@@ -20,6 +20,9 @@
 	if(modifiers["shift"] && modifiers["ctrl"])
 		CtrlShiftClickOn(A)
 		return
+	if(modifiers["shift"] && modifiers["middle"])
+		ShiftMiddleClickOn(A)
+		return
 	if(modifiers["middle"])
 		MiddleClickOn(A)
 		return

code/_onclick/observer.dm

@@ -33,6 +33,15 @@
 		return
 	if(!checkClickCooldown()) return
 	setClickCooldown(4)
+	var/list/modifiers = params2list(params)
+	if(modifiers["shift"])
+		examinate(A)
+		return
+	if(modifiers["alt"]) // alt and alt-gr (rightalt)
+		var/turf/T = get_turf(A)
+		if(T && TurfAdjacent(T))
+			ToggleTurfTab(T)
+			return
 	// You are responsible for checking config.ghost_interaction when you override this function
 	// Not all of them require checking, see below
 	A.attack_ghost(src)