Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6960

code/modules/mob/living/carbon/human/emote_vr.dm

@@ -47,6 +47,10 @@
 			message = "lets out a merp."
 			m_type = 2
 			playsound(loc, 'sound/voice/merp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
+		if("myarp")
+			message = "lets out a myarp."
+			m_type = 2
+			playsound(loc, 'sound/voice/myarp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
 		if("bark")
 			message = "lets out a bark."
 			m_type = 2
@@ -77,7 +81,7 @@
 				message = "does a flip!"
 				m_type = 1
 		if("vhelp") //Help for Virgo-specific emotes.
-			to_chat(src, "vwag, vflap, mlem, awoo, nya, peep, chirp, weh, merp, bark, hiss, squeak, nsay, nme, flip")
+			to_chat(src, "vwag, vflap, mlem, awoo, nya, peep, chirp, weh, merp, myarp, bark, hiss, squeak, nsay, nme, flip")
 			return TRUE
 
 	if(message)
@@ -90,10 +94,10 @@
 /mob/living/carbon/human/proc/handle_flip_vr()
 	var/original_density = density
 	var/original_passflags = pass_flags
-	
+
 	//Briefly un-dense to dodge projectiles
 	density = FALSE
-	
+
 	//Parkour!
 	var/parkour_chance = 20 //Default
 	if(species)

code/modules/mob/living/silicon/robot/robot.dm

@@ -944,10 +944,10 @@
 	set category = "IC"
 	set src = usr
 
-	if(world.time <= next_click) // Hard check, before anything else, to avoid crashing
+	if(!checkClickCooldown())
 		return
 
-	next_click = world.time + 1
+	setClickCooldown(1)
 
 	var/obj/item/W = get_active_hand()
 	if (W)

code/modules/mob/living/simple_mob/harvesting.dm

@@ -17,7 +17,7 @@
 
 /mob/living/simple_mob/examine(mob/user)
 	. = ..()
-	if(harvest_tool && (get_dist(user, src) <= 3))
+	if(user && harvest_tool && (get_dist(user, src) <= 3))
 		. += "<span class='notice'>\The [src] can be [harvest_verb] with a [initial(harvest_tool.name)] every [round(harvest_cooldown, 0.1)] minutes.</span>"
 		var/time_to_harvest = (harvest_recent + harvest_cooldown) - world.time
 		if(time_to_harvest > 0)
@@ -39,3 +39,4 @@
 			var/new_path = pickweight(harvest_results)
 			new new_path(get_turf(user))
 
+	return

code/modules/mob/mob_grab.dm

@@ -239,8 +239,6 @@
 		return
 	if(state == GRAB_UPGRADING)
 		return
-	if(!assailant.checkClickCooldown())
-		return
 	if(world.time < (last_action + UPGRADE_COOLDOWN))
 		return
 	if(!assailant.canmove || assailant.lying)