Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11

code/datums/diseases/heart_failure.dm

@@ -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

code/datums/mood_events/generic_positive_events.dm

@@ -33,6 +33,11 @@
 	mood_change = 2
 	timeout = 2400
 
+/datum/mood_event/bshonk
+	description = "<span class='nicegreen'>Quantum mechanics can be fun and silly, too! Honk!</span>\n"
+	mood_change = 6
+	timeout = 4800
+
 /datum/mood_event/perform_cpr
 	description = "<span class='nicegreen'>It feels good to save a life.</span>\n"
 	mood_change = 6