Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622

[MIRROR] Changes cockroach guts to insect guts

code/game/objects/effects/decals/cleanable/misc.dm

@@ -224,3 +224,11 @@
 	icon_state = "flour"
 	color = "#C8A5DC"
 	beauty = -200
+
+/obj/effect/decal/cleanable/insectguts
+	name = "insect guts"
+	desc = "One bug squashed. Four more will rise in its place."
+	icon = 'icons/effects/blood.dmi'
+	icon_state = "xfloor1"
+	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
+	beauty = -300

code/game/objects/items/weaponry.dm

@@ -577,7 +577,7 @@
 /obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
 	if(proximity_flag)
 		if(is_type_in_typecache(target, strong_against))
-			new /obj/effect/decal/cleanable/deadcockroach(get_turf(target))
+			new /obj/effect/decal/cleanable/insectguts(target.drop_location())
 			to_chat(user, "<span class='warning'>You easily splat the [target].</span>")
 			if(istype(target, /mob/living/))
 				var/mob/living/bug = target

code/modules/mob/living/simple_animal/bot/cleanbot.dm

@@ -181,7 +181,7 @@
 		/obj/effect/decal/cleanable/ash,
 		/obj/effect/decal/cleanable/greenglow,
 		/obj/effect/decal/cleanable/dirt,
-		/obj/effect/decal/cleanable/deadcockroach,
+		/obj/effect/decal/cleanable/insectguts,
 		/obj/effect/decal/remains
 		)
 

code/modules/mob/living/simple_animal/friendly/cockroach.dm

@@ -6,7 +6,7 @@
 	health = 1
 	maxHealth = 1
 	turns_per_move = 5
-	loot = list(/obj/effect/decal/cleanable/deadcockroach)
+	loot = list(/obj/effect/decal/cleanable/insectguts)
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 270
 	maxbodytemp = INFINITY
@@ -52,11 +52,3 @@
 
 /mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach.
 	return
-
-/obj/effect/decal/cleanable/deadcockroach
-	name = "cockroach guts"
-	desc = "One bug squashed. Four more will rise in its place."
-	icon = 'icons/effects/blood.dmi'
-	icon_state = "xfloor1"
-	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
-	beauty = -300