here we go again (#2456)

code/modules/mining/laborcamp/laborshuttle.dm

@@ -1,7 +1,7 @@
 /obj/machinery/computer/shuttle/labor
 	name = "labor shuttle console"
 	desc = "Used to call and send the labor camp shuttle."
-	circuit = /obj/item/weapon/circuitboard/computer/labor_shuttle
+	circuit = /obj/item/circuitboard/computer/labor_shuttle
 	shuttleId = "laborcamp"
 	possible_destinations = "laborcamp_home;laborcamp_away"
 	req_access = list(ACCESS_BRIG)
@@ -11,7 +11,7 @@
 	name = "prisoner shuttle console"
 	desc = "A one-way shuttle console, used to summon the shuttle to the labor camp."
 	possible_destinations = "laborcamp_away"
-	circuit = /obj/item/weapon/circuitboard/computer/labor_shuttle/one_way
+	circuit = /obj/item/circuitboard/computer/labor_shuttle/one_way
 	req_access = list( )
 
 /obj/machinery/computer/shuttle/labor/one_way/Topic(href, href_list)

code/modules/mining/laborcamp/laborstacker.dm

@@ -9,7 +9,7 @@
 	anchored = TRUE
 	var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
 	var/machinedir = SOUTH
-	var/obj/item/weapon/card/id/prisoner/inserted_id
+	var/obj/item/card/id/prisoner/inserted_id
 	var/obj/machinery/door/airlock/release_door
 	var/door_tag = "prisonshuttle"
 	var/obj/item/device/radio/Radio //needed to send messages to sec radio
@@ -22,7 +22,7 @@
 	locate_stacking_machine()
 
 /obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/card/id/prisoner))
+	if(istype(I, /obj/item/card/id/prisoner))
 		if(!inserted_id)
 			if(!user.drop_item())
 				return
@@ -82,7 +82,7 @@
 					inserted_id = null
 			else
 				var/obj/item/I = usr.get_active_held_item()
-				if(istype(I, /obj/item/weapon/card/id/prisoner))
+				if(istype(I, /obj/item/card/id/prisoner))
 					if(!usr.drop_item())
 						return
 					I.forceMove(src)
@@ -155,9 +155,9 @@
 	user.examinate(src)
 
 /obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/card/id))
-		if(istype(I, /obj/item/weapon/card/id/prisoner))
-			var/obj/item/weapon/card/id/prisoner/prisoner_id = I
+	if(istype(I, /obj/item/card/id))
+		if(istype(I, /obj/item/card/id/prisoner))
+			var/obj/item/card/id/prisoner/prisoner_id = I
 			to_chat(user, "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>")
 			to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.points]</span>")
 			to_chat(user, "<span class='notice'>Point Quota: [prisoner_id.goal]</span>")