diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 1d5a626d387..a27e3f8e96a 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -3,22 +3,22 @@
 #define ismovableatom(A) istype(A, /atom/movable)
 
 // Mobs 
-#define ismegafauna(A) (istype(A, /mob/living/simple_animal/hostile/megafauna))
+#define ismegafauna(A) istype(A, /mob/living/simple_animal/hostile/megafauna)
 
 //Turfs
-#define issimulatedturf(A) (istype(A, /turf/simulated))
+#define issimulatedturf(A) istype(A, /turf/simulated)
 
-#define isspaceturf(A) (istype(A, /turf/space))
+#define isspaceturf(A) istype(A, /turf/space)
 
-#define isfloorturf(A) (istype(A, /turf/simulated/floor))
+#define isfloorturf(A) istype(A, /turf/simulated/floor)
 
-#define isunsimulatedturf(A) (istype(A, /turf/unsimulated))
+#define isunsimulatedturf(A) istype(A, /turf/unsimulated)
 
-#define iswallturf(A) (istype(A, /turf/simulated/wall))
+#define iswallturf(A) istype(A, /turf/simulated/wall)
 
-#define isreinforcedwallturf(A) (istype(A, /turf/simulated/wall/r_wall))
+#define isreinforcedwallturf(A) istype(A, /turf/simulated/wall/r_wall)
 
-#define ismineralturf(A) (istype(A, /turf/simulated/mineral))
+#define ismineralturf(A) istype(A, /turf/simulated/mineral)
 
 // Misc
 #define isclient(A) istype(A, /client)
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 76c4c6f0ed8..f48f6ca3fc7 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -138,7 +138,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 			return 0
 
 	var/obj/effect/proc_holder/spell/noclothes/clothes_spell = locate() in (user.mob_spell_list | (user.mind ? user.mind.spell_list : list()))
-	if((ishuman(user) && clothes_req) && !(clothes_spell && istype(clothes_spell)))//clothes check
+	if((ishuman(user) && clothes_req) && !istype(clothes_spell))//clothes check
 		var/mob/living/carbon/human/H = user
 		if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/rig/wizard))
 			to_chat(user, "<span class='notice'>I don't feel strong enough without my robe.</span>")
diff --git a/code/datums/spells/shapeshift.dm b/code/datums/spells/shapeshift.dm
index a5f1de1baec..a814c84fa59 100644
--- a/code/datums/spells/shapeshift.dm
+++ b/code/datums/spells/shapeshift.dm
@@ -14,9 +14,9 @@
 	var/shapeshift_type
 	var/list/current_shapes = list()
 	var/list/current_casters = list()
-	var/list/possible_shapes = list(/mob/living/simple_animal/mouse,\
-		/mob/living/simple_animal/pet/corgi,\
-		/mob/living/simple_animal/bot/ed209,\
+	var/list/possible_shapes = list(/mob/living/simple_animal/mouse,
+		/mob/living/simple_animal/pet/corgi,
+		/mob/living/simple_animal/bot/ed209,
 		/mob/living/simple_animal/hostile/construct/armoured)
 
 /obj/effect/proc_holder/spell/targeted/shapeshift/cast(list/targets, mob/user = usr)
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index 156e46956b0..f3aae0ba6e7 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -145,8 +145,8 @@
 
 	action_icon_state = "spell_teleport"
 	
-	sound1="sound/magic/Teleport_diss.ogg"
-	sound2="sound/magic/Teleport_app.ogg"
+	sound1 = "sound/magic/Teleport_diss.ogg"
+	sound2 = "sound/magic/Teleport_app.ogg"
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
 	name = "Forcewall"
@@ -245,12 +245,12 @@
 /obj/effect/proc_holder/spell/targeted/inflict_handler/blind
 	amt_eye_blind = 10
 	amt_eye_blurry = 20
-	sound="sound/magic/Blind.ogg"
+	sound = "sound/magic/Blind.ogg"
 
 /obj/effect/proc_holder/spell/targeted/genetic/blind
 	disabilities = BLIND
 	duration = 300
-	sound="sound/magic/Blind.ogg"
+	sound = "sound/magic/Blind.ogg"
 
 /obj/effect/proc_holder/spell/fireball
 	name = "Fireball"
diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm
index ece2010a2cb..a8e449e1175 100644
--- a/code/game/gamemodes/wizard/rightandwrong.dm
+++ b/code/game/gamemodes/wizard/rightandwrong.dm
@@ -89,7 +89,7 @@
 				if("medibeam")
 					new /obj/item/weapon/gun/medbeam(get_turf(H))
 					
-			playsound(get_turf(H),'sound/magic/Summon_guns.ogg', 50, 1)
+			playsound(get_turf(H), 'sound/magic/Summon_guns.ogg', 50, 1)
 		else
 			switch(randomizemagic)
 				if("fireball")
@@ -158,4 +158,4 @@
 							new /obj/item/device/necromantic_stone(get_turf(H))
 					to_chat(H, "<span class='notice'>You suddenly feel lucky.</span>")
 					
-			playsound(get_turf(H),'sound/magic/Summon_Magic.ogg', 50, 1)
+			playsound(get_turf(H), 'sound/magic/Summon_Magic.ogg', 50, 1)
diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index 83ad04cca51..3d6a47a00b9 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -7,12 +7,12 @@
 	var/amount = 1 //Basically moles.
 
 /obj/effect/decal/cleanable/liquid_fuel/New(newLoc,amt=1)
-	src.amount = amt
+	amount = amt
 
 	//Be absorbed by any other liquid fuel in the tile.
 	for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
 		if(other != src)
-			other.amount += src.amount
+			other.amount += amount
 			spawn other.Spread()
 			qdel(src)
 
@@ -26,7 +26,7 @@
 	if(!istype(S)) return
 	for(var/d in cardinal)
 		if(rand(25))
-			var/turf/simulated/target = get_step(src,d)
+			var/turf/simulated/target = get_step(src, d)
 			var/turf/simulated/origin = get_turf(src)
 			if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0))
 				if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in target)
@@ -36,9 +36,10 @@
 /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel
 	icon_state = "mustard"
 	anchored = 0
-	New(newLoc, amt = 1, d = 0)
-		dir = d //Setting this direction means you won't get torched by your own flamethrower.
-		. = ..()
+
+/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0)
+	dir = d //Setting this direction means you won't get torched by your own flamethrower.
+	. = ..()
 
 /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Spread()
 	//The spread for flamethrower fuel is much more precise, to create a wide fire pattern.
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 45be8bc7c6a..af4f8c03e9f 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -255,4 +255,4 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
 	w_class = 3
 	throw_speed = 1
 	throw_range = 3
-	origin_tech = "materials=2;biotech=2"	
\ No newline at end of file
+	origin_tech = "materials=2;biotech=2"
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 20f8a0c610f..478ecba8f0e 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -410,4 +410,4 @@
 
 /obj/structure/closet/get_remote_view_fullscreens(mob/user)
 	if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
-		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)	
\ No newline at end of file
+		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
\ No newline at end of file
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index cb8f693b5a5..f3a8a9f2a96 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -61,9 +61,6 @@
 		new /obj/item/weapon/ore/glass/basalt(src)
 		user.visible_message("<span class='notice'>[user] digs up [src].</span>", "<span class='notice'>You uproot [src].</span>")
 		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
-		make_plating()
-	else
-		return
 
 /turf/simulated/floor/basalt/New()
 	..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 6cf996a0a89..2b684d37902 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -198,8 +198,6 @@
 	overlays.Cut()
 	if(panel_open)
 		overlays += image(icon, "[initial(icon_state)]-panel")
-	
-	return .
 
 /obj/machinery/smartfridge/attackby(obj/item/O, var/mob/user)
 	if(default_deconstruction_screwdriver(user, O))
diff --git a/code/modules/mining/lavaland/colossus_loot.dm b/code/modules/mining/lavaland/colossus_loot.dm
index 22b66b9f2cb..1fd69bc0c5c 100644
--- a/code/modules/mining/lavaland/colossus_loot.dm
+++ b/code/modules/mining/lavaland/colossus_loot.dm
@@ -163,7 +163,7 @@
 		var/mob/living/carbon/human/H = user
 		for(var/obj/item/W in H)
 			H.unEquip(W)
-		var/datum/job/clown/C = new /datum/job/clown()
+		var/datum/job/clown/C = job_master.GetJob("Clown")
 		C.equip(H)
 		qdel(C)
 		affected_targets.Add(H)
diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
index 5539cfe4989..c0f7efca2c6 100644
--- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
@@ -27,20 +27,17 @@
 	..()
 
 /mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM)
-	if(ismob(AM))
-		if(isliving(AM))
-			var/mob/living/A = AM
-			if(A.mob_size > MOB_SIZE_SMALL)
-				if(prob(squish_chance))
-					A.visible_message("<span class='notice'>\The [A] squashed \the [name].</span>", "<span class='notice'>You squashed \the [name].</span>")
-					death()
-				else
-					visible_message("<span class='notice'>\The [name] avoids getting crushed.</span>")
-	else
-		if(isobj(AM))
-			if(istype(AM,/obj/structure))
-				visible_message("<span class='notice'>As \the [AM] moved over \the [name], it was crushed.</span>")
+	if(isliving(AM))
+		var/mob/living/A = AM
+		if(A.mob_size > MOB_SIZE_SMALL)
+			if(prob(squish_chance))
+				A.visible_message("<span class='notice'>\The [A] squashed \the [name].</span>", "<span class='notice'>You squashed \the [name].</span>")
 				death()
+			else
+				visible_message("<span class='notice'>\The [name] avoids getting crushed.</span>")
+	else if(istype(AM, /obj/structure))
+		visible_message("<span class='notice'>As \the [AM] moved over \the [name], it was crushed.</span>")
+		death()
 
 /mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach.
 	return