diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 2690a58816..4c25dbb740 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -4045,7 +4045,7 @@ /area/ruin/space/has_grav/ancientstation) "kE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) "kF" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 1890626a71..9c869596c9 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -10313,7 +10313,7 @@ /area/quartermaster/warehouse) "aBM" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index a1fd4f8886..0cff240758 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -11737,7 +11737,7 @@ dir = 8; pixel_x = 23 }, -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) "aEi" = ( @@ -13428,7 +13428,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) "aIo" = ( @@ -20061,7 +20061,7 @@ /obj/item/shard{ icon_state = "small" }, -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /obj/item/light/bulb, /turf/open/floor/plating, /area/maintenance/department/cargo) @@ -33065,7 +33065,7 @@ /area/maintenance/department/engine) "bDj" = ( /obj/item/trash/candy, -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable{ icon_state = "1-2" @@ -34329,7 +34329,7 @@ /turf/open/floor/plasteel/freezer, /area/medical/virology) "bFL" = ( -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /turf/open/floor/plasteel/freezer, /area/medical/virology) "bFM" = ( @@ -38227,7 +38227,7 @@ /area/maintenance/department/engine) "bPq" = ( /obj/item/trash/chips, -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /turf/open/floor/plasteel/dark, /area/maintenance/department/engine) "bPr" = ( @@ -43055,7 +43055,7 @@ "cba" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, -/obj/effect/decal/cleanable/deadcockroach, +/obj/effect/decal/cleanable/insectguts, /turf/open/floor/plating, /area/maintenance/department/engine) "cbb" = ( diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 4591d5d567..a8a76ad2a9 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/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 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 9fdae18149..f3be1828ea 100644 --- a/code/game/objects/items/weaponry.dm +++ b/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, "You easily splat the [target].") if(istype(target, /mob/living/)) var/mob/living/bug = target diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 13680f55a8..b70547b917 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/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 ) diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm index 3887e4b6d9..c85890df88 100644 --- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm +++ b/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