empty branches

cmss13-devs · Oct 12, 2023 · ad6dbf4 · ad6dbf4
1 parent 08d7406
commit ad6dbf4
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 94 deletions.
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -50,9 +50,6 @@
 			new /obj/item/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/gas(src)
 			new /obj/item/clothing/mask/gas(src)
-			new /obj/item/storage/firstaid/o2(src)
-		if ("nothing")
-			// doot
 
 		// teehee - Ah, tg coders...
 		if ("delete")

diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm
@@ -336,86 +336,6 @@
 
 	/////////////////////////////////////new ban stuff
 
-	else if(href_list["jobban2"])
-// if(!check_rights(R_BAN)) return
-		/*
-		var/mob/M = locate(href_list["jobban2"])
-		if(!ismob(M))
-			to_chat(usr, "This can only be used on instances of type /mob")
-			return
-
-		if(!M.ckey) //sanity
-			to_chat(usr, "This mob has no ckey")
-			return
-		if(!RoleAuthority)
-			to_chat(usr, "The Role Authority is not set up!")
-			return
-
-		var/datum/entity/player/P = get_player_from_key(M.ckey)
-
-		var/dat = ""
-		var/body
-		var/jobs = ""
-
-	/***********************************WARNING!************************************
-					  The jobban stuff looks mangled and disgusting
-							  But it looks beautiful in-game
-										-Nodrak
-	************************************WARNING!***********************************/
-//Regular jobs
-	//Command (Blue)
-		jobs += generate_job_ban_list(M, ROLES_CIC, "CIC", "ddddff")
-		jobs += "<br>"
-	// SUPPORT
-		jobs += generate_job_ban_list(M, ROLES_AUXIL_SUPPORT, "Support", "ccccff")
-		jobs += "<br>"
-	// MPs
-		jobs += generate_job_ban_list(M, ROLES_POLICE, "Police", "ffdddd")
-		jobs += "<br>"
-	//Engineering (Yellow)
-		jobs += generate_job_ban_list(M, ROLES_ENGINEERING, "Engineering", "fff5cc")
-		jobs += "<br>"
-	//Cargo (Yellow) //Copy paste, yada, yada. Hopefully Snail can rework this in the future.
-		jobs += generate_job_ban_list(M, ROLES_REQUISITION, "Requisition", "fff5cc")
-		jobs += "<br>"
-	//Medical (White)
-		jobs += generate_job_ban_list(M, ROLES_MEDICAL, "Medical", "ffeef0")
-		jobs += "<br>"
-	//Marines
-		jobs += generate_job_ban_list(M, ROLES_MARINES, "Marines", "ffeeee")
-		jobs += "<br>"
-	// MISC
-		jobs += generate_job_ban_list(M, ROLES_MISC, "Misc", "aaee55")
-		jobs += "<br>"
-	// Xenos (Orange)
-		jobs += generate_job_ban_list(M, ROLES_XENO, "Xenos", "a268b1")
-		jobs += "<br>"
-	//Extra (Orange)
-		var/isbanned_dept = jobban_isbanned(M, "Syndicate", P)
-		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ffeeaa'><th colspan='10'><a href='?src=\ref[src];[HrefToken(forceGlobal = TRUE)];jobban3=Syndicate;jobban4=\ref[M]'>Extras</a></th></tr><tr align='center'>"
-
-		//ERT
-		if(jobban_isbanned(M, "Emergency Response Team", P) || isbanned_dept)
-			jobs += "<td width='20%'><a href='?src=\ref[src];[HrefToken(forceGlobal = TRUE)];jobban3=Emergency Response Team;jobban4=\ref[M]'><font color=red>Emergency Response Team</font></a></td>"
-		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];[HrefToken(forceGlobal = TRUE)];jobban3=Emergency Response Team;jobban4=\ref[M]'>Emergency Response Team</a></td>"
-
-		//Survivor
-		if(jobban_isbanned(M, "Survivor", P) || isbanned_dept)
-			jobs += "<td width='20%'><a href='?src=\ref[src];[HrefToken(forceGlobal = TRUE)];jobban3=Survivor;jobban4=\ref[M]'><font color=red>Survivor</font></a></td>"
-		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];[HrefToken(forceGlobal = TRUE)];jobban3=Survivor;jobban4=\ref[M]'>Survivor</a></td>"
-
-		if(jobban_isbanned(M, "Agent", P) || isbanned_dept)
-			jobs += "<td width='20%'><a href='?src=\ref[src];[HrefToken(forceGlobal = TRUE)];jobban3=Agent;jobban4=\ref[M]'><font color=red>Agent</font></a></td>"
-		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];[HrefToken(forceGlobal = TRUE)];jobban3=Agent;jobban4=\ref[M]'>Agent</a></td>"
-
-		body = "<body>[jobs]</body>"
-		dat = "<tt>[body]</tt>"
-		show_browser(usr, dat, "Job-Ban Panel: [M.name]", "jobban2", "size=800x490")
-		return*/ // DEPRECATED
 	//JOBBAN'S INNARDS
 	else if(href_list["jobban3"])
 		if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN))  return

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
@@ -1414,8 +1414,6 @@ var/const/MAX_SAVE_SLOTS = 10
 						for(var/i=1, i<=length(new_xeno_prefix), i++)
 							var/ascii_char = text2ascii(new_xeno_prefix,i)
 							switch(ascii_char)
-								// A  .. Z
-								if(65 to 90) //Uppercase Letters will work
 								else
 									all_ok = FALSE //everything else - won't
 						if(all_ok)

diff --git a/code/modules/desert_dam/filtration/consoles.dm b/code/modules/desert_dam/filtration/consoles.dm
@@ -35,8 +35,6 @@ var/global/river_activated = FALSE
 			if (prob(10))
 				get_broken()
 				return
-		else
-	return
 
 /obj/structure/machinery/filtration/console/proc/get_broken()
 	if(damaged)

diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
@@ -132,7 +132,6 @@
 	for(var/message_mode in parsed["modes"])
 		var/list/obj/item/used_radios = list()
 		switch(message_mode)
-			if(MESSAGE_MODE_LOCAL)
 			if(RADIO_MODE_WHISPER)
 				whisper_say(message, speaking, alt_name)
 				return

diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm
@@ -737,8 +737,6 @@ GLOBAL_LIST_EMPTY(flamer_particles)
 		var/angle = 180 - abs( abs( direction_angle - spread_direction_angle ) - 180 ) // the angle difference between the spread direction and initial direction
 
 		switch(angle) //this reduces power when the explosion is going around corners
-			if (0)
-				//no change
 			if (45)
 				spread_power *= 0.75
 			else //turns out angles greater than 90 degrees almost never happen. This bit also prevents trying to spread backwards

diff --git a/code/modules/reagents/chemistry_reagents/drink.dm b/code/modules/reagents/chemistry_reagents/drink.dm
@@ -85,13 +85,13 @@
 
 /datum/reagent/drink/carrotjuice/on_mob_life(mob/living/M)
 	. = ..()
-	if(!.) return
+	if(!.)
+		return
 	M.ReduceEyeBlur(1)
 	M.ReduceEyeBlind(1)
-	if(!data) data = 1
+	if(!data)
+		data = 1
 	switch(data)
-		if(1 to 20)
-			//nothing
 		if(21 to INFINITY)
 			if(prob(data-10))
 				M.disabilities &= ~NEARSIGHTED