Merge pull request #11080 from kevinz000/surubatons

hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
This commit is contained in:
Ghom
2020-02-20 11:09:46 +01:00
committed by GitHub
9 changed files with 60 additions and 53 deletions

View File

@@ -53,7 +53,7 @@
SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
return
/obj/item/reagent_containers/rag/pre_altattackby(mob/living/M, mob/living/user, params)
/obj/item/reagent_containers/rag/alt_pre_attack(mob/living/M, mob/living/user, params)
if(istype(M) && user.a_intent == INTENT_HELP)
user.changeNext_move(CLICK_CD_MELEE)
if(M.on_fire)