Merge pull request #17084 from dearmochi/remove-ai-living-verbs

Removes some inherited verbs from AIs and cyborgs
This commit is contained in:
variableundefined
2021-11-14 15:31:22 -06:00
committed by GitHub
2 changed files with 12 additions and 0 deletions
+8
View File
@@ -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)
@@ -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"]