alright

cmss13-devs · Oct 12, 2023 · 188dfe8 · 188dfe8
1 parent 7975b03
commit 188dfe8
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 33 deletions.
diff --git a/code/datums/_ndatabase/code/brsql_adapter.dm b/code/datums/_ndatabase/code/brsql_adapter.dm
@@ -101,8 +101,8 @@
 		SSdatabase.create_parametric_query(query_updatetable, qpars, CB)
 
 /datum/db/adapter/brsql_adapter/insert_table(table_name, list/values, datum/callback/CB, sync = FALSE)
-	if(!sync)
-		set waitfor = 0
+	set waitfor = FALSE
+
 	var/length = values.len
 	var/list/qpars = list()
 	var/query_inserttable = getquery_insert_table(table_name, values, qpars)

diff --git a/code/datums/_ndatabase/code/native_adapter.dm b/code/datums/_ndatabase/code/native_adapter.dm
@@ -83,8 +83,7 @@
 		SSdatabase.create_query(query_gettable, CB)
 
 /datum/db/adapter/native_adapter/update_table(table_name, list/values, datum/callback/CB, sync = FALSE)
-	if(!sync)
-		set waitfor = 0
+	set waitfor = FALSE
 
 	for(var/list/vals in values)
 		var/list/qpars = list()

diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
@@ -59,8 +59,6 @@
 		if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY)
 			deconstruct(FALSE)
 			return
-		else
-	return
 
 /obj/structure/machinery/optable/get_examine_text(mob/user)
 	. = ..()

diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
@@ -431,8 +431,6 @@
 	var/wireIndex = AAlarmWireColorToIndex[wireColor] //not used in this function
 	AAlarmwires |= wireFlag
 	switch(wireIndex)
-		if(AALARM_WIRE_IDSCAN)
-
 		if(AALARM_WIRE_POWER)
 			shorted = 0
 			shock(usr, 50)

diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
@@ -551,7 +551,7 @@
 		var/speed = ((wires & WIRE_MOTOR1) ? 1:0) + ((wires & WIRE_MOTOR2) ? 2:0)
 		switch(speed)
 			if(0)
-				// do nothing
+				pass()
 			if(1)
 				process_bot()
 				spawn(2)

diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
@@ -53,8 +53,6 @@
 		if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY)
 			deconstruct(FALSE)
 			return
-		else
-	return
 
 /obj/structure/machinery/computer/bullet_act(obj/projectile/Proj)
 	if(exproof)

diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
@@ -123,7 +123,6 @@
 					else
 						dat += "<br>[bdat]"
 
-				else
 		else
 			dat += text("<A href='?src=\ref[];login=1'>{Log In}</A>", src)
 	show_browser(user, dat, "Medical Records", "med_rec")
@@ -365,8 +364,6 @@
 				for(var/datum/data/record/E in GLOB.data_core.medical)
 					if ((E.fields["ref"] == R.fields["ref"] || E.fields["id"] == R.fields["id"]))
 						M = E
-					else
-						//Foreach continue //goto(2540)
 				src.active1 = R
 				src.active2 = M
 				src.screen = 4
@@ -417,16 +414,12 @@
 				for(var/datum/data/record/R as anything in GLOB.data_core.medical)
 					if ((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"])))
 						src.active2 = R
-					else
-						//Foreach continue //goto(3229)
 				if (!active2)
 					temp = "Could not locate record [t1]."
 				else
 					for(var/datum/data/record/E in GLOB.data_core.general)
 						if ((E.fields["name"] == src.active2.fields["name"] || E.fields["id"] == src.active2.fields["id"]))
 							src.active1 = E
-						else
-							//Foreach continue //goto(3334)
 					src.screen = 4
 
 			if (href_list["print_p"])

diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
@@ -20,7 +20,6 @@
 		for(var/obj/structure/machinery/mass_driver/M in machines)
 			if(M.id == id)
 				connected = M
-			else
 		return
 	return
 

diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
@@ -54,7 +54,6 @@
 				src.health -= W.force * 0.75
 			if("brute")
 				src.health -= W.force * 0.5
-			else
 		if (src.health <= 0)
 			src.explode()
 		..()

diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
@@ -95,8 +95,6 @@
 		if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY)
 			deconstruct(FALSE)
 			return
-		else
-	return
 
 /obj/effect/glowshroom/fire_act(exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -268,7 +268,6 @@ cases. Override_icon_state should be a list.*/
 			size = "huge"
 		if(SIZE_MASSIVE)
 			size = "massive"
-		else
 	. += "This is a [blood_color ? blood_color != "#030303" ? "bloody " : "oil-stained " : ""][icon2html(src, user)][src.name]. It is a [size] item."
 	if(desc)
 		. += desc

diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm
@@ -182,8 +182,7 @@
 		return 0
 
 	var/inaccurate = 0
-	if(W.sharp == IS_SHARP_ITEM_ACCURATE)
-	else if(W.sharp == IS_SHARP_ITEM_BIG)
+	if(W.sharp == IS_SHARP_ITEM_BIG)
 		inaccurate = 1
 	else
 		return 1

diff --git a/code/game/objects/structures/bookcase.dm b/code/game/objects/structures/bookcase.dm
@@ -58,8 +58,6 @@
 			contents_explosion(severity)
 			deconstruct(FALSE)
 			return
-		else
-	return
 
 /obj/structure/bookcase/update_icon()
 	if(contents.len < 5)

diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
@@ -130,8 +130,6 @@
 			contents_explosion(severity)
 			deconstruct(FALSE)
 			return
-		else
-	return
 
 /obj/structure/closet/crate/alpha
 	name = "alpha squad crate"

diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
@@ -43,8 +43,6 @@
 		if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY)
 			deconstruct(FALSE)
 			return
-		else
-	return
 
 /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
 

diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm
@@ -119,8 +119,6 @@
 		if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY)
 			deconstruct(FALSE)
 			return
-		else
-	return
 
 /obj/structure/reagent_dispensers/attack_hand()
 	if(!reagents || reagents.locked)