From abc02122788509c99edac6213ce01c5dc2d3f345 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Tue, 16 Feb 2021 11:59:55 +0100
Subject: [PATCH] Fixes wizards being able to cast most spells while under
 incapacitation. (#11194)

---
 .../modules/spell_system/spells/spell_code.dm |  4 +-
 html/changelogs/mattatlas-hatebugs.yml        | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/mattatlas-hatebugs.yml

diff --git a/code/modules/spell_system/spells/spell_code.dm b/code/modules/spell_system/spells/spell_code.dm
index d1c6ae74685..f05078b7b06 100644
--- a/code/modules/spell_system/spells/spell_code.dm
+++ b/code/modules/spell_system/spells/spell_code.dm
@@ -222,8 +222,8 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
 		return 0
 
 	if(!(spell_flags & GHOSTCAST) && holder == user)
-		if(user.stat && !(spell_flags & STATALLOWED))
-			to_chat(usr, "Not when you're incapacitated.")
+		if(user.incapacitated(INCAPACITATION_KNOCKOUT) && !(spell_flags & STATALLOWED))
+			to_chat(usr, SPAN_WARNING("Not when you're incapacitated."))
 			return 0
 
 		if(ishuman(user) && !(invocation_type in list(SpI_EMOTE, SpI_NONE)))
diff --git a/html/changelogs/mattatlas-hatebugs.yml b/html/changelogs/mattatlas-hatebugs.yml
new file mode 100644
index 00000000000..dc7a5460766
--- /dev/null
+++ b/html/changelogs/mattatlas-hatebugs.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Wizards can no longer cast most spells while under various forms of incapacitation."