VSCode fixes (#22847)

* some fixes

* ow my brain

* ight then

* more

* MORE

* ;

__DEFINES/accessories.dm

@@ -7,4 +7,4 @@
 #define TIE			8
 #define HOLOMAP		16
 #define LASERTAG	32
-#define LIGHT		64
+#define ACCESSORY_LIGHT		64

code/__HELPERS/unsorted.dm

@@ -1296,10 +1296,10 @@ var/list/WALLITEMS = list(
 	return 0
 
 proc/rotate_icon(file, state, step = 1, aa = FALSE)
-	var icon/base = icon(file, state)
+	var/icon/base = icon(file, state)
 
 	var/w
-	var/h,
+	var/h
 	var/w2
 	var/h2
 

code/datums/shuttle.dm

@@ -509,7 +509,7 @@
 		shuttle_list += name
 		shuttle_list[name]=S
 
-	var/my_shuttle = input(usr, message, title) in shuttle_list as text|null
+	var/my_shuttle = input(usr, message, title) as null|anything in shuttle_list
 
 	if( my_shuttle && shuttle_list[my_shuttle] && istype(shuttle_list[my_shuttle], /datum/shuttle) )
 		return shuttle_list[my_shuttle]

code/game/machinery/computer/shuttle_computers.dm

@@ -377,7 +377,7 @@
 			L += name
 			L[name] = S
 
-		var/choice = input(usr,"Select a shuttle to link this computer to", "Shuttle control console") in L as text|null
+		var/choice = input(usr,"Select a shuttle to link this computer to", "Shuttle control console") as null|anything in L
 		if(!Adjacent(usr) && !isAdminGhost(usr) && !isAI(usr))
 			return
 		if(L[choice] && istype(L[choice],/datum/shuttle))
@@ -456,7 +456,7 @@
 			L += name
 			L[name] = S
 
-		var/choice = input(usr,"Select a shuttle to link this computer to", "Admin abuse") in L as text|null
+		var/choice = input(usr,"Select a shuttle to link this computer to", "Admin abuse") as null|anything in L
 		if(L[choice] && istype(L[choice],/datum/shuttle))
 			shuttle = L[choice]
 

code/game/machinery/newscaster.dm

@@ -263,7 +263,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 						if(CHANNEL.is_admin_channel)
 							dat+="<B><FONT style='BACKGROUND-COLOR: LightGreen '><A href='?src=\ref[src];show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A></FONT></B><BR>"
 						else
-							dat+="<B><A href='?src=\ref[src];show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR></B>"
+							dat+="<B><A href='?src=\ref[src];show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR></B>"
 
 				dat += {"<BR><HR><A href='?src=\ref[src];refresh=1'>Refresh</A>
 					<BR><A href='?src=\ref[src];setScreen=[NEWSCASTER_MENU]'>Back</A>"}
@@ -370,7 +370,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 					dat+="<I>No feed channels found active...</I><BR>"
 				else
 					for(var/datum/feed_channel/CHANNEL in news_network.network_channels)
-						dat+="<A href='?src=\ref[src];pick_censor_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR>"
+						dat+="<A href='?src=\ref[src];pick_censor_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
 				dat+="<BR><A href='?src=\ref[src];setScreen=[NEWSCASTER_MENU]'>Cancel</A>"
 			if(NEWSCASTER_D_NOTICE_MENU)
 
@@ -382,7 +382,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 					dat+="<I>No feed channels found active...</I><BR>"
 				else
 					for(var/datum/feed_channel/CHANNEL in news_network.network_channels)
-						dat+="<A href='?src=\ref[src];pick_d_notice=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR>"
+						dat+="<A href='?src=\ref[src];pick_d_notice=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
 
 				dat+="<BR><A href='?src=\ref[src];setScreen=[NEWSCASTER_MENU]'>Back</A>"
 			if(NEWSCASTER_CENSORSHIP_CHANNEL)

code/game/objects/items/toys.dm

@@ -511,10 +511,10 @@
 
 /*
  * Syndie stealthy smokebombs!
- */
+*/
- /obj/item/toy/snappop/smokebomb
+/obj/item/toy/snappop/smokebomb
- 	origin_tech = Tc_COMBAT + "=1;" + Tc_SYNDICATE + "=1"
 	flags = FPRINT | NO_THROW_MSG
+	origin_tech = Tc_COMBAT + "=1;" + Tc_SYNDICATE + "=1"
 
 /obj/item/toy/snappop/smokebomb/pop()
 	spark(src, 2, FALSE)

code/game/objects/structures/docking_port.dm

@@ -239,7 +239,7 @@ var/global/list/all_docking_ports = list()
 		choices += name
 		choices[name] = D
 
-	var/choice = input(user,message,title) in choices as text|null
+	var/choice = input(user,message,title) as null|anything in choices
 
 	var/obj/docking_port/destination/D = choices[choice]
 	if(istype(D))

code/game/objects/structures/girders.dm

@@ -131,7 +131,7 @@
 		if(R.amount < 2) //Do a first check BEFORE the user begins, in case he's using a single rod
 			to_chat(user, "<span class='warning'>You need more rods to finish the support struts.</span>")
 			return
-		user.visible_message("<span class='notice'>[user] starts inserting internal support struts into \the [src.]</span>", \
+		user.visible_message("<span class='notice'>[user] starts inserting internal support struts into \the [src].</span>", \
 		"<span class='notice'>You start inserting internal support struts into \the [src].</span>")
 		if(do_after(user, src,construction_length))
 			var/obj/item/stack/rods/O = W

code/game/objects/structures/vehicles/clowncart.dm

@@ -203,7 +203,7 @@
 		if(max_health >= HEALTH_FOR_FLOWER_RECHARGE)
 			if(do_after(user, src, 5))
 				W.reagents.remove_any(10)
-				var/tmp/bananas = reagents.get_reagent_amount(BANANA)
+				var/bananas = reagents.get_reagent_amount(BANANA)
 				reagents.remove_reagent(BANANA, bananas) //removing banan so it doesn't get transferred into the water flower
 				if(reagents.total_volume >= 10)
 					visible_message("<span class='notice'>The HONKTech pump has recharged [W].</span>")
@@ -337,7 +337,7 @@
 		new /obj/effect/decal/cleanable/crayon(pos, main = colour1, shade = colour2, type = printing_text)
 	else
 		if(printing_text == "paint")
-			var/tmp/turf/T = pos
+			var/turf/T = pos
 			var/ind = "[initial(T.icon)][colour1]"
 			if(!cached_icons[ind]) //shamelessly copied from paint.dm
 				var/icon/overlay = new/icon(initial(T.icon))

code/modules/admin/admin.dm

@@ -458,7 +458,7 @@ var/global/floorIsLava = 0
 					if(CHANNEL.is_admin_channel)
 						dat+="<B><FONT style='BACKGROUND-COLOR: LightGreen'><A href='?src=\ref[src];ac_show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A></FONT></B><BR>"
 					else
-						dat+="<B><A href='?src=\ref[src];ac_show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR></B>"
+						dat+="<B><A href='?src=\ref[src];ac_show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR></B>"
 			dat+={"<BR><HR><A href='?src=\ref[src];ac_refresh=1'>Refresh</A>
 				<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A>
 			"}
@@ -542,7 +542,7 @@ var/global/floorIsLava = 0
 				dat+="<I>No feed channels found active...</I><BR>"
 			else
 				for(var/datum/feed_channel/CHANNEL in news_network.network_channels)
-					dat+="<A href='?src=\ref[src];ac_pick_censor_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR>"
+					dat+="<A href='?src=\ref[src];ac_pick_censor_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
 			dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A>"
 		if(11)
 			dat+={"
@@ -555,7 +555,7 @@ var/global/floorIsLava = 0
 				dat+="<I>No feed channels found active...</I><BR>"
 			else
 				for(var/datum/feed_channel/CHANNEL in news_network.network_channels)
-					dat+="<A href='?src=\ref[src];ac_pick_d_notice=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR>"
+					dat+="<A href='?src=\ref[src];ac_pick_d_notice=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
 
 			dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A>"
 		if(12)

code/modules/admin/verbs/onlyone.dm

@@ -11,7 +11,7 @@
 			pickfrom += name
 			pickfrom[name] = D
 
-	var/event_type_name = input(user, "Select an event.", "THERE CAN BE ONLY ONE", null) in pickfrom as text|null
+	var/event_type_name = input(user, "Select an event.", "THERE CAN BE ONLY ONE", null) as null|anything in pickfrom
 	if(!event_type_name)
 		return
 	var/event_type = pickfrom[event_type_name]

code/modules/assembly/assembly_frame.dm

@@ -325,8 +325,7 @@
 		AS.toggle_secure() //Make it secured
 
 /obj/item/device/assembly_frame/proc/start_new_connection(obj/item/device/assembly/new_parent, obj/item/device/assembly/orphan)
-	var/list/active_connections = connections[new_parent
+	var/list/active_connections = connections[new_parent]
-	]
 	if(!active_connections) //If there ISN'T a list with connections
 		connections[new_parent] = list(orphan) //Make a new one
 	else

code/modules/assembly/speaker.dm

@@ -32,7 +32,7 @@
 /obj/item/device/assembly/speaker/attackby(obj/item/W as obj, mob/user as mob)
 	..()
 	if(istype(W,/obj/item/weapon/pen)) //pen
-		var/tmp/new_name = sanitize(input(user,"Enter new name for the [src]","NanoSpeaker Settings",name))
+		var/new_name = sanitize(input(user,"Enter new name for the [src]","NanoSpeaker Settings",name))
 		if(!Adjacent(user) || user.incapacitated())
 			return
 		if(new_name != "")

code/modules/clothing/accessories/tactical_light.dm

@@ -2,7 +2,7 @@
 	name = "tactical light"
 	desc = "This is attached to something."
 	icon_state = "taclight"
-	accessory_exclusion = LIGHT
+	accessory_exclusion = ACCESSORY_LIGHT
 	var/obj/item/device/flashlight/tactical/source_light
 	ignoreinteract = TRUE
 	

code/modules/fish/fish_tank.dm

@@ -363,7 +363,7 @@
 	update_icon()
 
 /obj/machinery/fishtank/proc/seadevil_eat()
-	var/tmp/list/fish_to_eat = fish_list.Copy()
+	var/list/fish_to_eat = fish_list.Copy()
 	fish_to_eat.Remove("sea devil")
 	var/eat_target = pick(fish_to_eat)
 	visible_message("<span class='notice'>The sea devil devours \an [eat_target].</span>")
@@ -393,7 +393,7 @@
 /obj/machinery/fishtank/proc/recursive_valid_egg(var/list/pick_egg_from)
 	var/fish = pick(pick_egg_from)
 	if(!fish || nonhatching_types.Find(fish))
-		var/tmp/list/new_list = pick_egg_from.Copy()
+		var/list/new_list = pick_egg_from.Copy()
 		return recursive_valid_egg(new_list.Remove(fish))
 		//If it's a nonvalid type, let's try again without it.
 	else

code/modules/hydroponics/hydroponics_mutations.dm

@@ -19,7 +19,7 @@
 
 	//Is the plant still a sapling? If so, try to mutate species, otherwise do something bad.
 	if(age < 3)
-		if(seed.mutants. && seed.mutants.len)
+		if(seed.mutants && seed.mutants.len)
 			if(prob(30))
 				mutate_species()
 				return

code/modules/mob/living/living_defense.dm

@@ -58,7 +58,7 @@
 
 
 /mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone)
-	var/obj/item/weapon/cloaking_device/C = locate((/obj/item/weapon/cloaking_device) in src)
+	var/obj/item/weapon/cloaking_device/C = locate(/obj/item/weapon/cloaking_device) in src
 	if(C && C.active)
 		C.attack_self(src)//Should shut it off
 		update_icons()

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

@@ -1045,7 +1045,7 @@ var/global/borer_unlock_types_leg = typesof(/datum/unlockable/borer/leg) - /datu
 
 	else
 		to_chat(src, "You do not have enough chemicals stored to reproduce.")
-		return()
+		return
 
 //Procs for grabbing players.
 /mob/living/simple_animal/borer/proc/request_player()

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

@@ -705,7 +705,7 @@
 	..()
 
 	if(!incapacitated() && !resting && !locked_to && !client)
-		var/list/can_see() = view(src, 6) //Might need tweaking.
+		var/list/can_see = view(src, 6) //Might need tweaking.
 		if(victim && (!IsVictim(victim) || !(victim.loc in can_see)))
 			victim = null
 			stop_automated_movement = FALSE

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

@@ -93,7 +93,7 @@
 
 
 	if(!isUnconscious())
-		var/list/can_see() = view(src, 5) //Decent radius, not too large so they're attracted across rooms, but large enough to attract them to mousetraps
+		var/list/can_see = view(src, 5) //Decent radius, not too large so they're attracted across rooms, but large enough to attract them to mousetraps
 
 		if(!food_target && (!client || nutrition <= MOUSEHUNGRY)) //Regular mice will be moved towards food, mice with a client won't be moved unless they're desperate
 			for(var/obj/item/weapon/reagent_containers/food/snacks/C in can_see)

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

@@ -517,8 +517,8 @@ obj/item/asteroid/basilisk_hide/New()
 			return
 		if(C.clothing_flags & GOLIATHREINFORCE)
 			C.hidecount ++
-			if(current_armor.["melee"] < 90)
+			if(current_armor["melee"] < 90)
-				current_armor.["melee"] = min(current_armor.["melee"] + 10, 90)
+				current_armor["melee"] = min(current_armor["melee"] + 10, 90)
 				to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
 				qdel(src)
 			else

code/modules/organs/blood.dm

@@ -343,7 +343,7 @@ proc/get_blood(datum/reagents/container)
 proc/blood_incompatible(donor,receiver)
 	if(!donor || !receiver)
 		return 0
-	
+
 	var/donor_antigen = copytext(donor,1,lentext(donor))
 	var/receiver_antigen = copytext(receiver,1,lentext(receiver))
 	var/donor_rh = (findtext(donor,"+")>0)

code/modules/projectiles/targeting.dm

@@ -130,12 +130,10 @@ proc/GunTrace(X1,Y1,X2,Y2,Z=1,exc_obj,PX1=16,PY1=16,PX2=16,PY2=16)
 					return M
 				Y1+=s
 	else
-		
 		var/m=(WORLD_ICON_SIZE*(Y2-Y1)+(PY2-PY1))/(WORLD_ICON_SIZE*(X2-X1)+(PX2-PX1))
 		var/b=(Y1+PY1/WORLD_ICON_SIZE-0.015625)-m*(X1+PX1/WORLD_ICON_SIZE-0.015625) //In tiles
 		var/signX = SIGN(X2-X1)
 		var/signY = SIGN(Y2-Y1)
-
 		if(X1<X2)
 			b+=m
 		while(1)

code/modules/research/rdmachines.dm

@@ -235,7 +235,7 @@ var/global/list/rnd_machines = list()
 		icon_state = "[base_state]"
 		use_power(max(1000, (3750*amount/10)))
 		stack.use(amount)
-		to_chat(user, "<span class='notice'>You add [amount] sheet[amount > 1 ? "s":""] to the [src.].</span>")
+		to_chat(user, "<span class='notice'>You add [amount] sheet[amount > 1 ? "s":""] to the [src].</span>")
 		icon_state = "[base_state]"
 
 		var/datum/material/material = materials.getMaterial(found)

goon/code/obj/machinery/bot/chefbot.dm

@@ -193,7 +193,8 @@
 					visible_message("<span class='danger'>[M] has attempted to punch [src]!</span>")
 				if(src.health <= 0)
 					src.explode()
-			M.delayNextAttack(10)
+
+		M.delayNextAttack(10)
 	..()
 
 /obj/machinery/bot/chefbot/kick_act()