diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
index 6b0bddb2f0af..6e0a52c8248d 100644
--- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
+++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
@@ -57,15 +57,15 @@
 
 	if(istype(ordered, /obj/vehicle/multitile/tank))
 		selected_vehicle = "TANK"
-		gearcomp.available_categories = VEHICLE_ALL_AVAILABLE
+		available_categories = VEHICLE_ALL_AVAILABLE
+
+	else if(istype(ordered, /obj/vehicle/multitile/arc))
+		selected_vehicle = "ARC"
+		available_categories = VEHICLE_ALL_AVAILABLE
 
 	else if(istype(ordered, /obj/vehicle/multitile/apc))
 		selected_vehicle = "APC"
-		gearcomp.available_categories = VEHICLE_PRIMARY_AVAILABLE|VEHICLE_SECONDARY_AVAILABLE|VEHICLE_SUPPORT_AVAILABLE|VEHICLE_TREADS_AVAILABLE
-
-	else if(istype(ordered, /obj/vehicle/multitile/arc))
-		gearcomp.selected_vehicle = "ARC"
-		gearcomp.available_categories = VEHICLE_ALL_AVAILABLE
+		available_categories = VEHICLE_PRIMARY_AVAILABLE|VEHICLE_SECONDARY_AVAILABLE|VEHICLE_SUPPORT_AVAILABLE|VEHICLE_TREADS_AVAILABLE
 
 /obj/structure/machinery/cm_vending/gear/vehicle_crew/get_listed_products(mob/user)
 	var/list/display_list = list()
@@ -82,7 +82,7 @@
 	else if(selected_vehicle == "ARC")
 		display_list = GLOB.cm_vending_vehicle_crew_arc
 
-	else if(selected_vehicle == "TANK")
+	else if(selected_vehicle == "APC")
 		if(available_categories)
 			display_list = GLOB.cm_vending_vehicle_crew_apc
 		else //APC stuff costs more to prevent 4000 points spent on shitton of ammunition
diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm
index ecdfba00719d..78196500c020 100644
--- a/code/game/objects/items/circuitboards/computer.dm
+++ b/code/game/objects/items/circuitboards/computer.dm
@@ -224,18 +224,6 @@
 /obj/item/circuitboard/computer/supplycomp/vehicle
 	name = "Circuit board (vehicle ASRS console)"
 	build_path = /obj/structure/machinery/computer/supplycomp/vehicle
-	var/spent = FALSE //so that they can't just reconstruct the console to get another APC
-	var/tank_unlocked = FALSE
-
-/obj/item/circuitboard/computer/supplycomp/vehicle/construct(obj/structure/machinery/computer/supplycomp/vehicle/SCV)
-	if (..(SCV))
-		SCV.spent = spent
-		SCV.tank_unlocked = tank_unlocked
-
-/obj/item/circuitboard/computer/supplycomp/vehicle/disassemble(obj/structure/machinery/computer/supplycomp/vehicle/SCV)
-	if (..(SCV))
-		spent = SCV.spent
-		tank_unlocked = SCV.tank_unlocked
 
 /obj/item/circuitboard/computer/operating
 	name = "Circuit board (Operating Computer)"
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index b551775f6c41..80cdead85e19 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -1437,7 +1437,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
 		world.log << "## ERROR: Eek. The supply/elevator datum is missing somehow."
 		return
 
-	if(isturf(loc) && (in_range(src, usr) || ishighersilicon(usr)))
+	if(isturf(loc) && (in_range(src, usr) || isSilicon(usr)))
 		usr.set_interaction(src)
 
 	if(href_list["lower_platform"])
@@ -1462,7 +1462,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
 
 		in_stock -= order
 
-		var/obj/effect/vehicle_spawner/vehicle_spawner = new order.ordered_vehicle(middle_turf, faction_to_get, TRUE)
+		var/obj/effect/vehicle_spawner/vehicle_spawner = new order.ordered_vehicle(middle_turf)
 		var/obj/vehicle/multitile/ordered_vehicle = vehicle_spawner.spawn_vehicle()
 		SSshuttle.vehicle_elevator.request(SSshuttle.getDock("almayer vehicle"))
 
diff --git a/code/modules/cm_tech/implements/tank.dm b/code/modules/cm_tech/implements/tank.dm
index cdb6f7698588..e0b51e06abef 100644
--- a/code/modules/cm_tech/implements/tank.dm
+++ b/code/modules/cm_tech/implements/tank.dm
@@ -17,7 +17,6 @@
 	name = "tank coupon"
 	desc = "We're done playing! This coupon allows the ship crew to retrieve a complete Longstreet tank from Vehicle ASRS. Make sure to send the ASRS lift down so it can be retrieved. One use only. LTB not included. Comes with free friendly fire."
 	vehicle_type = /datum/vehicle_order/tank/broken
-	vehicle_category = "LONGSTREET"
 
 /obj/item/vehicle_coupon/attack_self(mob/user)
 	if(QDELETED(src))
@@ -37,7 +36,7 @@
 		return
 
 	. = TRUE
-	comp.vehicles += new vehicle_type()
+	comp.in_stock += new vehicle_type()
 
 	comp.allowed_roles = null
 
diff --git a/code/modules/cm_tech/techs/marine/tier1/arc.dm b/code/modules/cm_tech/techs/marine/tier1/arc.dm
index 9de8a0c0eafb..118065dbe488 100644
--- a/code/modules/cm_tech/techs/marine/tier1/arc.dm
+++ b/code/modules/cm_tech/techs/marine/tier1/arc.dm
@@ -21,7 +21,7 @@
 	if(!comp || !gearcomp)
 		return FALSE
 
-	comp.vehicles += new /datum/vehicle_order/arc()
+	comp.in_stock += new /datum/vehicle_order/arc()
 	comp.allowed_roles = list(JOB_SYNTH, JOB_SEA, JOB_SO, JOB_XO, JOB_CO, JOB_GENERAL)
 	comp.req_access = list(ACCESS_MARINE_COMMAND)
 	comp.req_one_access = list()