Remove taxi and taxi accessories (#20234)

* Remove taxi and taxi accessories

* fuck

code/game/area/Space Station 13 areas.dm

@@ -450,45 +450,6 @@ proc/process_adminbus_teleport_locs()
 	name = "\improper Trading Post"
 	icon_state = "yellow"
 
-// Taxi Shuttle
-
-/area/shuttle/taxi_a
-	name = "Taxi A"
-	requires_power = 0
-
-/area/shuttle/taxi_a/medcal_silicon_station
-	icon_state = "bluenew"
-
-/area/shuttle/taxi_a/engineering_cargo_station
-	icon_state = "bluenew"
-
-/area/shuttle/taxi_a/security_science_station
-	icon_state = "bluenew"
-
-/area/shuttle/taxi_a/abandoned_station
-	icon_state = "bluenew"
-
-// B
-
-/area/shuttle/taxi_b
-	name = "Taxi B"
-	requires_power = 0
-
-/area/shuttle/taxi_b/medcal_silicon_station
-	icon_state = "dk_yellow"
-
-/area/shuttle/taxi_b/engineering_cargo_station
-	icon_state = "dk_yellow"
-
-/area/shuttle/taxi_b/security_science_station
-	icon_state = "dk_yellow"
-
-/area/shuttle/taxi_b/abandoned_station
-	icon_state = "dk_yellow"
-
-// End Taxi Shuttle
-
-
 
 /area/airtunnel1/      // referenced in airtunnel.dm:759
 

code/game/jobs/access.dm

@@ -66,7 +66,7 @@
 /var/const/access_psychiatrist = 64 // Psychiatrist's office
 /var/const/access_salvage_captain = 65 // Salvage ship captain's quarters
 /var/const/access_weapons = 66 //Weapon authorization for secbots
-/var/const/access_taxi = 67 // Taxi drivers
+
 /var/const/access_shop = 68
 /var/const/access_biohazard = 69 // Virology crates
 	//BEGIN CENTCOM ACCESS
@@ -236,7 +236,7 @@
 	            access_hydroponics, access_library, access_lawyer, access_virology, access_psychiatrist, access_cmo, access_qm, access_clown, access_mime, access_surgery,
 	            access_theatre, access_science, access_mining, access_mailsorting,access_weapons,
 	            access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
-	            access_keycard_auth, access_tcomsat, access_gateway, /*vg paramedic*/, access_paramedic, access_mechanic, access_taxi, access_biohazard)
+	            access_keycard_auth, access_tcomsat, access_gateway, /*vg paramedic*/, access_paramedic, access_mechanic, access_biohazard)
 
 /proc/get_absolutely_all_accesses()
 	return ((get_all_accesses() | get_all_centcom_access() | get_all_syndicate_access()) + access_salvage_captain + access_trade)
@@ -275,7 +275,7 @@
 		if(6) //station general
 			return list(access_shop, access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime)
 		if(7) //supply
-			return list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm, access_taxi)
+			return list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm)
 
 /proc/get_region_accesses_name(var/code)
 	switch(code)
@@ -436,8 +436,6 @@
 			return "Paramedic Station"
 		if(access_weapons)
 			return "Weapon Permit"
-		if(access_taxi)
-			return "Taxi Shuttle"
 		if(access_mechanic)
 			return "Mechanics Workshop"
 

code/game/jobs/job/captain.dm

@@ -79,13 +79,13 @@
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_theatre, access_chapel_office, access_library, access_science, access_mining, access_heads_vault, access_mining_station,
-			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_taxi)
+			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_weapons, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_theatre, access_chapel_office, access_library, access_science, access_mining, access_heads_vault, access_mining_station,
-			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_taxi)
+			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway)
 
 	pdaslot=slot_l_store
 	pdatype=/obj/item/device/pda/heads/hop

code/game/jobs/job/civilian.dm

@@ -163,8 +163,8 @@
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
 	idtype = /obj/item/weapon/card/id/supply
-	access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_taxi)
+	access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
-	minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_taxi)
+	minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
 
 	pdaslot=slot_belt
 	pdatype=/obj/item/device/pda/quartermaster
@@ -206,8 +206,8 @@
 	supervisors = "the quartermaster and the head of personnel"
 	selection_color = "#dddddd"
 	idtype = /obj/item/weapon/card/id/supply
-	access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mint, access_mining, access_mining_station, access_taxi)
+	access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mint, access_mining, access_mining_station)
-	minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting, access_taxi)
+	minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
 
 	pdaslot=slot_belt
 	pdatype=/obj/item/device/pda/cargo

code/game/machinery/computer/pod.dm

@@ -301,12 +301,3 @@
 	name = "Magix System IV"
 	desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
 	circuit = /obj/item/weapon/circuitboard/swfdoor
-
-
-//The automatic mass driver control in taxi's delivery office, controls the disposals network.
-/obj/machinery/computer/pod/disposal
-	name = "Disposal Network Mass Driver Control Computer"
-	default_loop = 1
-	default_time = 10
-	default_timings = 1
-	id_tags = list("disposal_network")

code/game/machinery/computer/taxi_shuttle.dm

@@ -1,188 +0,0 @@
-////////////////////
-// TAXI SHUTTLES  //
-////////////////////
-
-var/global/list/taxi_computers = list()
-
-/obj/machinery/computer/taxi_shuttle
-	name = "taxi shuttle terminal"
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "syndishuttle"
-	req_access = list(access_taxi)
-
-	machine_flags = EMAGGABLE | MULTITOOL_MENU | SHUTTLEWRENCH //Can be emagged, can be wrenched to shuttles (they SHOULDN'T get unwrenched, but who knows what might happen)
-
-	var/datum/shuttle/taxi/shuttle //The shuttle this computer is connected to
-
-	var/id_tag = ""
-	var/letter = ""
-	var/list/connected_buttons = list()
-
-	light_color = LIGHT_COLOR_RED
-
-/obj/machinery/computer/taxi_shuttle/New()
-	..()
-	taxi_computers += src
-
-/obj/machinery/computer/taxi_shuttle/Destroy()
-	taxi_computers -= src
-	connected_buttons = list()
-	..()
-
-
-/obj/machinery/computer/taxi_shuttle/update_icon()
-	..()
-	icon_state = "syndishuttle"
-
-/obj/machinery/computer/taxi_shuttle/proc/taxi_move_to(var/obj/docking_port/destination/destination, var/wait_time)
-	/*if(shuttle.moving)
-		return
-	if(!shuttle.can_move())
-		return
-	if(shuttle.current_port == destination)
-		return
-
-	broadcast("[capitalize(shuttle.name)] will move in [wait_time / 10] second\s.")
-
-	sleep(wait_time)
-
-	shuttle.move_to_dock(destination)
-
-	if(shuttle.current_port == destination)
-		return 1*/
-	if(shuttle.moving)
-		return
-	if(!shuttle.can_move())
-		return
-	if(shuttle.current_port == destination)
-		return
-
-	shuttle.pre_flight_delay = wait_time
-
-	broadcast("[capitalize(shuttle.name)] will move in [wait_time / 10] second\s.")
-
-	return shuttle.travel_to(destination)
-
-
-/obj/machinery/computer/taxi_shuttle/proc/broadcast(var/message = "")
-	if(message)
-		src.visible_message("[bicon(src)]" + message)
-	else
-		return
-	for(var/obj/machinery/door_control/taxi/TB in connected_buttons)
-		TB.visible_message("[bicon(TB)]" + message)
-
-/obj/machinery/computer/taxi_shuttle/attackby(obj/item/I as obj, mob/user as mob)
-	if(..())
-		return 1
-	return attack_hand(user)
-
-/obj/machinery/computer/taxi_shuttle/attack_ai(mob/user as mob)
-	src.add_hiddenprint(user)
-	return attack_hand(user)
-
-/obj/machinery/computer/taxi_shuttle/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
-/obj/machinery/computer/taxi_shuttle/attack_hand(mob/user as mob)
-
-	user.set_machine(src)
-
-	var/dat
-
-	if(shuttle.lockdown)
-		dat += "<h2><font color='red'>THIS TAXI IS LOCKED DOWN</font></h2><br>"
-		if(istext(shuttle.lockdown))
-			dat += shuttle.lockdown
-		else
-			dat += "Additional information has not been provided."
-	else if(!shuttle.linked_area)
-		dat = "<h2><font color='red'>UNABLE TO FIND [uppertext(shuttle.name)]</font></h2>"
-	else if(!shuttle.linked_port)	//User friendly interface
-		dat += "<h2><font color='red'>ERROR: Unable to find the docking port. Please contact tech support.</font></h2><br>"
-	else if(shuttle.moving)
-		dat += "<center><h3>Currently moving [shuttle.destination_port.areaname ? "to [shuttle.destination_port.areaname]" : ""]</h3></center>"
-	else
-		dat = {"[shuttle.current_port ? "Location: [shuttle.current_port.areaname]" : "Location: UNKNOWN"]<br>
-			Ready to move[max(shuttle.last_moved + shuttle.cooldown - world.time, 0) ? " in [max(round((shuttle.last_moved + shuttle.cooldown - world.time) * 0.1), 0)] seconds" : ": now"]<br><br>
-			<a href='?src=\ref[src];med_sili=1'>[shuttle.dock_medical_silicon.areaname]</a><br>
-			<a href='?src=\ref[src];engi_cargo=1'>[shuttle.dock_engineering_cargo.areaname]</a><br>
-			<a href='?src=\ref[src];sec_sci=1'>[shuttle.dock_security_science.areaname]</a><br>
-			[emagged ? "<a href='?src=\ref[src];abandoned=1'>Abandoned Station</a><br>" : ""]"}
-
-	user << browse(dat, "window=computer;size=575x450")
-	onclose(user, "computer")
-	return
-
-/obj/machinery/computer/taxi_shuttle/emag(mob/user)
-	if(!emagged)
-		emagged = 1
-		req_access = list()
-		return 1
-	return 0
-
-/obj/machinery/computer/taxi_shuttle/power_change()
-	return
-
-/obj/machinery/computer/taxi_shuttle/Topic(href, href_list)
-	if(..())
-		return 1
-	var/mob/user = usr
-
-	user.set_machine(src)
-
-	for(var/place in href_list)
-		if(href_list[place])
-			if(!allowed(user))
-				callTo(place, shuttle.move_time_no_access)
-			else
-				callTo(place, shuttle.move_time_access) //otherwise, double quick time
-
-	add_fingerprint(usr)
-	updateUsrDialog()
-	return
-
-/obj/machinery/computer/taxi_shuttle/proc/callTo(var/place = "", var/wait_time)
-	switch(place)
-		if("med_sili")
-			if (taxi_move_to(shuttle.dock_medical_silicon, wait_time))
-				return 1
-		if("engi_cargo")
-			if (taxi_move_to(shuttle.dock_engineering_cargo, wait_time))
-				return 1
-		if("sec_sci")
-			if (taxi_move_to(shuttle.dock_security_science, wait_time))
-				return 1
-		if("abandoned")
-			if (taxi_move_to(shuttle.dock_abandoned, wait_time))
-				return 1
-	return
-
-/obj/machinery/computer/taxi_shuttle/bullet_act(var/obj/item/projectile/Proj)
-	visible_message("[Proj] ricochets off [src]!")
-
-
-////////////////////
-// TAXI SHUTTLE A //
-////////////////////
-/obj/machinery/computer/taxi_shuttle/taxi_a
-	name = "taxi shuttle terminal A"
-	id_tag = "taxi_a"
-	letter = "A"
-
-/obj/machinery/computer/taxi_shuttle/taxi_a/New()
-	..()
-	shuttle = taxi_a
-
-////////////////////
-// TAXI SHUTTLE B //
-////////////////////
-
-/obj/machinery/computer/taxi_shuttle/taxi_b
-	name = "taxi shuttle terminal B"
-	id_tag = "taxi_b"
-	letter = "B"
-
-/obj/machinery/computer/taxi_shuttle/taxi_b/New()
-	..()
-	shuttle = taxi_b

code/game/machinery/taxi_buttons.dm

@@ -1,79 +1,12 @@
-/obj/machinery/door_control/taxi
-	name = "taxi caller"
-	desc = "TAXI!"
-	var/destination
-	power_channel = ENVIRON
-	req_access = list(access_taxi)
-	var/obj/machinery/computer/taxi_shuttle/connected_computer
-
-/obj/machinery/door_control/taxi/New()
-	..()
-
-	if(ticker)
-		initialize()
-
-/obj/machinery/door_control/taxi/initialize()
-	..()
-	for(var/obj/machinery/computer/taxi_shuttle/TS in taxi_computers)
-		if(id_tag == TS.id_tag)
-			connected_computer = TS
-			if(!(src in connected_computer.connected_buttons))
-				connected_computer.connected_buttons += src
-			break
-
-/obj/machinery/door_control/taxi/attack_hand(mob/user as mob)
-	src.add_fingerprint(usr)
-	if(stat & (NOPOWER|BROKEN))
-		return
-
-	if(!connected_computer)
-		user.show_message("<span class='warning'>No request could be made to the Taxi Computer! Make contact with Centcomm to report them the issue!</span>", 2)
-		initialize() //Try connecting again
-		return
-
-	var/datum/shuttle/taxi/T = connected_computer.shuttle
-	if(!T)
-		user.show_message("<span class='warning'>The Taxi Computer was unable to enstablish connection with the taxi shuttle. Please contact tech support.</span>")
-		return
-
-	var/wait_time = T.move_time_access
-
-	if(!allowed(user) && (wires & 1))
-		wait_time = T.move_time_no_access
-
-	use_power(5)
-	icon_state = "doorctrl1"
-	add_fingerprint(user)
-
-	spawn
-		if(!connected_computer.callTo(destination, wait_time))
-			if( (T.cooldown - (world.time - T.last_moved)) > 0) //If it's going to show a negative value, there's something else wrong
-				src.visible_message("Taxi engines are on cooldown for the next [round((T.cooldown - (world.time - T.last_moved)) / 10)] second\s. Please wait before trying again.")
-
-	spawn(30)
-		icon_state = initial(icon_state)
-
 /obj/machinery/door_control/taxi/abandoned
 	name = "taxi caller"
 	desc = "...Taxi?"
-	destination = "abandoned"
-	id_tag = "taxi_null"
 	req_access = list()
 
-/obj/machinery/door_control/taxi/abandoned/attack_hand(mob/user as mob)
+/obj/machinery/door_control/taxi/abandoned/attack_hand(mob/user)
-	src.add_fingerprint(usr)
-	if(stat & (NOPOWER|BROKEN))
-		return
-
-	if(!allowed(user) && (wires & 1))
-		to_chat(user, "<span class='rose'>Access Denied.</span>")
-		flick("doorctrl-denied",src)
-		return
-
-	icon_state = "doorctrl1"
 	add_fingerprint(user)
+	icon_state = "doorctrl1"
+	visible_message("<span class='rose'>UNKNOWN TAXI engines are on cooldown. Plea-</span>")
 
-	src.visible_message("<span class='rose'>UNKNOWN TAXI engines are on cooldown. Plea-</span>")
+	spawn(3 SECONDS)
-
-	spawn(30)
 		icon_state = initial(icon_state)

code/game/objects/items/weapons/cards_ids.dm

@@ -621,7 +621,7 @@
 	registered_name = "Cargonian"
 	icon_state = "cargo"
 	desc = "ROH ROH! HEIL THE QUARTERMASTER!"
-	access = list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm, access_taxi)
+	access = list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm)
 
 /obj/item/weapon/card/id/engineering
 	name = "Engineering ID"

code/game/shuttles/taxi.dm

@@ -1,105 +0,0 @@
-#define TAXI_SHUTTLE_MOVE_TIME 0
-#define TAXI_SHUTTLE_COOLDOWN 100
-
-#define TAXI_A_NAME "taxi A"
-#define TAXI_B_NAME "taxi B"
-
-#define TAXI_A_STARTING_AREA /area/shuttle/taxi_a/engineering_cargo_station
-#define TAXI_B_STARTING_AREA /area/shuttle/taxi_b/engineering_cargo_station
-
-var/global/datum/shuttle/taxi/a/taxi_a = new(starting_area = TAXI_A_STARTING_AREA)
-
-var/global/datum/shuttle/taxi/b/taxi_b = new(starting_area = TAXI_B_STARTING_AREA)
-
-/datum/shuttle/taxi
-	var/move_time_access = 20
-	var/move_time_no_access = 60
-
-	var/obj/docking_port/destination/dock_medical_silicon
-	var/obj/docking_port/destination/dock_engineering_cargo
-	var/obj/docking_port/destination/dock_security_science
-	var/obj/docking_port/destination/dock_abandoned
-
-	collision_type = COLLISION_DISPLACE
-
-	pre_flight_delay = TAXI_SHUTTLE_MOVE_TIME
-
-	transit_delay = 60
-
-	cooldown = TAXI_SHUTTLE_COOLDOWN
-
-	stable = 1 //Don't stun everyone and don't throw anything when moving
-
-/datum/shuttle/taxi/is_special()
-	return 1
-
-//TAXI A
-
-/datum/shuttle/taxi/a
-	name = TAXI_A_NAME
-
-/datum/shuttle/taxi/a/initialize()
-	.=..()
-	dock_medical_silicon = add_dock(/obj/docking_port/destination/taxi/a/medbay_silicon)
-	dock_engineering_cargo = add_dock(/obj/docking_port/destination/taxi/a/engi_cargo)
-	dock_security_science = add_dock(/obj/docking_port/destination/taxi/a/sec_sci)
-	dock_abandoned = add_dock(/obj/docking_port/destination/taxi/a/derelict)
-
-	set_transit_dock(/obj/docking_port/destination/taxi/a/transit)
-
-//TAXI B
-
-/datum/shuttle/taxi/b
-	name = TAXI_B_NAME
-
-/datum/shuttle/taxi/b/initialize()
-	.=..()
-	dock_medical_silicon = add_dock(/obj/docking_port/destination/taxi/b/medbay_silicon)
-	dock_engineering_cargo = add_dock(/obj/docking_port/destination/taxi/b/engi_cargo)
-	dock_security_science = add_dock(/obj/docking_port/destination/taxi/b/sec_sci)
-	dock_abandoned = add_dock(/obj/docking_port/destination/taxi/b/derelict)
-
-	set_transit_dock(/obj/docking_port/destination/taxi/b/transit)
-
-//Taxi computers are located in code\game\machinery\computer\taxi_shuttle.dm
-
-//code/game/objects/structures/docking_port.dm
-
-/obj/docking_port/destination/taxi
-	areaname = "taxi"
-
-/obj/docking_port/destination/taxi/a/medbay_silicon
-	areaname = "Medical and Silicon Station"
-
-/obj/docking_port/destination/taxi/a/engi_cargo
-	areaname = "Engineering and Cargo Station"
-
-/obj/docking_port/destination/taxi/a/sec_sci
-	areaname = "Security and Science Station"
-
-/obj/docking_port/destination/taxi/a/derelict
-	areaname = "Abandoned Station"
-
-/obj/docking_port/destination/taxi/a/transit
-	areaname = "Hyperspace (taxi A)"
-
-/obj/docking_port/destination/taxi/b/medbay_silicon
-	areaname = "Medical and Silicon Station"
-
-/obj/docking_port/destination/taxi/b/engi_cargo
-	areaname = "Engineering and Cargo Station"
-
-/obj/docking_port/destination/taxi/b/sec_sci
-	areaname = "Security and Science Station"
-
-/obj/docking_port/destination/taxi/b/derelict
-	areaname = "Abandoned Station"
-
-/obj/docking_port/destination/taxi/b/transit
-	areaname = "Hyperspace (taxi B)"
-
-#undef TAXI_A_NAME
-#undef TAXI_B_NAME
-
-#undef TAXI_SHUTTLE_MOVE_TIME
-#undef TAXI_SHUTTLE_COOLDOWN

code/modules/admin/topic.dm

@@ -4414,8 +4414,6 @@
 						locations += list("Vox home (MOVING TO IT WILL END THE ROUND)" = "dock_home")
 					if(/datum/shuttle/escape)
 						locations += list("Escape shuttle home" = "dock_station","Escape shuttle centcom" = "dock_centcom")
-					if(/datum/shuttle/taxi)
-						locations += list("Taxi medbay silicon" = "dock_medical_silicon","Taxi engineering cargo" = "dock_engineering_cargo","Taxi security science" = "dock_security_science","Taxi abandoned station" = "dock_abandoned")
 					if(/datum/shuttle/supply)
 						locations += list("Centcom loading bay" = "dock_centcom", "Station cargo bay" = "dock_station")
 

code/modules/client/global cache.dm

@@ -160,7 +160,6 @@
 		"pda_minimap_box.png"	= 'icons/pda_icons/pda_minimap_box.png',
 		"pda_minimap_bg_notfound.png"	= 'icons/pda_icons/pda_minimap_bg_notfound.png',
 		"pda_minimap_deff.png"					= 'icons/pda_icons/pda_minimap_deff.png',
-		"pda_minimap_taxi.png"					= 'icons/pda_icons/pda_minimap_taxi.png',
 		"pda_minimap_meta.png"				= 'icons/pda_icons/pda_minimap_meta.png',
 		"pda_minimap_loc.gif"					= 'icons/pda_icons/pda_minimap_loc.gif',
 		"pda_minimap_mkr.gif"					= 'icons/pda_icons/pda_minimap_mkr.gif'

code/modules/recycling/sortingmachinery.dm

@@ -535,41 +535,3 @@
 
 /obj/machinery/sorting_machine/destination/unwrapped
 	unwrapped = 1
-
-/obj/machinery/sorting_machine/destination/taxi_engi
-	sorting = list(
-		"QM OFFICE",
-		"CARGO BAY",
-		"JANITOR CLOSET",
-		"HOP OFFICE",
-		"HYDROPONICS",
-		"KITCHEN",
-		"THEATRE",
-		"BAR",
-		"ATMOSPHERICS",
-		"CE OFFICE",
-		"ENGINEERING"
-	)
-
-/obj/machinery/sorting_machine/destination/taxi_engi/unwrapped
-	unwrapped = 1
-
-/obj/machinery/sorting_machine/destination/taxi_med
-	sorting = list(
-		"MEDBAY",
-		"CMO OFFICE",
-		"CHEMISTRY",
-		"GENETICS",
-		"RESEARCH",
-		"RD OFFICE",
-		"TELECOMMS",
-		"ROBOTICS"
-	)
-
-/obj/machinery/sorting_machine/destination/taxi_secsci
-	sorting = list(
-		"SECURITY",
-		"HOS OFFICE",
-		"CHAPEL",
-		"LIBRARY"
-	)

maps/taxistation.dm

@@ -1,37 +0,0 @@
-//**************************************************************
-// Map Datum -- Taxistation
-//**************************************************************
-
-/datum/map/active
-	nameShort = "taxi"
-	nameLong = "Taxi Station"
-	map_dir = "taxistation"
-	tDomeX = 127
-	tDomeY = 67
-	tDomeZ = 2
-	zAsteroid = 6
-	zDeepSpace = 5
-	zLevels = list(
-		/datum/zLevel/station,
-		/datum/zLevel/centcomm,
-		/datum/zLevel/space{
-			name = "spaceOldSat" ;
-			},
-		/datum/zLevel/space{
-			name = "derelict" ;
-			},
-		/datum/zLevel/space{
-			name = "spacePirateShip" ;
-			},
-		/datum/zLevel/mining,
-		)
-	enabled_jobs = list(/datum/job/trader)
-
-/datum/map/active/New()
-	.=..()
-
-	research_shuttle.name = "Asteroid Shuttle" //There is only one shuttle on taxi - the asteroid shuttle
-	research_shuttle.req_access = list() //It's shared by miners and researchers, so remove access requirements
-
-////////////////////////////////////////////////////////////////
-#include "taxistation.dmm"

vgstation13.dme

@@ -625,7 +625,6 @@
 #include "code\game\machinery\computer\station_alert.dm"
 #include "code\game\machinery\computer\store.dm"
 #include "code\game\machinery\computer\syndicate_specops_shuttle.dm"
-#include "code\game\machinery\computer\taxi_shuttle.dm"
 #include "code\game\machinery\computer\arcade\arcade.dm"
 #include "code\game\machinery\computer\arcade\arcade_game.dm"
 #include "code\game\machinery\doors\airlock.dm"
@@ -1071,7 +1070,6 @@
 #include "code\game\shuttles\salvage.dm"
 #include "code\game\shuttles\security.dm"
 #include "code\game\shuttles\syndicate.dm"
-#include "code\game\shuttles\taxi.dm"
 #include "code\game\shuttles\trade.dm"
 #include "code\game\shuttles\vox.dm"
 #include "code\game\striketeams\emergency_response_team.dm"