shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11527 from Ghommie/Ghommie-cit628

Browse Source 
More bug reports yee'd their last haw.
This commit is contained in:
kevinz000
2020-03-19 18:56:32 -07:00
committed by GitHub
parent 1d64a4d66f b03955b085
commit 8b0600a7fa
14 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/blood_contract/blood_contract.dm
+1 -1
View File
@@ -27,7 +27,7 @@
INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H) //could use moving out from the mine
for(var/mob/living/carbon/human/P in GLOB.player_list)
if(P == H)
if(P == H || HAS_TRAIT(P, TRAIT_NO_MIDROUND_ANTAG))
continue
to_chat(P, "<span class='userdanger'>You have an overwhelming desire to kill [H]. [H.p_theyve(TRUE)] been marked red! Whoever [H.p_they()] [H.p_were()], friend or foe, go kill [H.p_them()]!</span>")
P.put_in_hands(new /obj/item/kitchen/knife/butcher(P), TRUE)