Merge branch 'master' into upstream-merge-37476

code/datums/brain_damage/severe.dm

@@ -160,7 +160,7 @@
 				to_chat(owner, "<span class='warning'>You feel really lonely...</span>")
 			else
 				to_chat(owner, "<span class='warning'>You're going mad with loneliness!</span>")
-				owner.hallucination += 20
+				owner.hallucination += 30
 
 		if(5)
 			if(!high_stress)

code/datums/datumvars.dm

@@ -1,3 +1,6 @@
+/datum/proc/CanProcCall(procname)
+	return TRUE
+
 /datum/proc/can_vv_get(var_name)
 	return TRUE
 

code/datums/helper_datums/getrev.dm

@@ -5,7 +5,7 @@
 	var/date
 
 /datum/getrev/New()
-	testmerge = SERVER_TOOLS_PR_LIST
+	testmerge = world.TgsTestMerges()
 	log_world("Running /tg/ revision:")
 	var/list/logs = world.file2list(".git/logs/HEAD")
 	if(logs)
@@ -21,7 +21,8 @@
 		log_world(commit)
 		for(var/line in testmerge)
 			if(line)
-				var/tmcommit = testmerge[line]["commit"]
+				var/datum/tgs_revision_information/test_merge/tm = line
+				var/tmcommit = tm.commit
 				log_world("Test merge active of PR #[line] commit [tmcommit]")
 				SSblackbox.record_feedback("nested tally", "testmerged_prs", 1, list("[line]", "[tmcommit]"))
 		if(originmastercommit)
@@ -34,11 +35,12 @@
 		return ""
 	. = header ? "The following pull requests are currently test merged:<br>" : ""
 	for(var/line in testmerge)
-		var/cm = testmerge[line]["commit"]
-		var/details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["author"]) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 11)))
+		var/datum/tgs_revision_information/test_merge/tm = line
+		var/cm = tm.pull_request_commit
+		var/details = ": '" + html_encode(tm.title) + "' by " + html_encode(tm.author) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 11)))
 		if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder))
 			continue
-		. += "<a href=\"[CONFIG_GET(string/githuburl)]/pull/[line]\">#[line][details]</a><br>"
+		. += "<a href=\"[CONFIG_GET(string/githuburl)]/pull/[tm.number]\">#[tm.number][details]</a><br>"
 
 /client/verb/showrevinfo()
 	set category = "OOC"
@@ -58,9 +60,8 @@
 	else
 		to_chat(src, "Master revision unknown")
 	to_chat(src, "Revision: [GLOB.revdata.commit]")
-	if(SERVER_TOOLS_PRESENT)
-		to_chat(src, "Server tools version: [SERVER_TOOLS_VERSION]")
-		to_chat(src, "Server tools API version: [SERVER_TOOLS_API_VERSION]")
+	if(world.TgsAvailable())
+		to_chat(src, "Server tools version: [world.TgsVersion()]")
 	to_chat(src, "<b>Current Informational Settings:</b>")
 	to_chat(src, "Protect Authority Roles From Traitor: [CONFIG_GET(flag/protect_roles_from_antagonist)]")
 	to_chat(src, "Protect Assistant Role From Traitor: [CONFIG_GET(flag/protect_assistant_from_antagonist)]")

code/datums/traits/negative.dm

@@ -230,16 +230,9 @@
 		return
 	if(prob(2)) //we'll all be mad soon enough
 		madness()
-
-/datum/quirk/insanity/proc/madness(mad_fools)
-	set waitfor = FALSE
-	if(!mad_fools)
-		mad_fools = prob(20)
-	if(mad_fools)
-		var/hallucination_type = pick(subtypesof(/datum/hallucination/rds))
-		new hallucination_type (quirk_holder, FALSE)
-	else
-		quirk_holder.hallucination += rand(10, 50)
+		
+/datum/quirk/insanity/proc/madness()
+	quirk_holder.hallucination += rand(10, 25)
 
 /datum/quirk/insanity/post_add() //I don't /think/ we'll need this but for newbies who think "roleplay as insane" = "license to kill" it's probably a good thing to have
 	if(!quirk_holder.mind || quirk_holder.mind.special_role)

code/datums/world_topic.dm

@@ -120,8 +120,12 @@
 	require_comms_key = TRUE
 
 /datum/world_topic/namecheck/Run(list/input)
-	var/datum/server_tools_command/namecheck/NC = new
-	return NC.Run(input["sender"], input["namecheck"])
+	//Oh this is a hack, someone refactor the functionality out of the chat command PLS
+	var/datum/tgs_chat_command/namecheck/NC = new
+	var/datum/tgs_chat_user/user = new
+	user.friendly_name = input["sender"]
+	user.mention = user.friendly_name
+	return NC.Run(user, input["namecheck"])
 
 /datum/world_topic/adminwho
 	keyword = "adminwho"