From 6307e0df2f80fd65669f39cc435417d591026fdd Mon Sep 17 00:00:00 2001 From: Benedict <91219575+Ben10083@users.noreply.github.com> Date: Wed, 25 May 2022 15:55:27 -0400 Subject: [PATCH] Spiderbot Emotes (#14063) --- code/modules/emotes/definitions/_mob.dm | 13 +++++++++++++ .../mob/living/simple_animal/friendly/spiderbot.dm | 3 +++ html/changelogs/Ben10083 - Spiderbot.yml | 14 ++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 html/changelogs/Ben10083 - Spiderbot.yml diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm index 9a524db5ef6..042eee03c5f 100644 --- a/code/modules/emotes/definitions/_mob.dm +++ b/code/modules/emotes/definitions/_mob.dm @@ -180,6 +180,19 @@ /decl/emote/audible/synth/deny, ) +/mob/living/simple_animal/spiderbot + default_emotes = list( + /decl/emote/visible/twitch, + /decl/emote/visible/twitch_v, + /decl/emote/visible/look, + /decl/emote/visible/stare, + /decl/emote/audible/synth, + /decl/emote/audible/synth/ping, + /decl/emote/audible/synth/buzz, + /decl/emote/audible/synth/confirm, + /decl/emote/audible/synth/deny, + ) + /mob/living/carbon/slime default_emotes = list( /decl/emote/audible/moan, diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 6e4e677c8fb..e4338860f73 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -63,6 +63,9 @@ /mob/living/simple_animal/spiderbot/can_name(var/mob/living/M) return FALSE +/mob/living/simple_animal/spiderbot/isSynthetic() + return TRUE + /mob/living/simple_animal/spiderbot/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/device/mmi)) diff --git a/html/changelogs/Ben10083 - Spiderbot.yml b/html/changelogs/Ben10083 - Spiderbot.yml new file mode 100644 index 00000000000..88ea597ad33 --- /dev/null +++ b/html/changelogs/Ben10083 - Spiderbot.yml @@ -0,0 +1,14 @@ +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - soundadd: "Spiderbots now have emotes." + - refactor: "Spiderbots now are defined as synthetic in code."