From aa9cb56c1ee54f942e28c4e9883e3dfe8a1951b7 Mon Sep 17 00:00:00 2001 From: SueTheCake Date: Wed, 24 Jan 2024 07:33:24 -0600 Subject: [PATCH] Autopsy Now Shows Hostile Mob Attacks (#18270) * autopsy Signed-off-by: SueTheCake * Add files via upload changelog mcgee * the funny runtime moment * robot limbs work wtf * Update code/modules/mob/living/simple_animal/hostile/hostile.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Signed-off-by: SueTheCake --------- Signed-off-by: SueTheCake Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> --- .../living/simple_animal/hostile/hostile.dm | 3 +- html/changelogs/suethecake-patch-1.yml | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/suethecake-patch-1.yml diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index c1ee7ab80e6..a83ad4e463a 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -199,7 +199,8 @@ return 0 /mob/living/simple_animal/hostile/proc/on_attack_mob(var/mob/hit_mob, var/obj/item/organ/external/limb) - return + if(isliving(hit_mob) && istype(limb)) + limb.add_autopsy_data("Mauling by [src.name]") /mob/living/simple_animal/hostile/proc/AttackingTarget() setClickCooldown(attack_delay) diff --git a/html/changelogs/suethecake-patch-1.yml b/html/changelogs/suethecake-patch-1.yml new file mode 100644 index 00000000000..98d78bd965f --- /dev/null +++ b/html/changelogs/suethecake-patch-1.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: SueTheCake + +# 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: + - rscadd: "Simple animal attacks now show up on autopsies."