Merge branch 'master' into upstream-merge-26129

code/datums/datumvars.dm

@@ -27,6 +27,7 @@
 	. += "---"
 	.["Call Proc"] = "?_src_=vars;proc_call=\ref[src]"
 	.["Mark Object"] = "?_src_=vars;mark_object=\ref[src]"
+	.["Delete"] = "?_src_=vars;delete=\ref[src]"
 
 
 /datum/proc/on_reagent_change()
@@ -446,7 +447,7 @@
 		var/list/L = value
 		var/list/items = list()
 
-		if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > 500))
+		if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150)))
 			for (var/i in 1 to L.len)
 				var/key = L[i]
 				var/val
@@ -526,6 +527,16 @@
 		if(T)
 			callproc_datum(T)
 
+	else if(href_list["delete"])
+		if(!check_rights(R_DEBUG, 0))
+			return
+
+		var/datum/D = locate(href_list["delete"])
+		if(!D)
+			to_chat(usr, "Unable to locate item!")
+		admin_delete(D)
+		href_list["datumrefresh"] = href_list["delete"]
+
 	else if(href_list["regenerateicons"])
 		if(!check_rights(0))
 			return

code/datums/emotes.dm

@@ -35,10 +35,6 @@
 	var/msg = select_message_type(user)
 	if(params && message_param)
 		msg = select_param(user, params)
-	if(findtext(msg, "their"))
-		msg = replacetext(msg, "their", user.p_their())
-	if(findtext(msg, "them"))
-		msg = replacetext(msg, "them", user.p_them())
 	if(findtext(msg, "%s"))
 		msg = replacetext(msg, "%s", user.p_s())
 

code/datums/helper_datums/getrev.dm

@@ -105,13 +105,13 @@
 				probs[ctag] = 1
 				prob_sum += config.probabilities[ctag]
 			if(current_odds_differ)
-				src <<"<b>Game Mode Odds for current round:</b>"
+				to_chat(src, "<b>Game Mode Odds for current round:</b>")
 				for(var/ctag in probs)
 					if(config.probabilities[ctag] > 0)
 						var/percentage = round(config.probabilities[ctag] / prob_sum * 100, 0.1)
 						to_chat(src, "[ctag] [percentage]%")
 
-		src <<"<b>All Game Mode Odds:</b>"
+		to_chat(src, "<b>All Game Mode Odds:</b>")
 		var/sum = 0
 		for(var/ctag in config.probabilities)
 			sum += config.probabilities[ctag]

code/datums/martial.dm

@@ -657,7 +657,7 @@
 /obj/item/weapon/cqc_manual/attack_self(mob/living/carbon/human/user)
 	if(!istype(user) || !user)
 		return
-	user <<"<span class='boldannounce'>You remember the basics of CQC.</span>"
+	to_chat(user, "<span class='boldannounce'>You remember the basics of CQC.</span>")
 	var/datum/martial_art/cqc/D = new(null)
 	D.teach(user)
 	user.drop_item()

code/datums/mind.dm

@@ -1143,7 +1143,7 @@
 					log_admin("[key_name_admin(usr)] has made [current] unable to ascend as a devil.")
 					return
 				if(!ishuman(current) && !iscyborg(current))
-					usr << "<span class='warning'>This only works on humans and cyborgs!</span>"
+					to_chat(usr, "<span class='warning'>This only works on humans and cyborgs!</span>")
 					return
 				SSticker.mode.devils += src
 				special_role = "devil"