Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts

code/modules/client/client procs.dm

@@ -373,13 +373,11 @@
 	send_resources()
 
 	if(prefs.toggles & UI_DARKMODE) // activates dark mode if its flagged. -AA07
-		if(establish_db_connection())
-			activate_darkmode()
+		activate_darkmode()
+	else
+		// activate_darkmode() calls the CL update button proc, so we dont want it double called
+		SSchangelog.UpdatePlayerChangelogButton(src)
 
-	if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates. -CP
-		if(establish_db_connection())
-			to_chat(src, "<span class='info'>Changelog has changed since your last visit.</span>")
-			update_changelog_button()
 
 	if(prefs.toggles & DISABLE_KARMA) // activates if karma is disabled
 		if(establish_db_connection())
@@ -825,7 +823,7 @@
 // IF YOU CHANGE ANYTHING IN ACTIVATE, MAKE SURE IT HAS A DEACTIVATE METHOD, -AA07
 /client/proc/activate_darkmode()
 	///// BUTTONS /////
-	update_changelog_button()
+	SSchangelog.UpdatePlayerChangelogButton(src)
 	/* Rpane */
 	winset(src, "rpane.textb", "background-color=#40628a;text-color=#FFFFFF")
 	winset(src, "rpane.infob", "background-color=#40628a;text-color=#FFFFFF")
@@ -857,7 +855,7 @@
 
 /client/proc/deactivate_darkmode()
 	///// BUTTONS /////
-	update_changelog_button()
+	SSchangelog.UpdatePlayerChangelogButton(src)
 	/* Rpane */
 	winset(src, "rpane.textb", "background-color=none;text-color=#000000")
 	winset(src, "rpane.infob", "background-color=none;text-color=#000000")
@@ -887,22 +885,6 @@
 	///// NOTIFY USER /////
 	to_chat(src, "<span class='notice'>Darkmode Disabled</span>") // what a sick fuck
 
-// Better changelog button handling
-/client/proc/update_changelog_button()
-	if(establish_db_connection())
-		if(prefs.lastchangelog != GLOB.changelog_hash)
-			winset(src, "rpane.changelog", "background-color=#bb7700;text-color=#FFFFFF;font-style=bold")
-		else
-			if(prefs.toggles & UI_DARKMODE)
-				winset(src, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF")
-			else
-				winset(src, "rpane.changelog", "background-color=none;text-color=#000000")
-	else
-		if(prefs.toggles & UI_DARKMODE)
-			winset(src, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF")
-		else
-			winset(src, "rpane.changelog", "background-color=none;text-color=#000000")
-
 /client/proc/generate_clickcatcher()
 	if(!void)
 		void = new()

code/modules/client/preference/preferences.dm

@@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 	var/last_id
 
 	//game-preferences
-	var/lastchangelog = ""				//Saved changlog filesize to detect if there was a change
+	var/lastchangelog = "1"				//Saved changlog timestamp (unix epoch) to detect if there was a change. Dont set this to 0 unless you want the last changelog date to be 4x longer than the expected lifespan of the universe.
 	var/exp
 	var/ooccolor = "#b82e00"
 	var/list/be_special = list()				//Special role selection

code/modules/client/preference/preferences_mysql.dm

@@ -491,18 +491,3 @@
 	load_character(C,pick(saves))
 	return 1
 
-/datum/preferences/proc/SetChangelog(client/C,hash)
-	lastchangelog=hash
-	var/datum/preferences/P = GLOB.preferences_datums[C.ckey]
-	if(P.toggles & UI_DARKMODE)
-		winset(C, "rpane.changelog", "background-color=#40628a;font-color=#ffffff;font-style=none")
-	else
-		winset(C, "rpane.changelog", "background-color=none;font-style=none")
-	var/DBQuery/query = GLOB.dbcon.NewQuery("UPDATE [format_table_name("player")] SET lastchangelog='[lastchangelog]' WHERE ckey='[C.ckey]'")
-	if(!query.Execute())
-		var/err = query.ErrorMsg()
-		log_game("SQL ERROR during lastchangelog updating. Error : \[[err]\]\n")
-		message_admins("SQL ERROR during lastchangelog updating. Error : \[[err]\]\n")
-		to_chat(C, "Couldn't update your last seen changelog, please try again later.")
-		return
-	return 1

code/modules/mob/living/carbon/human/species/_species.dm

@@ -273,8 +273,6 @@
 
 		if(H.status_flags & GOTTAGOFAST)
 			. -= 1
-		if(H.status_flags & GOTTAGOFAST_METH)
-			. -= 1
 	return .
 
 /datum/species/proc/on_species_gain(mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.

code/modules/reagents/chemistry/reagents/drugs.dm

@@ -322,13 +322,13 @@
 	update_flags |= M.AdjustWeakened(-2.5, FALSE)
 	update_flags |= M.adjustStaminaLoss(-2, FALSE)
 	update_flags |= M.SetSleeping(0, FALSE)
-	M.status_flags |= GOTTAGOFAST_METH
+	M.status_flags |= GOTTAGOFAST
 	if(prob(50))
 		update_flags |= M.adjustBrainLoss(1, FALSE)
 	return ..() | update_flags
 
 /datum/reagent/methamphetamine/on_mob_delete(mob/living/M)
-	M.status_flags &= ~GOTTAGOFAST_METH
+	M.status_flags &= ~GOTTAGOFAST
 	..()
 
 /datum/reagent/methamphetamine/overdose_process(mob/living/M, severity)
@@ -684,7 +684,7 @@
 	update_flags |= M.AdjustStunned(-2, FALSE)
 	update_flags |= M.AdjustWeakened(-2, FALSE)
 	update_flags |= M.adjustStaminaLoss(-2, FALSE)
-	M.status_flags |= GOTTAGOFAST_METH
+	M.status_flags |= GOTTAGOFAST
 	M.Jitter(3)
 	update_flags |= M.adjustBrainLoss(0.5, FALSE)
 	if(prob(5))
@@ -692,7 +692,7 @@
 	return ..() | update_flags
 
 /datum/reagent/lube/ultra/on_mob_delete(mob/living/M)
-	M.status_flags &= ~GOTTAGOFAST_METH
+	M.status_flags &= ~GOTTAGOFAST
 	..()
 
 /datum/reagent/lube/ultra/overdose_process(mob/living/M, severity)

code/modules/surgery/organs/heart.dm

@@ -238,6 +238,8 @@
 /obj/item/organ/internal/heart/cybernetic/upgraded/shock_organ(intensity)
 	if(!ishuman(owner))
 		return
+	if(emp_proof)
+		return
 	intensity = min(intensity, 100)
 	var/numHigh = round(intensity / 5)
 	var/numMid = round(intensity / 10)