Throwing items at someone no longer turns off sleeping carp deflection (#20065)

* Throwing items at someone no longer turns off sleeping carp deflection

* signals

* comment
This commit is contained in:
Qwertytoforty
2023-01-13 16:49:14 +01:00
committed by GitHub
parent 9e7d8b23ea
commit 7761c32a1b
4 changed files with 6 additions and 0 deletions
@@ -32,10 +32,12 @@
if(HAS_TRAIT(H, TRAIT_PACIFISM))
to_chat(H, "<span class='warning'>You feel the knowledge of the scroll in your mind, yet reject its more violent teachings. \
You will instead deflect projectiles into the ground.")
H.RegisterSignal(H, COMSIG_CARBON_THROWN_ITEM_CAUGHT, TYPE_PROC_REF(/mob/living/carbon, throw_mode_on))
/datum/martial_art/the_sleeping_carp/remove(mob/living/carbon/human/H)
. = ..()
H.faction -= "carp"// :C
H.UnregisterSignal(H, COMSIG_CARBON_THROWN_ITEM_CAUGHT)
/datum/martial_art/the_sleeping_carp/explaination_footer(user)
to_chat(user, "<b><i>In addition, by having your throw mode on when being shot at, you enter an active defensive mode where you will block and deflect all projectiles fired at you!</i></b>")
+1
View File
@@ -637,6 +637,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
throw_icon.icon_state = "act_throw_off"
/mob/living/carbon/proc/throw_mode_on()
SIGNAL_HANDLER //This signal is here so we can turn throw mode back on via carp when an object is caught
in_throw_mode = TRUE
if(throw_icon)
throw_icon.icon_state = "act_throw_on"
@@ -11,6 +11,7 @@
put_in_active_hand(AM)
visible_message("<span class='warning'>[src] catches [AM]!</span>")
throw_mode_off()
SEND_SIGNAL(src, COMSIG_CARBON_THROWN_ITEM_CAUGHT, AM)
return TRUE
return ..()