diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 7a4d4949fba..20160f5b25c 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -449,7 +449,7 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj) //TODO: refactor mob attackby(), attacked_by(), and friends. /mob/living/simple_animal/proc/attacked_with_item(obj/item/O, mob/user) - if(istype(O, /obj/item/trap/animal)) + if(istype(O, /obj/item/trap/animal) || istype(O, /obj/item/gun)) O.attack(src, user) return user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/html/changelogs/geeves-pointblank.yml b/html/changelogs/geeves-pointblank.yml new file mode 100644 index 00000000000..14f49e15cf8 --- /dev/null +++ b/html/changelogs/geeves-pointblank.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Simple mobs can now be pointblanked instead of whacking them." \ No newline at end of file