From a6eae00439079df313ca783663a6f2a824bf76cf Mon Sep 17 00:00:00 2001
From: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Date: Sun, 19 Oct 2025 20:07:52 +0100
Subject: [PATCH] Allows Robots and Simple Bots to Salute (#30614)

* Update silicon_emote.dm

* Update emote_keybinds.dm
---
 code/datums/keybindings/emote_keybinds.dm        |  4 ++++
 code/modules/mob/living/silicon/silicon_emote.dm | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm
index 97da98e7915..dca3626a79f 100644
--- a/code/datums/keybindings/emote_keybinds.dm
+++ b/code/datums/keybindings/emote_keybinds.dm
@@ -622,6 +622,10 @@
 	linked_emote = /datum/emote/living/silicon/halt
 	name = "Halt"
 
+/datum/keybinding/emote/silicon/salute
+	linked_emote = /datum/emote/living/silicon/salute
+	name = "Salute"
+
 /datum/keybinding/emote/simple_animal
 	category = KB_CATEGORY_EMOTE_ANIMAL
 
diff --git a/code/modules/mob/living/silicon/silicon_emote.dm b/code/modules/mob/living/silicon/silicon_emote.dm
index 9b0f211dd01..f55a6290987 100644
--- a/code/modules/mob/living/silicon/silicon_emote.dm
+++ b/code/modules/mob/living/silicon/silicon_emote.dm
@@ -103,3 +103,16 @@
 	var/mob/living/silicon/robot/bot = user
 	if(!istype(bot) || !istype(bot.module, /obj/item/robot_module/security))
 		return FALSE
+
+/datum/emote/living/silicon/salute
+	key = "salute"
+	key_third_person = "salutes"
+	message = "salutes."
+	message_param = "salutes to %t."
+	emote_type = EMOTE_AUDIBLE
+	sound = "sound/effects/tong_pickup.ogg" // Either the tink of a foot stepping down or an arm hitting their head when they salute.
+
+/datum/emote/living/silicon/salute/can_run_emote(mob/user, status_check, intentional)
+	. = ..()
+	if(is_ai(user)) // AI has no moving parts to salute with, sadly.
+		return FALSE