From f0a2488200aea839c78ba7b7b0bdcd563b138313 Mon Sep 17 00:00:00 2001
From: fernerr <35879136+fernerr@users.noreply.github.com>
Date: Tue, 8 Sep 2020 07:55:14 +0200
Subject: [PATCH] Fixes carp and other hostile mobs exploding into robot bits
 (#9921)

---
 .../mob/living/simple_animal/hostile/commanded/ives.dm        | 2 +-
 html/changelogs/Ferner-200908-bugfix_robotcarp.yml            | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Ferner-200908-bugfix_robotcarp.yml

diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/ives.dm b/code/modules/mob/living/simple_animal/hostile/commanded/ives.dm
index 8697e503d3a..59e1942ea9a 100644
--- a/code/modules/mob/living/simple_animal/hostile/commanded/ives.dm
+++ b/code/modules/mob/living/simple_animal/hostile/commanded/ives.dm
@@ -46,7 +46,7 @@
 /mob/living/simple_animal/hostile/commanded/baby_harvester/get_bullet_impact_effect_type(var/def_zone)
 	return BULLET_IMPACT_METAL
 
-/mob/living/simple_animal/hostile/death()
+/mob/living/simple_animal/hostile/commanded/baby_harvester/death()
 	..(null, "blows apart!")
 	var/T = get_turf(src)
 	new /obj/effect/gibspawner/robot(T)
diff --git a/html/changelogs/Ferner-200908-bugfix_robotcarp.yml b/html/changelogs/Ferner-200908-bugfix_robotcarp.yml
new file mode 100644
index 00000000000..c2c09dd4fdd
--- /dev/null
+++ b/html/changelogs/Ferner-200908-bugfix_robotcarp.yml
@@ -0,0 +1,4 @@
+author: Ferner
+delete-after: True
+changes: 
+  - bugfix: "Made sure carp and cavern dwellers no longer are robots in disguise."
\ No newline at end of file