From a6818accea0b75100792d2ae2fa2ffaf269ec1e7 Mon Sep 17 00:00:00 2001 From: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Date: Tue, 28 Apr 2026 19:39:09 -0400 Subject: [PATCH] Adds Four New Nian Emotes (#31860) * Adds the ability for nians to twitch their antennae. * initial commit * removes the underscore needed * linter fix * oops --- code/datums/keybindings/emote_keybinds.dm | 16 ++++++++++++ .../mob/living/carbon/human/human_emote.dm | 25 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm index 01499a9ca0f..aaec2da996c 100644 --- a/code/datums/keybindings/emote_keybinds.dm +++ b/code/datums/keybindings/emote_keybinds.dm @@ -489,6 +489,22 @@ linked_emote = /datum/emote/living/carbon/human/flutter name = "Flutter" +/datum/keybinding/emote/carbon/human/droop + linked_emote = /datum/emote/living/carbon/human/droop + name = "Droop" + +/datum/keybinding/emote/carbon/human/wing_preen + linked_emote = /datum/emote/living/carbon/human/wing_preen + name = "Preen Wings" + +/datum/keybinding/emote/carbon/human/antennae_preen + linked_emote = /datum/emote/living/carbon/human/antenna_preen + name = "Preen Antennae" + +/datum/keybinding/emote/carbon/human/antenna_angle + linked_emote = /datum/emote/living/carbon/human/antenna_angle + name = "Angle Antennae" + /datum/keybinding/emote/carbon/human/chitter linked_emote = /datum/emote/living/carbon/human/chitter name = "Chitter" diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index 86c3848994e..3d06d3455e3 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -725,6 +725,31 @@ species_type_whitelist_typecache = list(/datum/species/skulk) muzzled_noises = list("frustrated") +/datum/emote/living/carbon/human/droop + key = "droop" + key_third_person = "droop" + message = "droops their antennae." + species_type_whitelist_typecache = list(/datum/species/moth) + +/datum/emote/living/carbon/human/wing_preen + key = "wpreen" + key_third_person = "wpreen" + message = "preens their wings." + species_type_whitelist_typecache = list(/datum/species/moth) + +/datum/emote/living/carbon/human/antenna_preen + key = "apreen" + key_third_person = "apreen" + message = "preens their antennae." + species_type_whitelist_typecache = list(/datum/species/moth) + +/datum/emote/living/carbon/human/antenna_angle + key = "aangle" + key_third_person = "aangle" + message = "angles their antennae." + message_param = "angles their antennae towards %t." + species_type_whitelist_typecache = list(/datum/species/moth) + /datum/emote/living/carbon/human/quill key = "quill" key_third_person = "quills"