From ce6e8c99c628d8432f133c40823601f20cda4e03 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 15 Feb 2022 21:56:36 -0700
Subject: [PATCH] fixes

---
 code/__HELPERS/type2type.dm                       |  4 ++--
 code/datums/brain_damage/severe.dm                |  1 +
 code/datums/diseases/dna_spread.dm                |  2 +-
 code/game/machinery/requests_console.dm           |  2 +-
 .../atmospherics/machinery/pipes/layermanifold.dm |  4 ++--
 code/modules/hydroponics/hydroponics_chemreact.dm |  1 +
 code/modules/mob/mob_helpers.dm                   |  1 +
 code/modules/power/singularity/singularity.dm     |  4 ++--
 .../ruins/lavalandruin_code/elephantgraveyard.dm  |  2 ++
 code/modules/surgery/advanced/lobotomy.dm         | 15 ++++++++-------
 code/modules/vending/_vending.dm                  |  1 +
 .../modules/eventmaps/Spookystation/JTGSZwork.dm  |  8 ++++----
 12 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 87187a4c3d..36de9d281b 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -591,9 +591,9 @@
 		switch(child)
 			if(/datum)
 				return null
-			if(/obj || /mob)
+			if(/obj, /mob)
 				return /atom/movable
-			if(/area || /turf)
+			if(/area, /turf)
 				return /atom
 			else
 				return /datum
diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm
index ed0a9fbab8..88008920b9 100644
--- a/code/datums/brain_damage/severe.dm
+++ b/code/datums/brain_damage/severe.dm
@@ -224,6 +224,7 @@
 				else
 					to_chat(owner, "<span class='userdanger'>You feel your heart lurching in your chest...</span>")
 					owner.adjustOxyLoss(8)
+		else
 
 /datum/brain_trauma/severe/discoordination
 	name = "Discoordination"
diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm
index 3a67230d36..07b3d5fe8a 100644
--- a/code/datums/diseases/dna_spread.dm
+++ b/code/datums/diseases/dna_spread.dm
@@ -30,7 +30,7 @@
 		return
 
 	switch(stage)
-		if(2 || 3) //Pretend to be a cold and give time to spread.
+		if(2, 3) //Pretend to be a cold and give time to spread.
 			if(prob(8))
 				affected_mob.emote("sneeze")
 			if(prob(8))
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index d4807e377c..a273aad0dd 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -374,7 +374,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
 				radio_freq = FREQ_ENGINEERING
 			if("security")
 				radio_freq = FREQ_SECURITY
-			if("cargobay" || "mining")
+			if("cargobay", "mining")
 				radio_freq = FREQ_SUPPLY
 		Radio.set_frequency(radio_freq)
 
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
index bc8fd6777d..d019a03140 100644
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -70,9 +70,9 @@
 
 /obj/machinery/atmospherics/pipe/layer_manifold/SetInitDirections()
 	switch(dir)
-		if(NORTH || SOUTH)
+		if(NORTH, SOUTH)
 			initialize_directions = NORTH|SOUTH
-		if(EAST || WEST)
+		if(EAST, WEST)
 			initialize_directions = EAST|WEST
 
 /obj/machinery/atmospherics/pipe/layer_manifold/isConnectable(obj/machinery/atmospherics/target, given_layer)
diff --git a/code/modules/hydroponics/hydroponics_chemreact.dm b/code/modules/hydroponics/hydroponics_chemreact.dm
index a4ef78a21f..9c19e40bbc 100644
--- a/code/modules/hydroponics/hydroponics_chemreact.dm
+++ b/code/modules/hydroponics/hydroponics_chemreact.dm
@@ -30,3 +30,4 @@
 		if(1 to 10)
 			mutatepest(user)
 			return
+		else
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 5bfc6fe652..561425c710 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -144,6 +144,7 @@
 				newletter = "nglu"
 			if(5)
 				newletter = "glor"
+			else
 		. += newletter
 	return sanitize(.)
 
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 256e128ff4..8490daa681 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -347,10 +347,10 @@
 	var/dir2 = 0
 	var/dir3 = 0
 	switch(direction)
-		if(NORTH||SOUTH)
+		if(NORTH, SOUTH)
 			dir2 = 4
 			dir3 = 8
-		if(EAST||WEST)
+		if(EAST, WEST)
 			dir2 = 1
 			dir3 = 2
 	var/turf/T2 = T
diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
index 088683ccd2..d9dfdd8c19 100644
--- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
+++ b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
@@ -145,6 +145,8 @@
 		if(7)
 			new /obj/item/clothing/glasses/sunglasses(src)
 			new /obj/item/clothing/mask/cigarette/rollie(src)
+		else
+			return
 
 /obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S)
 	if(!opened)
diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm
index 4a52e446bc..b3b3b4aa1d 100644
--- a/code/modules/surgery/advanced/lobotomy.dm
+++ b/code/modules/surgery/advanced/lobotomy.dm
@@ -41,13 +41,14 @@
 	target.cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY)
 	if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed))
 		target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
-	switch(rand(1,6))//Now let's see what hopefully-not-important part of the brain we cut off
-		if(1)
-			target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_SURGERY)
-		if(2)
-			target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_SURGERY)
-		if(3)
-			target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_SURGERY)
+	if(prob(50))
+		switch(rand(1,3))//Now let's see what hopefully-not-important part of the brain we cut off
+			if(1)
+				target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_SURGERY)
+			if(2)
+				target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_SURGERY)
+			if(3)
+				target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_SURGERY)
 	// you're cutting off a part of the brain.w
 	var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
 	B.applyOrganDamage(50, 100)
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 16caef5b4e..cea7502540 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -469,6 +469,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 					freebie(user, 2)
 				if(16 to 25)
 					freebie(user, 1)
+				if(26 to 75)
 				if(76 to 90)
 					tilt(user)
 				if(91 to 100)
diff --git a/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm b/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm
index e3f23a4992..dbf5ad0648 100644
--- a/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm
+++ b/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm
@@ -630,19 +630,19 @@ GLOBAL_LIST_EMPTY(rain_sounds)
 		playchime = 1
 
 	switch(hour)
-		if(1 || 2)
+		if(1, 2)
 			HRimgstate = "asshouroverlay-2" //Now it is ass, mostly because someones going to kill me for the other names.
 		if(3)
 			HRimgstate = "asshouroverlay-3"
-		if(4 || 5)
+		if(4, 5)
 			HRimgstate = "asshouroverlay-4"
 		if(6)
 			HRimgstate = "asshouroverlay-6"
-		if(7 || 8)
+		if(7, 8)
 			HRimgstate = "asshouroverlay-7"
 		if(9)
 			HRimgstate = "asshouroverlay-9"
-		if(10 || 11)
+		if(10, 11)
 			HRimgstate = "asshouroverlay-10"
 		else
 			HRimgstate = "asshouroverlay-0" //Station time wraps to 0, and so does our hours.