From 52c47a071f521dfde2864ae4e696f9e19b593328 Mon Sep 17 00:00:00 2001
From: mochi <1496804+dearmochi@users.noreply.github.com>
Date: Sat, 13 Nov 2021 09:35:47 +0100
Subject: [PATCH 1/3] Removes some inherited verbs from AIs

---
 code/modules/mob/living/silicon/ai/ai.dm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 943f894b151..55a82df214b 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -172,6 +172,14 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
 
 	if(isturf(loc))
 		add_ai_verbs(src)
+	
+	// Remove inherited verbs that effectively do nothing for AIs, or lead to unintended behaviour.
+	verbs -= /mob/living/verb/lay_down
+	verbs -= /mob/living/verb/mob_sleep
+	verbs -= /mob/living/verb/resist
+	verbs -= /mob/living/verb/stop_pulling1
+	verbs -= /mob/living/silicon/verb/pose
+	verbs -= /mob/living/silicon/verb/set_flavor
 
 	//Languages
 	add_language("Robot Talk", 1)

From fd86eba8f6c2840e0bf6cdd7c39b80137d8e1de7 Mon Sep 17 00:00:00 2001
From: mochi <1496804+dearmochi@users.noreply.github.com>
Date: Sat, 13 Nov 2021 10:40:42 +0100
Subject: [PATCH 2/3] Removes some from borgs too

---
 code/modules/mob/living/silicon/robot/robot.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 37c8f73463b..be2e7b2dd65 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -165,6 +165,11 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	..()
 
 	add_robot_verbs()
+	
+	// Remove inherited verbs that effectively do nothing for cyborgs, or lead to unintended behaviour.
+	verbs -= /mob/living/verb/lay_down
+	verbs -= /mob/living/verb/mob_sleep
+	verbs -= /mob/living/verb/resist
 
 	if(cell)
 		var/datum/robot_component/cell_component = components["power cell"]

From bea948a7d8382c9d59874c96c6189c8938e028a9 Mon Sep 17 00:00:00 2001
From: mochi <1496804+dearmochi@users.noreply.github.com>
Date: Sat, 13 Nov 2021 16:29:47 +0100
Subject: [PATCH 3/3] Okay, not that

---
 code/modules/mob/living/silicon/robot/robot.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index be2e7b2dd65..8c442376e35 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -169,7 +169,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	// Remove inherited verbs that effectively do nothing for cyborgs, or lead to unintended behaviour.
 	verbs -= /mob/living/verb/lay_down
 	verbs -= /mob/living/verb/mob_sleep
-	verbs -= /mob/living/verb/resist
 
 	if(cell)
 		var/datum/robot_component/cell_component = components["power cell"]