From 3b12c4cebec80c4cc2db80c756fe554aaafb7b52 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 16 Oct 2022 06:35:04 -0700
Subject: [PATCH] fixes a bunch of bugs (#4550)

* ok

* why were those just there

* Fix

* Update life.dm

Co-authored-by: VM_USER <VM_USER>
---
 code/_onclick/hud/_screen_object.dm        | 2 +-
 code/datums/components/riding/mob/human.dm | 5 +++++
 code/datums/components/riding/mob/robot.dm | 5 +++++
 code/game/objects/structures.dm            | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/hud/_screen_object.dm b/code/_onclick/hud/_screen_object.dm
index bb0fd23fd84..e984db63ebb 100644
--- a/code/_onclick/hud/_screen_object.dm
+++ b/code/_onclick/hud/_screen_object.dm
@@ -318,7 +318,7 @@
 							to_chat(C, "<span class='warning'>You don't have an internals tank.</span>")
 							return
 		if("act_intent")
-			usr.a_intent_change("right")
+			usr.a_intent_change(INTENT_HOTKEY_RIGHT)
 		if(INTENT_HELP)
 			usr.a_intent = INTENT_HELP
 			usr.hud_used.action_intent.icon_state = "intent_help"
diff --git a/code/datums/components/riding/mob/human.dm b/code/datums/components/riding/mob/human.dm
index 8ad2752b9b7..1be0651bd92 100644
--- a/code/datums/components/riding/mob/human.dm
+++ b/code/datums/components/riding/mob/human.dm
@@ -8,6 +8,11 @@
 	/// offhands required on the rider for piggybacking
 	var/rider_offhands_needed_piggyback = 1
 
+/datum/component/riding_filter/mob/human/check_mount_attempt(mob/M, buckle_flags, mob/user, semantic)
+	if(!ishuman(M))
+		return FALSE		// nah
+	return ..()
+
 /datum/component/riding_filter/mob/human/rider_offhands_needed(mob/rider, semantic)
 	return semantic == BUCKLE_SEMANTIC_HUMAN_FIREMAN? 0 : rider_offhands_needed_piggyback
 
diff --git a/code/datums/components/riding/mob/robot.dm b/code/datums/components/riding/mob/robot.dm
index 9e9b4b98721..ac153e51beb 100644
--- a/code/datums/components/riding/mob/robot.dm
+++ b/code/datums/components/riding/mob/robot.dm
@@ -4,6 +4,11 @@
 	offhands_needed_rider = 1
 	offhand_requirements_are_rigid = FALSE
 
+/datum/component/riding_filter/mob/robot/check_mount_attempt(mob/M, buckle_flags, mob/user, semantic)
+	if(!ishuman(M))
+		return FALSE		// nah
+	return ..()
+
 /datum/component/riding_handler/mob/robot
 	expected_typepath = /mob/living/silicon/robot
 	riding_handler_flags = CF_RIDING_HANDLER_EPHEMERAL
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 8b0d5add1b7..31a631a0256 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -99,7 +99,7 @@
 	usr.visible_message("<span class='warning'>[user] starts climbing onto \the [src]!</span>")
 	climbers |= user
 
-	if(!do_after(user,(issmall(user) ? climb_delay * 0.6 : climb_delay)))
+	if(!do_after(user, issmall(user) ? climb_delay * 0.6 : climb_delay, src, incapacitation_flags = INCAPACITATION_ALL))
 		climbers -= user
 		return