Merge remote-tracking branch 'citadel/master' into 12742

code/_onclick/ai.dm

@@ -19,10 +19,6 @@
 		A.move_camera_by_click()
 
 /mob/living/silicon/ai/ClickOn(var/atom/A, params)
-	if(world.time <= next_click)
-		return
-	next_click = world.time + 1
-
 	if(!can_interact_with(A))
 		return
 
@@ -74,16 +70,16 @@
 		CtrlClickOn(A)
 		return
 
-	if(world.time <= next_move)
+	if(!CheckActionCooldown(immediate = TRUE))
 		return
 
 	if(aicamera.in_camera_mode)
 		aicamera.camera_mode_off()
-		aicamera.captureimage(pixel_turf, usr)
+		INVOKE_ASYNC(aicamera, /obj/item/camera.proc/captureimage, pixel_turf, usr)
 		return
 	if(waypoint_mode)
-		waypoint_mode = 0
-		set_waypoint(A)
+		waypoint_mode = FALSE
+		INVOKE_ASYNC(src, .proc/set_waypoint, A)
 		return
 
 	A.attack_ai(src)

code/_onclick/click.dm

@@ -1,38 +1,3 @@
-/*
-	Click code cleanup
-	~Sayu
-*/
-
-// 1 decisecond click delay (above and beyond mob/next_move)
-//This is mainly modified by click code, to modify click delays elsewhere, use next_move and changeNext_move()
-/mob/var/next_click	= 0
-
-// THESE DO NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
-/mob/var/next_move_adjust = 0 //Amount to adjust action/click delays by, + or -
-/mob/var/next_move_modifier = 1 //Value to multiply action/click delays by
-
-
-//Delays the mob's next click/action by num deciseconds
-// eg: 10-3 = 7 deciseconds of delay
-// eg: 10*0.5 = 5 deciseconds of delay
-// DOES NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
-
-/mob/proc/timeToNextMove()
-	return max(0, next_move - world.time)
-
-/mob/proc/changeNext_move(num)
-	next_move = world.time + ((num+next_move_adjust)*next_move_modifier)
-
-/mob/living/changeNext_move(num)
-	last_click_move = next_move
-	var/mod = next_move_modifier
-	var/adj = next_move_adjust
-	for(var/i in status_effects)
-		var/datum/status_effect/S = i
-		mod *= S.nextmove_modifier()
-		adj += S.nextmove_adjust()
-	next_move = world.time + ((num + adj)*mod)
-
 /*
 	Before anything else, defer these calls to a per-mobtype handler.  This allows us to
 	remove istype() spaghetti code, but requires the addition of other handler procs to simplify it.
@@ -45,7 +10,7 @@
 /atom/Click(location,control,params)
 	if(flags_1 & INITIALIZED_1)
 		SEND_SIGNAL(src, COMSIG_CLICK, location, control, params, usr)
-		usr.ClickOn(src, params)
+		usr.CommonClickOn(src, params)
 
 /atom/DblClick(location,control,params)
 	if(flags_1 & INITIALIZED_1)
@@ -55,6 +20,21 @@
 	if(flags_1 & INITIALIZED_1)
 		usr.MouseWheelOn(src, delta_x, delta_y, params)
 
+/**
+  * Common mob click code
+  */
+/mob/proc/CommonClickOn(atom/A, params)
+	SHOULD_NOT_SLEEP(TRUE)
+	if(mob_transforming)
+		return
+	if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON)
+		return
+	. = ClickOn(A, params)
+	if(!(. & DISCARD_LAST_ACTION))
+		FlushCurrentAction()
+	else
+		DiscardCurrentAction()
+	
 /*
 	Standard mob ClickOn()
 	Handles exceptions: Buildmode, middle click, modified clicks, mech actions
@@ -68,50 +48,34 @@
 	* item/afterattack(atom,user,adjacent,params) - used both ranged and adjacent
 	* mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed
 */
-/mob/proc/ClickOn( atom/A, params )
-	if(world.time <= next_click)
-		return
-	next_click = world.time + world.tick_lag
-
+/mob/proc/ClickOn(atom/A, params)
+	SHOULD_NOT_SLEEP(TRUE)
 	if(check_click_intercept(params,A))
 		return
 
-	if(mob_transforming)
-		return
-
-	if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON)
-		return
-
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"] && modifiers["middle"])
-		ShiftMiddleClickOn(A)
-		return
+		return ShiftMiddleClickOn(A)
 	if(modifiers["shift"] && modifiers["ctrl"])
-		CtrlShiftClickOn(A)
-		return
+		return CtrlShiftClickOn(A)
 	if(modifiers["middle"])
-		MiddleClickOn(A)
-		return
+		return MiddleClickOn(A)
 	if(modifiers["shift"] && (client && client.show_popup_menus || modifiers["right"])) //CIT CHANGE - makes shift-click examine use right click instead of left click in combat mode
-		ShiftClickOn(A)
-		return
+		return ShiftClickOn(A)
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
-		AltClickOn(A)
-		return
+		return AltClickOn(A)
 	if(modifiers["ctrl"])
-		CtrlClickOn(A)
-		return
+		return CtrlClickOn(A)
 
 	if(modifiers["right"]) //CIT CHANGE - allows right clicking to perform actions
-		RightClickOn(A,params) //CIT CHANGE - ditto
-		return //CIT CHANGE - ditto
+		return RightClickOn(A, params) //CIT CHANGE - ditto
 
 	if(incapacitated(ignore_restraints = 1))
 		return
 
 	face_atom(A)
 
-	if(next_move > world.time) // in the year 2000...
+	if(!CheckActionCooldown(immediate = TRUE))
 		return
 
 	if(!modifiers["catcher"] && A.IsObscured())
@@ -119,12 +83,12 @@
 
 	if(ismecha(loc))
 		var/obj/mecha/M = loc
-		return M.click_action(A,src,params)
+		M.click_action(A,src,params)
+		return TRUE
 
 	if(restrained())
-		changeNext_move(CLICK_CD_HANDCUFFED)   //Doing shit in cuffs shall be vey slow
-		RestrainedClickOn(A)
-		return
+		DelayNextAction(CLICK_CD_HANDCUFFED)
+		return RestrainedClickOn(A)
 
 	if(in_throw_mode)
 		throw_item(A)
@@ -141,12 +105,12 @@
 	//User itself, current loc, and user inventory
 	if(A in DirectAccess())
 		if(W)
-			W.melee_attack_chain(src, A, params)
+			return W.melee_attack_chain(src, A, params)
 		else
-			if(ismob(A))
-				changeNext_move(CLICK_CD_MELEE)
-			UnarmedAttack(A)
-		return
+			. = UnarmedAttack(A, TRUE, a_intent)
+			if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A))
+				DelayNextAction(CLICK_CD_MELEE)
+			return
 
 	//Can't reach anything else in lockers or other weirdness
 	if(!loc.AllowClick())
@@ -155,16 +119,17 @@
 	//Standard reach turf to turf or reaching inside storage
 	if(CanReach(A,W))
 		if(W)
-			W.melee_attack_chain(src, A, params)
+			return W.melee_attack_chain(src, A, params)
 		else
-			if(ismob(A))
-				changeNext_move(CLICK_CD_MELEE)
-			UnarmedAttack(A, 1)
+			. = UnarmedAttack(A, TRUE, a_intent)
+			if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A))
+				DelayNextAction(CLICK_CD_MELEE)
+			return
 	else
 		if(W)
-			W.ranged_attack_chain(src, A, params)
+			return W.ranged_attack_chain(src, A, params)
 		else
-			RangedAttack(A,params)
+			return RangedAttack(A,params)
 
 //Is the atom obscured by a PREVENT_CLICK_UNDER_1 object above it
 /atom/proc/IsObscured()
@@ -270,8 +235,6 @@
 	in human click code to allow glove touches only at melee range.
 */
 /mob/proc/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
-	if(ismob(A))
-		changeNext_move(CLICK_CD_MELEE)
 
 /*
 	Ranged unarmed attack:
@@ -304,7 +267,6 @@
 		var/datum/antagonist/changeling/C = mind.has_antag_datum(/datum/antagonist/changeling)
 		if(C && C.chosen_sting)
 			C.chosen_sting.try_to_sting(src,A)
-			next_click = world.time + 5
 			return
 	swap_hand()
 
@@ -337,24 +299,24 @@
 */
 
 /mob/proc/CtrlClickOn(atom/A)
-	A.CtrlClick(src)
-	return
+	return A.CtrlClick(src)
 
 /atom/proc/CtrlClick(mob/user)
 	SEND_SIGNAL(src, COMSIG_CLICK_CTRL, user)
 	var/mob/living/ML = user
 	if(istype(ML))
-		ML.pulled(src)
+		INVOKE_ASYNC(ML, /mob/living.verb/pulled, src)
 
 /mob/living/carbon/human/CtrlClick(mob/user)
 	if(ishuman(user) && Adjacent(user) && !user.incapacitated())
-		if(world.time < user.next_move)
+		if(!user.CheckActionCooldown())
 			return FALSE
 		var/mob/living/carbon/human/H = user
 		H.dna.species.grab(H, src, H.mind.martial_art)
-		H.changeNext_move(CLICK_CD_MELEE)
+		H.DelayNextAction(CLICK_CD_MELEE)
+		return TRUE
 	else
-		..()
+		return ..()
 /*
 	Alt click
 	Unused except for AI
@@ -377,8 +339,8 @@
 		var/datum/antagonist/changeling/C = mind.has_antag_datum(/datum/antagonist/changeling)
 		if(C && C.chosen_sting)
 			C.chosen_sting.try_to_sting(src,A)
-			next_click = world.time + 5
-			return
+			DelayNextAction(CLICK_CD_RANGE)
+			return TRUE
 	..()
 
 /atom/proc/AltClick(mob/user)
@@ -413,9 +375,11 @@
 	return
 
 /mob/living/LaserEyes(atom/A, params)
-	changeNext_move(CLICK_CD_RANGE)
+	if(!CheckActionCooldown(CLICK_CD_RANGE))
+		return
+	DelayNextAction()
 
-	var/obj/item/projectile/beam/LE = new /obj/item/projectile/beam( loc )
+	var/obj/item/projectile/beam/LE = new /obj/item/projectile/beam(loc)
 	LE.icon = 'icons/effects/genetics.dmi'
 	LE.icon_state = "eyelasers"
 	playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
@@ -424,6 +388,7 @@
 	LE.def_zone = get_organ_target()
 	LE.preparePixelProjectile(A, src, params)
 	LE.fire()
+	return TRUE
 
 // Simple helper to face what you clicked on, in case it should be needed in more than one place
 /mob/proc/face_atom(atom/A, ismousemovement = FALSE)

code/_onclick/cyborg.dm

@@ -7,10 +7,6 @@
 */
 
 /mob/living/silicon/robot/ClickOn(var/atom/A, var/params)
-	if(world.time <= next_click)
-		return
-	next_click = world.time + 1
-
 	if(check_click_intercept(params,A))
 		return
 
@@ -19,25 +15,19 @@
 
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"] && modifiers["ctrl"])
-		CtrlShiftClickOn(A)
-		return
+		return CtrlShiftClickOn(A)
 	if(modifiers["shift"] && modifiers["middle"])
-		ShiftMiddleClickOn(A)
-		return
+		return ShiftMiddleClickOn(A)
 	if(modifiers["middle"])
-		MiddleClickOn(A)
-		return
+		return MiddleClickOn(A)
 	if(modifiers["shift"])
-		ShiftClickOn(A)
-		return
+		return ShiftClickOn(A)
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
-		AltClickOn(A)
-		return
+		return AltClickOn(A)
 	if(modifiers["ctrl"])
-		CtrlClickOn(A)
-		return
+		return CtrlClickOn(A)
 
-	if(next_move >= world.time)
+	if(!CheckActionCooldown(immediate = TRUE))
 		return
 
 	face_atom(A) // change direction to face what you clicked on
@@ -50,7 +40,7 @@
 	*/
 	if(aicamera.in_camera_mode) //Cyborg picture taking
 		aicamera.camera_mode_off()
-		aicamera.captureimage(A, usr)
+		INVOKE_ASYNC(aicamera, /obj/item/camera.proc/captureimage, A, usr)
 		return
 
 	var/obj/item/W = get_active_held_item()
@@ -58,13 +48,8 @@
 	if(!W && A.Adjacent(src) && (isobj(A) || ismob(A)))
 		var/atom/movable/C = A
 		if(C.can_buckle && C.has_buckled_mobs())
-			if(C.buckled_mobs.len > 1)
-				var/unbuckled = input(src, "Who do you wish to unbuckle?","Unbuckle Who?") as null|mob in C.buckled_mobs
-				if(C.user_unbuckle_mob(unbuckled,src))
-					return
-			else
-				if(C.user_unbuckle_mob(C.buckled_mobs[1],src))
-					return
+			INVOKE_ASYNC(C, /atom/movable.proc/precise_user_unbuckle_mob, src)
+			return
 
 	if(!W && (get_dist(src,A) <= interaction_range))
 		A.attack_robot(src)
@@ -81,7 +66,9 @@
 
 		// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
 		if(A == loc || (A in loc) || (A in contents))
-			W.melee_attack_chain(src, A, params)
+			. = W.melee_attack_chain(src, A, params)
+			if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A))
+				DelayNextAction(CLICK_CD_MELEE)
 			return
 
 		if(!isturf(loc))
@@ -90,11 +77,12 @@
 		// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
 		if(isturf(A) || isturf(A.loc))
 			if(A.Adjacent(src)) // see adjacent.dm
-				W.melee_attack_chain(src, A, params)
+				. = W.melee_attack_chain(src, A, params)
+				if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A))
+					DelayNextAction(CLICK_CD_MELEE)
 				return
 			else
-				W.afterattack(A, src, 0, params)
-				return
+				return W.afterattack(A, src, 0, params)
 
 //Middle click cycles through selected modules.
 /mob/living/silicon/robot/MiddleClickOn(atom/A)

code/_onclick/hud/_defines.dm

@@ -168,6 +168,8 @@
 //UI position overrides for 1:1 screen layout. (default is 7:5)
 #define ui_stamina "EAST-1:28,CENTER:17" // replacing internals button
 #define ui_overridden_resist "EAST-3:24,SOUTH+1:7"
+#define ui_clickdelay "CENTER,SOUTH+1:-31"
+#define ui_resistdelay "EAST-3:24,SOUTH+1:4"
 #define ui_combat_toggle "EAST-4:22,SOUTH:5"
 
 #define ui_boxcraft "EAST-4:22,SOUTH+1:6"

code/_onclick/hud/action_button.dm

@@ -56,9 +56,6 @@
 		if(id && usr.client) //try to (un)remember position
 			usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = locked ? moved : null
 		return TRUE
-	if(usr.next_click > world.time)
-		return
-	usr.next_click = world.time + 1
 	linked_action.Trigger()
 	return TRUE
 

code/_onclick/hud/alert.dm

@@ -22,7 +22,7 @@
 	if(alerts[category])
 		thealert = alerts[category]
 		if(thealert.override_alerts)
-			return 0
+			return thealert
 		if(new_master && new_master != thealert.master)
 			WARNING("[src] threw alert [category] with new_master [new_master] while already having that alert with master [thealert.master]")
 
@@ -36,7 +36,7 @@
 				clear_alert(category)
 				return .()
 			else //no need to update
-				return 0
+				return thealert
 	else
 		thealert = new type()
 		thealert.override_alerts = override
@@ -272,7 +272,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	var/mob/living/L = usr
 	if(!istype(L) || !L.can_resist())
 		return
-	L.changeNext_move(CLICK_CD_RESIST)
+	L.MarkResistTime()
 	if(CHECK_MOBILITY(L, MOBILITY_MOVE))
 		return L.resist_fire() //I just want to start a flame in your hearrrrrrtttttt.
 
@@ -598,17 +598,32 @@ so as to remain in compliance with the most up-to-date laws."
 	var/mob/living/L = usr
 	if(!istype(L) || !L.can_resist())
 		return
-	L.changeNext_move(CLICK_CD_RESIST)
-	if(CHECK_MOBILITY(L, MOBILITY_MOVE) && (L.last_special <= world.time))
-		return L.resist_restraints()
+	L.MarkResistTime()
+	return L.resist_restraints()
 
 /obj/screen/alert/restrained/buckled/Click()
 	var/mob/living/L = usr
 	if(!istype(L) || !L.can_resist())
 		return
-	L.changeNext_move(CLICK_CD_RESIST)
-	if(L.last_special <= world.time)
-		return L.resist_buckle()
+	L.MarkResistTime()
+	return L.resist_buckle()
+
+/obj/screen/alert/shoes/untied
+	name = "Untied Shoes"
+	desc = "Your shoes are untied! Click the alert or your shoes to tie them."
+	icon_state = "shoealert"
+
+/obj/screen/alert/shoes/knotted
+	name = "Knotted Shoes"
+	desc = "Someone tied your shoelaces together! Click the alert or your shoes to undo the knot."
+	icon_state = "shoealert"
+
+/obj/screen/alert/shoes/Click()
+	var/mob/living/carbon/C = usr
+	if(!istype(C) || !C.can_resist() || C != mob_viewer || !C.shoes)
+		return
+	C.MarkResistTime()
+	C.shoes.handle_tying(C)
 
 // PRIVATE = only edit, use, or override these if you're editing the system as a whole
 

code/_onclick/hud/human.dm

@@ -140,6 +140,17 @@
 	sprint_buffer.hud = src
 	static_inventory += sprint_buffer
 
+	// clickdelay
+	clickdelay = new
+	clickdelay.hud = src
+	clickdelay.screen_loc = ui_clickdelay
+	static_inventory += clickdelay
+
+	// resistdelay
+	resistdelay = new
+	resistdelay.hud = src
+	resistdelay.screen_loc = ui_resistdelay
+	static_inventory += resistdelay
 
 	using = new /obj/screen/drop()
 	using.icon = ui_style

code/_onclick/hud/parallax.dm

@@ -128,7 +128,7 @@
 		deltimer(C.parallax_animate_timer)
 	var/datum/callback/CB = CALLBACK(src, .proc/update_parallax_motionblur, C, animatedir, new_parallax_movedir, newtransform)
 	if(skip_windups)
-		CB.Invoke()
+		CB.InvokeAsync()
 	else
 		C.parallax_animate_timer = addtimer(CB, min(shortesttimer, PARALLAX_LOOP_TIME), TIMER_CLIENT_TIME|TIMER_STOPPABLE)
 
@@ -219,6 +219,7 @@
 		L.screen_loc = "CENTER-7:[round(L.offset_x,1)],CENTER-7:[round(L.offset_y,1)]"
 
 /atom/movable/proc/update_parallax_contents()
+	set waitfor = FALSE
 	if(length(client_mobs_in_contents))
 		for(var/thing in client_mobs_in_contents)
 			var/mob/M = thing

code/_onclick/hud/screen_objects.dm

@@ -47,17 +47,7 @@
 	name = "swap hand"
 
 /obj/screen/swap_hand/Click()
-	// At this point in client Click() code we have passed the 1/10 sec check and little else
-	// We don't even know if it's a middle click
-	if(world.time <= usr.next_move)
-		return 1
-
-	if(usr.incapacitated())
-		return 1
-
-	if(ismob(usr))
-		var/mob/M = usr
-		M.swap_hand()
+	usr.swap_hand()
 	return 1
 
 /obj/screen/craft
@@ -101,15 +91,9 @@
 	plane = HUD_PLANE
 
 /obj/screen/inventory/Click(location, control, params)
-	// At this point in client Click() code we have passed the 1/10 sec check and little else
-	// We don't even know if it's a middle click
-	if(world.time <= usr.next_move)
-		return TRUE
-
-	if(usr.incapacitated())
-		return TRUE
-	if(ismecha(usr.loc)) // stops inventory actions in a mech
-		return TRUE
+	if(hud?.mymob && (hud.mymob != usr))
+		return
+	// just redirect clicks
 
 	if(hud?.mymob && slot_id)
 		var/obj/item/inv_item = hud.mymob.get_item_by_slot(slot_id)
@@ -190,17 +174,10 @@
 
 
 /obj/screen/inventory/hand/Click(location, control, params)
-	// At this point in client Click() code we have passed the 1/10 sec check and little else
-	// We don't even know if it's a middle click
-	var/mob/user = hud?.mymob
-	if(usr != user)
-		return TRUE
-	if(world.time <= user.next_move)
-		return TRUE
-	if(user.incapacitated())
-		return TRUE
-	if (ismecha(user.loc)) // stops inventory actions in a mech
-		return TRUE
+	if(hud?.mymob && (hud.mymob != usr))
+		return
+	var/mob/user = hud.mymob
+	// just redirect clicks
 
 	if(user.active_hand_index == held_index)
 		var/obj/item/I = user.get_active_held_item()

code/_onclick/hud/screen_objects/clickdelay.dm

@@ -0,0 +1,58 @@
+/obj/screen/action_bar
+
+/obj/screen/action_bar/Destroy()
+	STOP_PROCESSING(SShuds, src)
+	return ..()
+
+/obj/screen/action_bar/proc/mark_dirty()
+	var/mob/living/L = hud?.mymob
+	if(L?.client && update_to_mob(L))
+		START_PROCESSING(SShuds, src)
+
+/obj/screen/action_bar/process()
+	var/mob/living/L = hud?.mymob
+	if(!L?.client || !update_to_mob(L))
+		return PROCESS_KILL
+
+/obj/screen/action_bar/proc/update_to_mob(mob/living/L)
+	return FALSE
+
+/datum/hud/var/obj/screen/action_bar/clickdelay/clickdelay
+
+/obj/screen/action_bar/clickdelay
+	name = "click delay"
+	icon = 'icons/effects/progessbar.dmi'
+	icon_state = "prog_bar_100"
+	layer = 20		// under hand buttons
+
+/obj/screen/action_bar/clickdelay/Initialize()
+	. = ..()
+	var/matrix/M = new
+	M.Scale(2, 1)
+	transform = M
+
+/obj/screen/action_bar/clickdelay/update_to_mob(mob/living/L)
+	var/estimated = L.EstimatedNextActionTime()
+	var/diff = estimated - L.last_action
+	var/left = estimated - world.time
+	if(left < 0 || diff < 0)
+		icon_state = "prog_bar_100"
+		return FALSE
+	icon_state = "prog_bar_[round(clamp(((diff - left)/diff) * 100, 0, 100), 5)]"
+	return TRUE
+
+/datum/hud/var/obj/screen/action_bar/resistdelay/resistdelay
+
+/obj/screen/action_bar/resistdelay
+	name = "resist delay"
+	icon = 'icons/effects/progessbar.dmi'
+	icon_state = "prog_bar_100"
+
+/obj/screen/action_bar/resistdelay/update_to_mob(mob/living/L)
+	var/diff = L.next_resist - L.last_resist
+	var/left = L.next_resist - world.time
+	if(left < 0 || diff < 0)
+		icon_state = "prog_bar_100"
+		return FALSE
+	icon_state = "prog_bar_[round(clamp(((diff - left)/diff) * 100, 0, 100), 5)]"
+	return TRUE

code/_onclick/hud/screen_objects/sprint.dm

@@ -0,0 +1,58 @@
+/obj/screen/mov_intent
+	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'
+
+/obj/screen/sprintbutton
+	name = "toggle sprint"
+	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'
+	icon_state = "act_sprint"
+	layer = ABOVE_HUD_LAYER - 0.1
+	var/mutable_appearance/flashy
+
+/obj/screen/sprintbutton/Click()
+	if(ishuman(usr))
+		var/mob/living/carbon/human/H = usr
+		H.default_toggle_sprint()
+
+/obj/screen/sprintbutton/update_icon_state()
+	var/mob/living/user = hud?.mymob
+	if(!istype(user))
+		return
+	if(user.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE)
+		icon_state = "act_sprint_on"
+	else if(HAS_TRAIT(user, TRAIT_SPRINT_LOCKED))
+		icon_state = "act_sprint_locked"
+	else
+		icon_state = "act_sprint"
+
+/obj/screen/sprintbutton/update_overlays()
+	. = ..()
+	var/mob/living/carbon/user = hud?.mymob
+	if(!istype(user) || !user.client)
+		return
+
+	if((user.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) && user.client.prefs.hud_toggle_flash)
+		if(!flashy)
+			flashy = mutable_appearance('icons/mob/screen_gen.dmi', "togglehalf_flash")
+		if(flashy.color != user.client.prefs.hud_toggle_color)
+			flashy.color = user.client.prefs.hud_toggle_color
+		. += flashy
+
+//Sprint buffer onscreen code.
+/datum/hud/var/obj/screen/sprint_buffer/sprint_buffer
+
+/obj/screen/sprint_buffer
+	name = "sprint buffer"
+	icon = 'icons/effects/progessbar.dmi'
+	icon_state = "prog_bar_100"
+
+/obj/screen/sprint_buffer/Click()
+	if(isliving(usr))
+		var/mob/living/L = usr
+		to_chat(L, "<span class='boldnotice'>Your sprint buffer's maximum capacity is [L.sprint_buffer_max]. It is currently at [L.sprint_buffer], regenerating at [L.sprint_buffer_regen_ds * 10] per second. \
+		Sprinting while this is empty will incur a [L.sprint_stamina_cost] stamina cost per tile.</span>")
+
+/obj/screen/sprint_buffer/proc/update_to_mob(mob/living/L)
+	var/amount = 0
+	if(L.sprint_buffer_max > 0)
+		amount = round(clamp((L.sprint_buffer / L.sprint_buffer_max) * 100, 0, 100), 5)
+	icon_state = "prog_bar_[amount]"

code/_onclick/hud/screen_objects/stamina.dm

@@ -0,0 +1,61 @@
+/datum/hud/var/obj/screen/staminas/staminas
+/datum/hud/var/obj/screen/staminabuffer/staminabuffer
+
+/obj/screen/staminas
+	icon = 'modular_citadel/icons/ui/screen_gen.dmi'
+	name = "stamina"
+	icon_state = "stamina0"
+	screen_loc = ui_stamina
+	mouse_opacity = 1
+
+/obj/screen/staminas/Click(location,control,params)
+	if(isliving(usr))
+		var/mob/living/L = usr
+		to_chat(L, "<span class='notice'>You have <b>[L.getStaminaLoss()]</b> stamina loss.<br>Your stamina buffer can take <b>[L.stambuffer]</b> stamina loss, and recharges at no cost.<br>Your stamina buffer is <b>[(L.stambuffer*(100/L.stambuffer))-(L.bufferedstam*(100/L.stambuffer))]%</b> full.</span>")
+
+/obj/screen/staminas/update_icon_state()
+	var/mob/living/carbon/user = hud?.mymob
+	if(!user)
+		return
+	if(user.stat == DEAD || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2))
+		icon_state = "staminacrit"
+	else if(user.hal_screwyhud == 5)
+		icon_state = "stamina0"
+	else
+		icon_state = "stamina[clamp(FLOOR(user.getStaminaLoss() /20, 1), 0, 6)]"
+
+//stam buffer
+/obj/screen/staminabuffer
+	icon = 'modular_citadel/icons/ui/screen_gen.dmi'
+	name = "stamina buffer"
+	icon_state = "stambuffer0"
+	screen_loc = ui_stamina
+	layer = ABOVE_HUD_LAYER + 0.1
+	mouse_opacity = 0
+
+/obj/screen/staminabuffer/update_icon_state()
+	var/mob/living/carbon/user = hud?.mymob
+	if(!user)
+		return
+	if(user.stat == DEAD || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2))
+		icon_state = "stambuffer7"
+	else if(user.hal_screwyhud == 5)
+		icon_state = "stambuffer0"
+	else
+		switch(user.bufferedstam / user.stambuffer)
+			if(0.95 to INFINITY)
+				icon_state = "stambuffer7"
+			if(0.9 to 0.95)
+				icon_state = "stambuffer6"
+			if(0.8 to 0.9)
+				icon_state = "stambuffer5"
+			if(0.6 to 0.8)
+				icon_state = "stambuffer4"
+			if(0.4 to 0.6)
+				icon_state = "stambuffer3"
+			if(0.2 to 0.4)
+				icon_state = "stambuffer2"
+			if(0.05 to 0.2)
+				icon_state = "stambuffer1"
+			else
+				icon_state = "stambuffer0"

code/_onclick/hud/screen_objects/storage.dm

@@ -9,12 +9,9 @@
 /obj/screen/storage/Click(location, control, params)
 	if(!insertion_click)
 		return ..()
-	if(world.time <= usr.next_move)
-		return TRUE
-	if(usr.incapacitated())
-		return TRUE
-	if (ismecha(usr.loc)) // stops inventory actions in a mech
-		return TRUE
+	if(hud?.mymob && (hud.mymob != usr))
+		return
+	// just redirect clicks
 	if(master)
 		var/obj/item/I = usr.get_active_held_item()
 		if(I)

code/_onclick/hud/screen_objects/vore.dm

@@ -0,0 +1,22 @@
+/obj/screen/voretoggle
+	name = "toggle vore mode"
+	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'
+	icon_state = "nom_off"
+
+/obj/screen/voretoggle/Click()
+	if(usr != hud.mymob)
+		return
+	var/mob/living/carbon/C = usr
+	if(SEND_SIGNAL(usr, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE))
+		to_chat(usr, "<span class='warning'>Disable combat mode first.</span>")
+		return
+	C.toggle_vore_mode()
+
+/obj/screen/voretoggle/update_icon_state()
+	var/mob/living/carbon/user = hud?.mymob
+	if(!istype(user))
+		return
+	if(user.voremode)
+		icon_state = "nom"
+	else
+		icon_state = "nom_off"

code/_onclick/item_attack.dm

@@ -7,21 +7,22 @@
   *and lastly
   *afterattack. The return value does not matter.
   */
-/obj/item/proc/melee_attack_chain(mob/user, atom/target, params, flags, damage_multiplier = 1)
+/obj/item/proc/melee_attack_chain(mob/user, atom/target, params, attackchain_flags, damage_multiplier = 1)
 	if(isliving(user))
 		var/mob/living/L = user
-		if(!CHECK_MOBILITY(L, MOBILITY_USE) && !(flags & ATTACKCHAIN_PARRY_COUNTERATTACK))
+		if(!CHECK_MOBILITY(L, MOBILITY_USE) && !(attackchain_flags & ATTACK_IS_PARRY_COUNTERATTACK))
 			to_chat(L, "<span class='warning'>You are unable to swing [src] right now!</span>")
 			return
-	if(tool_behaviour && target.tool_act(user, src, tool_behaviour))
+	. = attackchain_flags
+	if(tool_behaviour && ((. = target.tool_act(user, src, tool_behaviour)) & STOP_ATTACK_PROC_CHAIN))
 		return
-	if(pre_attack(target, user, params))
+	if((. |= pre_attack(target, user, params, ., damage_multiplier)) & STOP_ATTACK_PROC_CHAIN)
 		return
-	if(target.attackby(src, user, params, flags, damage_multiplier))
+	if((. |= target.attackby(src, user, params, ., damage_multiplier)) & STOP_ATTACK_PROC_CHAIN)
 		return
 	if(QDELETED(src) || QDELETED(target))
 		return
-	afterattack(target, user, TRUE, params)
+	. |= afterattack(target, user, TRUE, params)
 
 /// Like melee_attack_chain but for ranged.
 /obj/item/proc/ranged_attack_chain(mob/user, atom/target, params)
@@ -30,7 +31,7 @@
 		if(!CHECK_MOBILITY(L, MOBILITY_USE))
 			to_chat(L, "<span class='warning'>You are unable to raise [src] right now!</span>")
 			return
-	afterattack(target, user, FALSE, params)
+	return afterattack(target, user, FALSE, params)
 
 // Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown.
 /obj/item/proc/attack_self(mob/user)
@@ -38,28 +39,43 @@
 		return
 	interact(user)
 
-/obj/item/proc/pre_attack(atom/A, mob/living/user, params) //do stuff before attackby!
+/obj/item/proc/pre_attack(atom/A, mob/living/user, params, attackchain_flags, damage_multiplier) //do stuff before attackby!
 	if(SEND_SIGNAL(src, COMSIG_ITEM_PRE_ATTACK, A, user, params) & COMPONENT_NO_ATTACK)
-		return TRUE
-	return FALSE //return TRUE to avoid calling attackby after this proc does stuff
+		return STOP_ATTACK_PROC_CHAIN
+	if(!(attackchain_flags & ATTACK_IGNORE_CLICKDELAY) && !CheckAttackCooldown(user, A))
+		return STOP_ATTACK_PROC_CHAIN
 
 // No comment
 /atom/proc/attackby(obj/item/W, mob/user, params)
 	if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, params) & COMPONENT_NO_AFTERATTACK)
-		return TRUE
-	return FALSE
+		return STOP_ATTACK_PROC_CHAIN
 
 /obj/attackby(obj/item/I, mob/living/user, params)
-	return ..() || ((obj_flags & CAN_BE_HIT) && I.attack_obj(src, user))
+	. = ..()
+	if(. & STOP_ATTACK_PROC_CHAIN)
+		return
+	if(obj_flags & CAN_BE_HIT)
+		. |= I.attack_obj(src, user)
 
 /mob/living/attackby(obj/item/I, mob/living/user, params, attackchain_flags, damage_multiplier)
-	if(..())
-		return TRUE
-	I.attack_delay_done = FALSE //Should be set TRUE in pre_attacked_by()
-	. = I.attack(src, user, attackchain_flags, damage_multiplier)
-	if(!I.attack_delay_done) //Otherwise, pre_attacked_by() should handle it.
-		user.changeNext_move(I.click_delay)
+	. = ..()
+	if(. & STOP_ATTACK_PROC_CHAIN)
+		return
+	. |= I.attack(src, user, attackchain_flags, damage_multiplier)
+	if(!(. & NO_AUTO_CLICKDELAY_HANDLING))	// SAFETY NET - unless the proc tells us we should not handle this, give them the basic melee cooldown!
+		I.ApplyAttackCooldown(user, src, attackchain_flags)
 
+/**
+  * Called when someone uses us to attack a mob in melee combat.
+  * 
+  * This proc respects CheckAttackCooldown() default clickdelay handling.
+  * 
+  * @params
+  * * mob/living/M - target
+  * * mob/living/user - attacker
+  * * attackchain_Flags - see [code/__DEFINES/_flags/return_values.dm]
+  * * damage_multiplier - what to multiply the damage by
+  */
 /obj/item/proc/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user) & COMPONENT_ITEM_NO_ATTACK)
 		return
@@ -88,6 +104,17 @@
 	if(weight)
 		user.adjustStaminaLossBuffered(weight)
 
+	// CIT SCREENSHAKE
+	if(force >= 15)
+		shake_camera(user, ((force - 10) * 0.01 + 1), ((force - 10) * 0.01))
+		if(M.client)
+			switch (M.client.prefs.damagescreenshake)
+				if (1)
+					shake_camera(M, ((force - 10) * 0.015 + 1), ((force - 10) * 0.015))
+				if (2)
+					if(!CHECK_MOBILITY(M, MOBILITY_MOVE))
+						shake_camera(M, ((force - 10) * 0.015 + 1), ((force - 10) * 0.015))
+
 //the equivalent of the standard version of attack() but for object targets.
 /obj/item/proc/attack_obj(obj/O, mob/living/user)
 	if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, O, user) & COMPONENT_NO_ATTACK_OBJ)
@@ -95,8 +122,7 @@
 	if(item_flags & NOBLUDGEON)
 		return
 	user.do_attack_animation(O)
-	if(!O.attacked_by(src, user))
-		user.changeNext_move(click_delay)
+	O.attacked_by(src, user)
 	var/weight = getweight(user, STAM_COST_ATTACK_OBJ_MULT)
 	if(weight)
 		user.adjustStaminaLossBuffered(weight)//CIT CHANGE - makes attacking things cause stamina loss
@@ -109,12 +135,9 @@
 	var/bad_trait
 
 	var/stamloss = user.getStaminaLoss()
-	var/next_move_mult = 1
 	if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do.
 		var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY
 		totitemdamage *= 1 - penalty
-		next_move_mult += penalty*STAM_CRIT_ITEM_ATTACK_DELAY
-	user.changeNext_move(I.click_delay*next_move_mult)
 
 	if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
 		bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
@@ -126,18 +149,18 @@
 			if(!(SKILL_TRAIN_ATTACK_OBJ in I.used_skills[skill]))
 				continue
 			user.mind.auto_gain_experience(skill, I.skill_gain)
-
+	if(!(attackchain_flags & NO_AUTO_CLICKDELAY_HANDLING))
+		I.ApplyAttackCooldown(user, src, attackchain_flags)
 	if(totitemdamage)
 		visible_message("<span class='danger'>[user] has hit [src] with [I]!</span>", null, null, COMBAT_MESSAGE_RANGE)
 		//only witnesses close by and the victim see a hit message.
 		log_combat(user, src, "attacked", I)
 	take_damage(totitemdamage, I.damtype, "melee", 1)
-	return TRUE
 
 /mob/living/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	var/list/block_return = list()
 	var/totitemdamage = pre_attacked_by(I, user) * damage_multiplier
-	if((user != src) && mob_run_block(I, totitemdamage, "the [I.name]", ((attackchain_flags & ATTACKCHAIN_PARRY_COUNTERATTACK)? ATTACK_TYPE_PARRY_COUNTERATTACK : NONE) | ATTACK_TYPE_MELEE, I.armour_penetration, user, null, block_return) & BLOCK_SUCCESS)
+	if((user != src) && mob_run_block(I, totitemdamage, "the [I.name]", ((attackchain_flags & ATTACK_IS_PARRY_COUNTERATTACK)? ATTACK_IS_PARRY_COUNTERATTACK : NONE) | ATTACK_TYPE_MELEE, I.armour_penetration, user, null, block_return) & BLOCK_SUCCESS)
 		return FALSE
 	totitemdamage = block_calculate_resultant_damage(totitemdamage, block_return)
 	send_item_attack_message(I, user, null, totitemdamage)
@@ -155,8 +178,7 @@
 
 /mob/living/simple_animal/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	if(I.force < force_threshold || I.damtype == STAMINA)
-		playsound(loc, 'sound/weapons/tap.ogg', I.get_clamped_volume(), 1, -1)
-		user.changeNext_move(I.click_delay) //pre_attacked_by not called
+		playsound(src, 'sound/weapons/tap.ogg', I.get_clamped_volume(), 1, -1)
 	else
 		return ..()
 
@@ -167,16 +189,12 @@
 
 	var/stamloss = user.getStaminaLoss()
 	var/stam_mobility_mult = 1
-	var/next_move_mult = 1
 	if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do.
 		var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY
 		stam_mobility_mult -= penalty
-		next_move_mult += penalty*STAM_CRIT_ITEM_ATTACK_DELAY
 	if(stam_mobility_mult > LYING_DAMAGE_PENALTY && !CHECK_MOBILITY(user, MOBILITY_STAND)) //damage penalty for fighting prone, doesn't stack with the above.
 		stam_mobility_mult = LYING_DAMAGE_PENALTY
 	. *= stam_mobility_mult
-	user.changeNext_move(I.click_delay*next_move_mult)
-	I.attack_delay_done = TRUE
 
 	var/bad_trait
 	if(!(I.item_flags & NO_COMBAT_MODE_FORCE_MODIFIER))
@@ -197,8 +215,18 @@
 		var/datum/skill/S = GLOB.skill_datums[skill]
 		user.mind.auto_gain_experience(skill, I.skill_gain*S.item_skill_gain_multi)
 
-// Proximity_flag is 1 if this afterattack was called on something adjacent, in your square, or on your person.
-// Click parameters is the params string from byond Click() code, see that documentation.
+/**
+  * Called after attacking something if the melee attack chain isn't interrupted before.
+  * Also called when clicking on something with an item without being in melee range
+  *
+  * WARNING: This does not automatically check clickdelay if not in a melee attack! Be sure to account for this!
+  * 
+  * @params
+  * * target - The thing we clicked
+  * * user - mob of person clicking
+  * * proximity_flag - are we in melee range/doing it in a melee attack
+  * * click_parameters - mouse control parameters, check BYOND ref.
+  */
 /obj/item/proc/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	SEND_SIGNAL(src, COMSIG_ITEM_AFTERATTACK, target, user, proximity_flag, click_parameters)
 	SEND_SIGNAL(user, COMSIG_MOB_ITEM_AFTERATTACK, target, user, proximity_flag, click_parameters)

code/_onclick/observer.dm

@@ -37,7 +37,7 @@
 		CtrlClickOn(A)
 		return
 
-	if(world.time <= next_move)
+	if(!CheckActionCooldown())
 		return
 	// You are responsible for checking config.ghost_interaction when you override this function
 	// Not all of them require checking, see below

code/_onclick/other_mobs.dm

@@ -4,39 +4,57 @@
 
 	Otherwise pretty standard.
 */
-/mob/living/carbon/human/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+
+/mob/living/carbon/human/UnarmedAttack(atom/A, proximity, intent = a_intent, attackchain_flags = NONE)
 
 	if(!has_active_hand()) //can't attack without a hand.
 		to_chat(src, "<span class='notice'>You look at your arm and sigh.</span>")
 		return
 
+	var/obj/item/bodypart/check_arm = get_active_hand()
+	if(check_arm && check_arm.is_disabled() == BODYPART_DISABLED_WOUND)
+		to_chat(src, "<span class='warning'>The damage in your [check_arm.name] is preventing you from using it! Get it fixed, or at least splinted!</span>")
+		return
+
+	. = attackchain_flags
 	// Special glove functions:
 	// If the gloves do anything, have them return 1 to stop
 	// normal attack_hand() here.
 	var/obj/item/clothing/gloves/G = gloves // not typecast specifically enough in defines
-	if(proximity && istype(G) && G.Touch(A,1))
-		return
-
-	var/override = 0
+	if(proximity && istype(G))
+		. |= G.Touch(A, TRUE)
+		if(. & INTERRUPT_UNARMED_ATTACK)
+			return
 
 	for(var/datum/mutation/human/HM in dna.mutations)
-		override += HM.on_attack_hand(A, proximity, intent, flags)
+		. |= HM.on_attack_hand(A, proximity, intent, .)
 
-	if(override)
+	if(. & INTERRUPT_UNARMED_ATTACK)
 		return
 
 	SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A)
-	A.attack_hand(src, intent, flags)
+	return . | A.attack_hand(src, intent, .)
 
-//Return TRUE to cancel other attack hand effects that respect it.
-/atom/proc/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
-	. = FALSE
+/atom/proc/attack_hand(mob/user, act_intent = user.a_intent, attackchain_flags)
+	SHOULD_NOT_SLEEP(TRUE)
 	if(!(interaction_flags_atom & INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND))
 		add_fingerprint(user)
 	if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user) & COMPONENT_NO_ATTACK_HAND)
-		. = TRUE
+		return
+	. = attackchain_flags
+	if(attack_hand_speed && !(. & ATTACK_IGNORE_CLICKDELAY))
+		if(!user.CheckActionCooldown(attack_hand_speed))
+			return
 	if(interaction_flags_atom & INTERACT_ATOM_ATTACK_HAND)
 		. = _try_interact(user)
+	INVOKE_ASYNC(src, .proc/on_attack_hand, user, act_intent, .)
+	if(!(. & ATTACK_IGNORE_ACTION))
+		if(attack_hand_unwieldlyness)
+			user.DelayNextAction(attack_hand_unwieldlyness, considered_action = attack_hand_is_action)
+		else if(attack_hand_is_action)
+			user.DelayNextAction()
+
+/atom/proc/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 
 //Return a non FALSE value to cancel whatever called this from propagating, if it respects it.
 /atom/proc/_try_interact(mob/user)
@@ -44,7 +62,6 @@
 		return interact(user)
 	if(can_interact(user))
 		return interact(user)
-	return FALSE
 
 /atom/proc/can_interact(mob/user)
 	if(!user.can_interact_with(src))
@@ -74,8 +91,7 @@
 	else
 		add_fingerprint(user)
 	if(interaction_flags_atom & INTERACT_ATOM_UI_INTERACT)
-		return ui_interact(user)
-	return FALSE
+		ui_interact(user)
 
 /*
 /mob/living/carbon/human/RestrainedClickOn(var/atom/A) ---carbons will handle this
@@ -89,13 +105,19 @@
 	. = ..()
 	if(gloves)
 		var/obj/item/clothing/gloves/G = gloves
-		if(istype(G) && G.Touch(A,0)) // for magic gloves
+		. |= G.Touch(A, FALSE)
+		if(. & INTERRUPT_UNARMED_ATTACK)
+			return
+	if(istype(glasses))
+		. |= glasses.ranged_attack(src, A, mouseparams)
+		if(. & INTERRUPT_UNARMED_ATTACK)
 			return
-	if (istype(glasses) && glasses.ranged_attack(src,A,mouseparams))
-		return
 
 	for(var/datum/mutation/human/HM in dna.mutations)
-		HM.on_ranged_attack(A, mouseparams)
+		. |= HM.on_ranged_attack(A, mouseparams)
+
+	if(. & INTERRUPT_UNARMED_ATTACK)
+		return
 
 	if(isturf(A) && get_dist(src,A) <= 1)
 		src.Move_Pulled(A)
@@ -117,7 +139,9 @@
 	Monkeys
 */
 /mob/living/carbon/monkey/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
-	A.attack_paw(src, intent, flags)
+	if(!CheckActionCooldown(CLICK_CD_MELEE))
+		return
+	return !isnull(A.attack_paw(src, intent, flags))
 
 /atom/proc/attack_paw(mob/user)
 	if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user) & COMPONENT_NO_ATTACK_HAND)
@@ -138,6 +162,8 @@
 		return
 	if(is_muzzled())
 		return
+	if(!CheckActionCooldown(CLICK_CD_MELEE))
+		return
 	var/mob/living/carbon/ML = A
 	if(istype(ML))
 		var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
@@ -157,6 +183,7 @@
 				ML.ForceContractDisease(D)
 		else
 			ML.visible_message("<span class='danger'>[src] has attempted to bite [ML]!</span>")
+	DelayNextAction()
 
 /*
 	Aliens
@@ -237,7 +264,7 @@
 /mob/living/simple_animal/hostile/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 	target = A
 	if(dextrous && !ismob(A))
-		..()
+		return ..()
 	else
 		AttackingTarget()
 

code/_onclick/right_click.dm

@@ -0,0 +1,76 @@
+/mob/proc/RightClickOn(atom/A, params) //mostly a copy-paste from ClickOn()
+	var/list/modifiers = params2list(params)
+	if(incapacitated(ignore_restraints = 1))
+		return
+
+	face_atom(A)
+
+	if(!CheckActionCooldown())
+		return
+
+	if(!modifiers["catcher"] && A.IsObscured())
+		return
+
+	if(ismecha(loc))
+		var/obj/mecha/M = loc
+		return M.click_action(A,src,params)
+
+	if(restrained())
+		DelayNextAction(CLICK_CD_HANDCUFFED)
+		return RestrainedClickOn(A)
+
+	if(in_throw_mode)
+		throw_item(A)//todo: make it plausible to lightly toss items via right-click
+		return
+
+	var/obj/item/W = get_active_held_item()
+
+	if(W == A)
+		if(!W.rightclick_attack_self(src))
+			W.attack_self(src)
+		update_inv_hands()
+		return
+
+	//These are always reachable.
+	//User itself, current loc, and user inventory
+	if(A in DirectAccess())
+		if(W)
+			return W.rightclick_melee_attack_chain(src, A, params)
+		else
+			if(!AltUnarmedAttack(A, TRUE))
+				. = UnarmedAttack(A, TRUE, a_intent)
+				if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A))
+					DelayNextAction(CLICK_CD_MELEE)
+				return
+			return
+
+	//Can't reach anything else in lockers or other weirdness
+	if(!loc.AllowClick())
+		return
+
+	//Standard reach turf to turf or reaching inside storage
+	if(CanReach(A,W))
+		if(W)
+			return W.rightclick_melee_attack_chain(src, A, params)
+		else
+			if(!AltUnarmedAttack(A, TRUE))
+				. = UnarmedAttack(A, TRUE, a_intent)
+				if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A))
+					DelayNextAction(CLICK_CD_MELEE)
+				return
+			return
+	else
+		if(W)
+			if(!W.altafterattack(A, src, FALSE, params))
+				return W.afterattack(A, src, FALSE, params)
+		else
+			if(!AltRangedAttack(A, params))
+				return RangedAttack(A, params)
+
+/mob/proc/AltUnarmedAttack(atom/A, proximity_flag)
+	if(ismob(A))
+		DelayNextAction(CLICK_CD_MELEE)
+	return FALSE
+
+/mob/proc/AltRangedAttack(atom/A, params)
+	return FALSE

code/_onclick/right_item_attack.dm

@@ -0,0 +1,19 @@
+/obj/item/proc/rightclick_melee_attack_chain(mob/user, atom/target, params)
+	if(!alt_pre_attack(target, user, params)) //Hey, does this item have special behavior that should override all normal right-click functionality?
+		if(!target.altattackby(src, user, params)) //Does the target do anything special when we right-click on it?
+			. = melee_attack_chain(user, target, params) //Ugh. Lame! I'm filing a legal complaint about the discrimination against the right mouse button!
+		else
+			. = altafterattack(target, user, TRUE, params)
+
+/obj/item/proc/alt_pre_attack(atom/A, mob/living/user, params)
+	return FALSE //return something other than false if you wanna override attacking completely
+
+/atom/proc/altattackby(obj/item/W, mob/user, params)
+	return FALSE //return something other than false if you wanna add special right-click behavior to objects.
+
+/obj/item/proc/rightclick_attack_self(mob/user)
+	return FALSE
+
+/obj/item/proc/altafterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	SEND_SIGNAL(src, COMSIG_ITEM_ALT_AFTERATTACK, target, user, proximity_flag, click_parameters)
+	return FALSE

code/_onclick/right_other_mobs.dm

@@ -0,0 +1,50 @@
+/mob/living/carbon/human/AltUnarmedAttack(atom/A, proximity)
+	if(!has_active_hand())
+		to_chat(src, "<span class='notice'>You look at the state of the universe and sigh.</span>") //lets face it, people rarely ever see this message in its intended condition.
+		return TRUE
+
+	return A.alt_attack_hand(src)
+
+/mob/living/carbon/human/AltRangedAttack(atom/A, params)
+	if(isturf(A) || incapacitated()) // pretty annoying to wave your fist at floors and walls. And useless.
+		return 
+	if(!CheckActionCooldown(CLICK_CD_RANGE))
+		return
+	DelayNextAction()
+	var/list/target_viewers = fov_viewers(11, A) //doesn't check for blindness.
+	if(!(src in target_viewers)) //click catcher issuing calls for out of view objects.
+		return TRUE
+	if(!has_active_hand())
+		to_chat(src, "<span class='notice'>You ponder your life choices and sigh.</span>")
+		return TRUE
+	var/list/src_viewers = viewers(DEFAULT_MESSAGE_RANGE, src) - src // src has a different message.
+	var/the_action = "waves to [A]"
+	var/what_action = "waves to something you can't see"
+	var/self_action = "wave to [A]"
+
+	switch(a_intent)
+		if(INTENT_DISARM)
+			the_action = "shoos away [A]"
+			what_action = "shoo away something out of your vision"
+			self_action = "shoo away [A]"
+		if(INTENT_GRAB)
+			the_action = "beckons [A] to come"
+			what_action = "beckons something out of your vision to come"
+			self_action = "beckon [A] to come"
+		if(INTENT_HARM)
+			var/pronoun = "[p_their()]"
+			the_action = "shakes [pronoun] fist at [A]"
+			what_action = "shakes [pronoun] fist at something out of your vision"
+			self_action = "shake your fist at [A]"
+
+	if(!eye_blind)
+		to_chat(src, "You [self_action].")
+	for(var/B in src_viewers)
+		var/mob/M = B
+		if(!M.eye_blind)
+			var/message = (M in target_viewers) ? the_action : what_action
+			to_chat(M, "[src] [message].")
+	return TRUE
+
+/atom/proc/alt_attack_hand(mob/user)
+	return FALSE

code/_onclick/telekinesis.dm

@@ -123,7 +123,8 @@
 	. = ..()
 	if(!target || !user)
 		return
-
+	if(!user.CheckActionCooldown())
+		return
 	if(!focus)
 		focus_object(target)
 		return
@@ -145,7 +146,7 @@
 	else
 		apply_focus_overlay()
 		focus.throw_at(target, 10, 1,user)
-	user.changeNext_move(CLICK_CD_MELEE)
+	user.DelayNextAction(immediate = FALSE)
 	update_icon()
 
 /proc/tkMaxRangeCheck(mob/user, atom/target)