diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 58dd8f2952..9f5af20b67 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -1,76 +1,68 @@
-/mob/verb/pray(msg as text)
-	set category = "IC"
-	set name = "Pray"
-
-	if(GLOB.say_disabled)	//This is here to try to identify lag problems
-		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
-		return
-
-	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
-	if(!msg)
-		return
-	log_prayer("[src.key]/([src.name]): [msg]")
-	if(usr.client)
-		if(usr.client.prefs.muted & MUTE_PRAY)
-			to_chat(usr, "<span class='danger'>You cannot pray (muted).</span>")
-			return
-		if(src.client.handle_spam_prevention(msg,MUTE_PRAY))
-			return
-
-	var/mutable_appearance/cross = mutable_appearance('icons/obj/storage.dmi', "bible")
-	var/font_color = "purple"
-	var/prayer_type = "PRAYER"
-	var/deity
-	if(usr.job == "Chaplain")
-		cross.icon_state = "kingyellow"
-		font_color = "blue"
-		prayer_type = "CHAPLAIN PRAYER"
-		if(SSreligion.deity)
-			deity = SSreligion.deity
-	else if(iscultist(usr))
-		cross.icon_state = "tome"
-		font_color = "red"
-		prayer_type = "CULTIST PRAYER"
-		deity = "Nar-Sie"
-
+/mob/verb/pray(msg as text)
+	set category = "IC"
+	set name = "Pray"
+
+	if(GLOB.say_disabled)	//This is here to try to identify lag problems
+		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
+		return
+
+	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+	if(!msg)
+		return
+	log_prayer("[src.key]/([src.name]): [msg]")
+	if(usr.client)
+		if(usr.client.prefs.muted & MUTE_PRAY)
+			to_chat(usr, "<span class='danger'>You cannot pray (muted).</span>")
+			return
+		if(src.client.handle_spam_prevention(msg,MUTE_PRAY))
+			return
+
+	var/mutable_appearance/cross = mutable_appearance('icons/obj/storage.dmi', "bible")
+	var/font_color = "purple"
+	var/prayer_type = "PRAYER"
+	var/deity
+	if(usr.job == "Chaplain")
+		cross.icon_state = "kingyellow"
+		font_color = "blue"
+		prayer_type = "CHAPLAIN PRAYER"
+		if(SSreligion.deity)
+			deity = SSreligion.deity
+	else if(iscultist(usr))
+		cross.icon_state = "tome"
+		font_color = "red"
+		prayer_type = "CULTIST PRAYER"
+		deity = "Nar-Sie"
+
 	msg = "<span class='adminnotice'>[icon2html(cross, GLOB.admins)]<b><font color=[font_color]>[prayer_type][deity ? " (to [deity])" : ""]: </font>[ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]:</b> [msg]</span>"
-
-	for(var/client/C in GLOB.admins)
-		if(C.prefs.chat_toggles & CHAT_PRAYER)
-			to_chat(C, msg)
-			if(C.prefs.toggles & SOUND_PRAYERS)
-				if(usr.job == "Chaplain")
+
+	for(var/client/C in GLOB.admins)
+		if(C.prefs.chat_toggles & CHAT_PRAYER)
+			to_chat(C, msg)
+			if(C.prefs.toggles & SOUND_PRAYERS)
+				if(usr.job == "Chaplain")
 					SEND_SOUND(C, sound('sound/effects/pray.ogg'))
-<<<<<<< HEAD
-	to_chat(usr, "Your prayers have been received by the gods.")
-
-	SSblackbox.add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	//log_admin("HELP: [key_name(src)]: [msg]")
-
-=======
 	to_chat(usr, "Your prayers have been received by the gods.")
 
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	//log_admin("HELP: [key_name(src)]: [msg]")
 
->>>>>>> 8b19b49... JSON feedback (#32188)
 /proc/CentCom_announce(text , mob/Sender)
-	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
-	msg = "<span class='adminnotice'><b><font color=orange>CENTCOM:</font>[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]:</b> [msg]</span>"
-	to_chat(GLOB.admins, msg)
-	for(var/obj/machinery/computer/communications/C in GLOB.machines)
-		C.overrideCooldown()
-
-/proc/Syndicate_announce(text , mob/Sender)
-	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
-	msg = "<span class='adminnotice'><b><font color=crimson>SYNDICATE:</font>[ADMIN_FULLMONTY(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]:</b> [msg]</span>"
-	to_chat(GLOB.admins, msg)
-	for(var/obj/machinery/computer/communications/C in GLOB.machines)
-		C.overrideCooldown()
-
-/proc/Nuke_request(text , mob/Sender)
-	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
-	msg = "<span class='adminnotice'><b><font color=orange>NUKE CODE REQUEST:</font>[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)] [ADMIN_SET_SD_CODE]:</b> [msg]</span>"
-	to_chat(GLOB.admins, msg)
-	for(var/obj/machinery/computer/communications/C in GLOB.machines)
-		C.overrideCooldown()
+	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+	msg = "<span class='adminnotice'><b><font color=orange>CENTCOM:</font>[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]:</b> [msg]</span>"
+	to_chat(GLOB.admins, msg)
+	for(var/obj/machinery/computer/communications/C in GLOB.machines)
+		C.overrideCooldown()
+
+/proc/Syndicate_announce(text , mob/Sender)
+	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+	msg = "<span class='adminnotice'><b><font color=crimson>SYNDICATE:</font>[ADMIN_FULLMONTY(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]:</b> [msg]</span>"
+	to_chat(GLOB.admins, msg)
+	for(var/obj/machinery/computer/communications/C in GLOB.machines)
+		C.overrideCooldown()
+
+/proc/Nuke_request(text , mob/Sender)
+	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+	msg = "<span class='adminnotice'><b><font color=orange>NUKE CODE REQUEST:</font>[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)] [ADMIN_SET_SD_CODE]:</b> [msg]</span>"
+	to_chat(GLOB.admins, msg)
+	for(var/obj/machinery/computer/communications/C in GLOB.machines)
+		C.overrideCooldown()