Merge branch 'master' into merge-upstream

ss220club · Nov 5, 2024 · 9de5759 · 9de5759
2 parents a148404 + 5ac9a04
commit 9de5759
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
@@ -352,7 +352,7 @@
 		if("make_cc_announcement")
 			if(!ADMIN_CHECK(ui.user))
 				return
-			if(!text2bool(params["classified"]))
+			if(params["classified"] != 1) // this uses 1/0 on the js side instead of "true" or "false"
 				GLOB.major_announcement.Announce(
 					params["text"],
 					new_title = "Central Command Report",

diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi