Merge branch 'master' into fuckatmos

2019-05-25 15:34:06 -04:00
parent 1a3e63dc8f 851072ff23
commit 4fc31f6322
517 changed files with 12177 additions and 1001079 deletions
@@ -57,8 +57,8 @@
 				if(H.stat == CONSCIOUS)
 					H.visible_message("<span class='userdanger'>[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!</span>")
 				H.adjustStaminaLoss(60)
-				H.reagents.add_reagent("corazone", 3) // To give the victim a final chance to shock their heart before losing consciousness
 				H.set_heartattack(TRUE)
+				H.reagents.add_reagent("corazone", 3) // To give the victim a final chance to shock their heart before losing consciousness
 				cure()

 	else