From e72967152bee23e63d67e7d7a2251e488b74703e Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue, 18 Feb 2025 05:37:48 -0500 Subject: [PATCH] le fish au chocolate (#28418) --- code/modules/mob/living/simple_animal/hostile/carp.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 1410e76f501..cd43a1db281 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -36,6 +36,7 @@ faction = list("carp", "mining") pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN + density = FALSE initial_traits = list(TRAIT_FLYING, TRAIT_SHOCKIMMUNE) @@ -121,6 +122,16 @@ else add_dead_carp_overlay() +// We do not want mobs moving through space carp, we as such we block it if the mob is not dense +/mob/living/simple_animal/hostile/carp/CanPass(atom/movable/mover, border_dir) + if(isliving(mover) && !istype(mover, /mob/living/simple_animal/hostile/carp) && mover.density == TRUE) + return FALSE + return ..() + +// Since it's not dense we let it always hit +/mob/living/simple_animal/hostile/carp/projectile_hit_check(obj/item/projectile/P) + return FALSE + /mob/living/simple_animal/hostile/carp/holocarp icon_state = "holocarp" icon_living = "holocarp"