moar deconflicting

code/modules/shuttle/shuttle.dm

@@ -837,10 +837,7 @@
 	req_access = list(access_cent_general)
 	shuttleId = "specops"
 	possible_destinations = "specops_home;specops_away"
-<<<<<<< HEAD
 	resistance_flags = INDESTRUCTIBLE
-=======
->>>>>>> refs/remotes/ParadiseSS13/master
 
 /obj/machinery/computer/shuttle/white_ship
 	name = "White Ship Console"
@@ -855,6 +852,7 @@
 	circuit = /obj/item/circuitboard/golem_ship
 	shuttleId = "freegolem"
 	possible_destinations = "freegolem_z3;freegolem_z5;freegolem_z1;freegolem_z6"
+	resistance_flags = INDESTRUCTIBLE
 
 /obj/machinery/computer/shuttle/golem_ship/attack_hand(mob/user)
 	if(!isgolem(user))
@@ -862,12 +860,6 @@
 		return
 	..()
 
-/obj/machinery/computer/shuttle/vox
-	name = "skipjack control console"
-	req_access = list(access_vox)
-	shuttleId = "skipjack"
-	possible_destinations = "skipjack_away;skipjack_ne;skipjack_nw;skipjack_se;skipjack_sw;skipjack_z5"
-
 /obj/machinery/computer/shuttle/engineering
 	name = "Engineering Shuttle Console"
 	desc = "Used to call and send the engineering shuttle."