From f232ca2fa5ee92d982cc3fdcccf89dfe0a1b68a8 Mon Sep 17 00:00:00 2001 From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com> Date: Sat, 16 Apr 2022 19:40:44 -0400 Subject: [PATCH] Ghosts can no longer rename monkeys (#13543) * Ghosts can no longer rename monkeys * Forgot to make it carbon like the last fix --- code/modules/mob/living/carbon/human/human_powers.dm | 9 +++++++-- html/changelogs/doxxmedearly-spookymonkeyrenames.yml | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/doxxmedearly-spookymonkeyrenames.yml diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 90e1c6691bf..a16e563b5ab 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -1232,8 +1232,13 @@ mob/living/carbon/human/proc/change_monitor() set category = "IC" set src in view(1) - var/mob/living/M = usr - if(!M || usr == src) + var/mob/living/carbon/M = usr + if(!istype(M)) + to_chat(usr, SPAN_WARNING("You aren't allowed to rename \the [src].")) + return + + if(usr == src) + to_chat(usr, SPAN_WARNING("You're a simple creature, you can't rename yourself!")) return if(can_name(M)) diff --git a/html/changelogs/doxxmedearly-spookymonkeyrenames.yml b/html/changelogs/doxxmedearly-spookymonkeyrenames.yml new file mode 100644 index 00000000000..76bab241567 --- /dev/null +++ b/html/changelogs/doxxmedearly-spookymonkeyrenames.yml @@ -0,0 +1,6 @@ +author: Doxxmedearly + +delete-after: True + +changes: + - bugfix: "Ghosts can no longer rename monkeys or their equivalents."