Fix conflicts

code/modules/admin/player_panel.dm

@@ -518,7 +518,7 @@
 
 		if(ticker.mode.vampire_enthralled.len)
 			dat += check_role_table("Vampire Thralls", ticker.mode.vampire_enthralled)
-		
+
 		if(ticker.mode.devils.len)
 			dat += check_role_table("Devils", ticker.mode.devils)
 
@@ -534,6 +534,9 @@
 		if(ticker.mode.greyshirts.len)
 			dat += check_role_table("Greyshirts", ticker.mode.greyshirts)
 
+		if(ticker.mode.eventmiscs.len)
+			dat += check_role_table("Event Roles", ticker.mode.eventmiscs)
+
 		if(ts_spiderlist.len)
 			var/list/spider_minds = list()
 			for(var/mob/living/simple_animal/hostile/poison/terror_spider/S in ts_spiderlist)

code/modules/client/client procs.dm

@@ -310,6 +310,11 @@
 	GLOB.directory[ckey] = src
 
 	//Admin Authorisation
+	// Automatically makes localhost connection an admin
+	if(!config.disable_localhost_admin)
+		var/localhost_addresses = list("127.0.0.1", "::1") // Adresses
+		if(!isnull(address) && address in localhost_addresses)
+			new /datum/admins("!LOCALHOST!", R_HOST, ckey) // Makes localhost rank
 	holder = admin_datums[ckey]
 	if(holder)
 		GLOB.admins += src
@@ -374,7 +379,13 @@
 		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())
+			to_chat(src,"<span class='notice'>You have disabled karma gains.") // reminds those who have it disabled
+	else
+		if(establish_db_connection())
+			to_chat(src,"<span class='notice'>You have enabled karma gains.")
 
 	if(!void)
 		void = new()
@@ -665,7 +676,7 @@
 
 /client/proc/on_varedit()
 	var_edited = TRUE
-  
+
 /////////////////
 // DARKMODE UI //
 /////////////////
@@ -702,7 +713,7 @@
 	/* Infowindow */
 	winset(src, "infowindow", "background-color=#272727;text-color=#FFFFFF")
 	winset(src, "infowindow.info", "background-color=#272727;text-color=#FFFFFF;highlight-color=#009900;tab-text-color=#FFFFFF;tab-background-color=#272727")
-	// NOTIFY USER 
+	// NOTIFY USER
 	to_chat(src, "<span class='notice'>Darkmode Enabled</span>")
 
 /client/proc/deactivate_darkmode()
@@ -743,15 +754,15 @@
 // Better changelog button handling
 /client/proc/update_changelog_button()
 	if(establish_db_connection())
-		if(prefs.lastchangelog != changelog_hash) 
+		if(prefs.lastchangelog != changelog_hash)
 			winset(src, "rpane.changelog", "background-color=#bb7700;text-color=#FFFFFF;font-style=bold")
 		else
-			if(prefs.toggles & UI_DARKMODE) 
+			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) 
+		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")

code/modules/client/preference/preferences_mysql.dm

@@ -55,7 +55,7 @@
 	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
 	UI_style		= sanitize_inlist(UI_style, list("White", "Midnight"), initial(UI_style))
 	default_slot	= sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
-	toggles			= sanitize_integer(toggles, 0, 262143, initial(toggles))
+	toggles			= sanitize_integer(toggles, 0, 524287, initial(toggles))
 	sound			= sanitize_integer(sound, 0, 65535, initial(sound))
 	UI_style_color	= sanitize_hexcolor(UI_style_color, initial(UI_style_color))
 	UI_style_alpha	= sanitize_integer(UI_style_alpha, 0, 255, initial(UI_style_alpha))

code/modules/client/preference/preferences_toggles.dm

@@ -218,4 +218,16 @@
 		activate_darkmode()
 	else
 		deactivate_darkmode()
-	feedback_add_details("admin_verb","TDarkmode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	feedback_add_details("admin_verb","TDarkmode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_karma()
+	set name = "Toggle Karma Gains"
+	set category = "Special Verbs"
+	set desc = "This button will allow you to stop other people giving you karma."
+	prefs.toggles ^= DISABLE_KARMA
+	prefs.save_preferences(src)
+	if(prefs.toggles & DISABLE_KARMA)
+		to_chat(usr, "<span class='notice'>You have disabled karma gains.")
+	else
+		to_chat(usr, "<span class='notice'>You have enabled karma gains.")
+	return

code/modules/discord/accountlink.dm

@@ -1,6 +1,6 @@
 // DONT TOUCH ANYTHING IN HERE UNLESS YOU KNOW WHAT YOU ARE DOING -affected
 /client/verb/linkdiscord()
-    set category = "OOC"
+    set category = "Special Verbs"
     set name = "Link Discord Account"
     set desc = "Link your discord account to your BYOND account."
     var/user_ckey = sanitizeSQL(usr.ckey) // Probably not neccassary but better safe than sorry

code/modules/discord/notify.dm

@@ -1,6 +1,6 @@
 // DONT TOUCH ANYTHING IN HERE UNLESS YOU KNOW WHAT YOU ARE DOING -affected
 /client/verb/notify_restart()
-    set category = "OOC"
+    set category = "Special Verbs"
     set name = "Notify Restart"
     set desc = "Notifies you on Discord when the server restarts."
     if(!config.sql_enabled)

code/modules/karma/karma.dm

@@ -85,6 +85,9 @@ var/list/karma_spenders = list()
 		log_game("Illegal karma spending attempt detected from [key] to [M.key]. Using the same IP!")
 		to_chat(src, "<span class='warning'>You can't spend karma on someone connected from the same IP.</span>")
 		return FALSE
+	if(M.get_preference(DISABLE_KARMA))
+		to_chat(src, "<span class='warning'>That player has turned off incoming karma.")
+		return FALSE
 	return TRUE
 
 

code/modules/mob/living/simple_animal/bot/emote.dm

@@ -1,4 +1,4 @@
-/mob/living/simple_animal/bot/emote(var/act, var/m_type=1, var/message = null)
+/mob/living/simple_animal/bot/emote(act, m_type=1, message = null)
 	var/param = null
 	if(findtext(act, "-", 1, null))
 		var/t1 = findtext(act, "-", 1, null)
@@ -69,4 +69,6 @@
 			playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
 			m_type = 2
 
+		if("help")
+			to_chat(src, "scream(s), yes, no, beep, buzz, ping")
 	..(act, m_type, message)

code/modules/mob/living/simple_animal/friendly/diona.dm

@@ -278,5 +278,7 @@
 			message = "<B>\The [src]</B> chirps!"
 			m_type = 2 //audible
 			playsound(src, chirp_sound, 40, 1, 1)
+		if("help")
+			to_chat(src, "scream, chirp")
 
 	..(act, m_type, message)

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -266,6 +266,8 @@
 		if("scream")
 			message = "<B>\The [src]</B> whimpers."
 			m_type = 2
+		if("help")
+			to_chat(src, "scream")
 
 	..(act, m_type, message)