diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index 45bb772376f..b5ea2a37a41 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -71,7 +71,7 @@
 			fail_smash(user, 2)
 			return 1
 
-	if(ishuman(user))
+	if(ishuman(user) && user.a_intent == I_GRAB)
 		var/mob/living/carbon/human/H = user
 		var/turf/destination = GetAbove(H)
 
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index 24939fcf64f..730539f48fd 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -20,7 +20,8 @@
 	sprite_sheets_obj = list(
 		"Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
 		"Tajara" = 'icons/obj/clothing/species/tajaran/hats.dmi',
-		"Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi'
+		"Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi',
+		"Vaurca" = 'icons/obj/clothing/species/vaurca/hats.dmi'
 		)
 
 	light_overlay = "helmet_light"
@@ -47,7 +48,8 @@
 	sprite_sheets_obj = list(
 		"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
 		"Tajara" = 'icons/obj/clothing/species/tajaran/suits.dmi',
-		"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi'
+		"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi',
+		"Vaurca" = 'icons/obj/clothing/species/vaurca/suits.dmi'
 		)
 
 	//Breach thresholds, should ideally be inherited by most (if not all) voidsuits.
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 672321a21b3..8319d5d40b8 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -342,9 +342,6 @@ var/list/mineral_can_smooth_with = list(
 		new /obj/structure/sculpting_block(src)
 		GetDrilled(1)
 
-	else
-		return attack_hand(user)
-
 /turf/simulated/mineral/proc/clear_ore_effects()
 	if (my_mineral)
 		qdel(my_mineral)
@@ -517,7 +514,7 @@ var/list/mineral_can_smooth_with = list(
 	add_fingerprint(user)
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 
-	if(ishuman(user))
+	if(ishuman(user) && user.a_intent == I_GRAB)
 		var/mob/living/carbon/human/H = user
 		var/turf/destination = GetAbove(H)
 
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index 2906bd6f29e..a439cd5ed1c 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -580,7 +580,7 @@
 		to_chat(src, "<span class='danger'>You cannot charge in your current state!</span>")
 		return
 
-	last_special = world.time + 200
+	last_special = world.time + 100
 
 	src.visible_message("<span class='warning'>\The [src] takes a step backwards and rears up.</span>",
 			"<span class='notice'>You take a step backwards and then...</span>")
@@ -673,7 +673,7 @@
 		to_chat(src, "<span class='danger'>You cannot screech in your current state!</span>")
 		return
 
-	last_special = world.time + 200
+	last_special = world.time + 100
 
 	visible_message("<span class='danger'>[src.name] lets out an ear piercing shriek!</span>",
 			"<span class='danger'>You let out an ear-shattering shriek!</span>",
@@ -720,7 +720,7 @@
 		to_chat(src,"<span class='notice'>You cannot spray napalm in your current state.</span>")
 		return
 
-	last_special = world.time + 200
+	last_special = world.time + 100
 	playsound(loc, 'sound/species/shadow/grue_screech.ogg', 100, 1)
 	visible_message("<span class='danger'>\The [src] unleashes a torrent of raging flame!</span>",
 			"<span class='danger'>You unleash a gust of fire!</span>",
diff --git a/code/modules/multiz/turfs/open_space.dm b/code/modules/multiz/turfs/open_space.dm
index c9c18ff20bd..b1750e990d2 100644
--- a/code/modules/multiz/turfs/open_space.dm
+++ b/code/modules/multiz/turfs/open_space.dm
@@ -208,7 +208,7 @@
 
 /turf/simulated/open/attack_hand(var/mob/user)
 
-	if(ishuman(user))
+	if(ishuman(user) && user.a_intent == I_GRAB)
 		var/mob/living/carbon/human/H = user
 		var/turf/climbing_wall = GetBelow(H)
 		var/climb_bonus = 0
diff --git a/html/changelogs/alberyk-climbing.yml b/html/changelogs/alberyk-climbing.yml
new file mode 100644
index 00000000000..76f2fbd7d6c
--- /dev/null
+++ b/html/changelogs/alberyk-climbing.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+ - tweak: "You now need to be in the grab intent to climb up walls and climb down open spaces."
diff --git a/icons/obj/clothing/species/vaurca/hats.dmi b/icons/obj/clothing/species/vaurca/hats.dmi
new file mode 100644
index 00000000000..532097457f6
Binary files /dev/null and b/icons/obj/clothing/species/vaurca/hats.dmi differ
diff --git a/icons/obj/clothing/species/vaurca/suits.dmi b/icons/obj/clothing/species/vaurca/suits.dmi
new file mode 100644
index 00000000000..9fc823579e2
Binary files /dev/null and b/icons/obj/clothing/species/vaurca/suits.dmi differ
diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi
index 3aace212773..abb53796730 100644
Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ