Sync with master (#3)

Alot of stuff, honk

code/modules/spells/spell_types/area_teleport.dm

@@ -83,6 +83,6 @@
 				else
 					playsound(user.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
 			if("whisper")
-				user.whisper("[invocation] [uppertext(chosenarea.name)]", forced = "spell")
+				user.whisper("[invocation] [uppertext(chosenarea.name)]")
 
 	return

code/modules/spells/spell_types/inflict_handler.dm

@@ -46,7 +46,7 @@
 		if(!amt_knockdown && amt_dam_stam)
 			target.adjustStaminaLoss(amt_dam_stam)
 		else
-			target.Knockdown(amt_knockdown, override_hardstun = amt_hardstun, amt_dam_stam)
+			target.Knockdown(amt_knockdown, override_hardstun = amt_hardstun, override_stamdmg = amt_dam_stam)
 		target.Unconscious(amt_unconscious)
 		target.Stun(amt_stun)