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) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 37c8f73463b..8c442376e35 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -165,6 +165,10 @@ 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 if(cell) var/datum/robot_component/cell_component = components["power cell"]