From 53b3c6099b5fdc5f5ab439e9d675b876597a22d7 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 23 Jul 2020 16:27:41 -0700
Subject: [PATCH] ok
---
code/_onclick/other_mobs.dm | 4 ++--
code/modules/antagonists/cult/cult_structures.dm | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 45700f4474..9578b909cb 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -118,7 +118,7 @@
Animals & All Unspecified
*/
/mob/living/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
- A.attack_animal(src, intent, flags)
+ return !isnull(A.attack_animal(src, intent, flags))
/atom/proc/attack_animal(mob/user)
SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ANIMAL, user)
@@ -130,7 +130,7 @@
Monkeys
*/
/mob/living/carbon/monkey/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
- A.attack_paw(src, intent, flags)
+ return A.attack_paw(src, intent, flags)
/atom/proc/attack_paw(mob/user)
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user) & COMPONENT_NO_ATTACK_HAND)
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index 5c6a0b3416..5803941f36 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -49,10 +49,11 @@
Beam(M, icon_state="sendbeam", time=4)
M.visible_message("[M] repairs \the [src].", \
"You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.")
+ return TRUE
else
to_chat(M, "You cannot repair [src], as [p_theyre()] undamaged!")
else
- ..()
+ return ..()
/obj/structure/destructible/cult/attackby(obj/I, mob/user, params)
if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user))