Merge branch 'master' into development

# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -624,7 +624,7 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
 	bodytype = "Vaurca"
 	age_min = 1
 	age_max = 20
-	economic_modifier = 1
+	economic_modifier = 2
 	language = LANGUAGE_VAURCA
 	primitive_form = "V'krexi"
 	greater_form = "Vaurca Warrior"

code/modules/mob/living/living.dm

@@ -677,7 +677,15 @@ default behaviour is:
 	if(buckled)
 		buckled.user_unbuckle_mob(src)
 
+/mob/living/var/last_resist
+
 /mob/living/proc/resist_grab()
+	if (last_resist + 4 > world.time)
+		return
+	last_resist = world.time
+	if (stat || paralysis || stunned)
+		src << "<span class='notice'>You can't move...</span>"
+		return
 	var/resisting = 0
 	for(var/obj/O in requests)
 		requests.Remove(O)