diff --git a/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm b/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm
index 082133aa02..7553242b36 100644
--- a/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm
+++ b/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm
@@ -864,7 +864,7 @@
 "aqF" = (/obj/machinery/door/airlock{name = "Privacy Bunks";req_access_txt = "0"},/turf/open/floor/plasteel,/area/crew_quarters/sleep)
 "aqG" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel,/area/crew_quarters/sleep)
 "aqH" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/open/floor/plasteel,/area/crew_quarters/sleep)
-"aqI" = (/obj/machinery/door/airlock/titanium,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/abandoned)
+"aqI" = (/obj/machinery/door/airlock/titanium,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned)
 "aqJ" = (/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/red/corner{dir = 1},/area/construction/hallway{name = "Secure Workstations Hallway"})
 "aqK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/grille{density = 0;icon_state = "brokengrille"},/turf/open/floor/plating,/area/maintenance/fpmaint{name = "Secure Workstations Maintenance"})
 "aqL" = (/obj/structure/sink{icon_state = "sink";dir = 8;pixel_x = -12;pixel_y = 2},/obj/machinery/camera{c_tag = "Xenobiology South";dir = 4;network = list("SS13","RD")},/turf/open/floor/plasteel/white,/area/toxins/xenobiology)
@@ -901,7 +901,7 @@
 "arq" = (/obj/item/weapon/paint/green,/turf/open/floor/plating,/area/maintenance/fore)
 "arr" = (/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/paint/yellow,/turf/open/floor/plating,/area/maintenance/fore)
 "ars" = (/obj/machinery/door/airlock/glass,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned)
-"art" = (/obj/machinery/door/airlock/glass,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/abandoned)
+"art" = (/obj/machinery/door/airlock/glass,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned)
 "aru" = (/obj/structure/chair{dir = 4},/obj/effect/decal/remains/human,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned)
 "arv" = (/obj/machinery/computer/shuttle/white_ship,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned)
 "arw" = (/obj/machinery/door/window/northleft{base_state = "right";dir = 8;icon_state = "right";name = "Containment Pen";req_access_txt = "55"},/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0},/obj/machinery/door/poddoor/preopen{id = "xenobio1";name = "containment blast door"},/turf/open/floor/engine,/area/toxins/xenobiology)
@@ -1054,7 +1054,7 @@
 "aun" = (/obj/machinery/door/airlock{id_tag = "bunk15";name = "Bunk 15"},/turf/open/floor/carpet,/area/crew_quarters/sleep)
 "auo" = (/obj/machinery/door/airlock{id_tag = "bunk16";name = "Bunk 16"},/turf/open/floor/carpet,/area/crew_quarters/sleep)
 "aup" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/button/door{id = "bunk16";name = "Bunk Bolt Control 16";normaldoorcontrol = 1;pixel_x = 25;pixel_y = 0;req_access_txt = "0";specialfunctions = 4},/turf/open/floor/carpet,/area/crew_quarters/sleep)
-"auq" = (/obj/structure/frame/computer{anchored = 1},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/abandoned)
+"auq" = (/obj/structure/frame/computer{anchored = 1},/turf/open/floor/mineral/titanium,/area/shuttle/abandoned)
 "aur" = (/obj/structure/closet/secure_closet/bar,/turf/open/floor/plating,/area/maintenance/fpmaint{name = "Secure Workstations Maintenance"})
 "aus" = (/obj/structure/chair{dir = 4},/turf/open/floor/plating,/area/maintenance/fpmaint{name = "Secure Workstations Maintenance"})
 "aut" = (/obj/structure/chair,/turf/open/floor/plating,/area/maintenance/fpmaint{name = "Secure Workstations Maintenance"})
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index b62ae4d9eb..03ea93e2e4 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -69,7 +69,7 @@
 			else
 				. = "0" + .
 		i++
-names.dmnames.dm
+	return .
 
 //Splits the text of a file at seperator and returns them in a list.
 /world/proc/file2list(filename, seperator="\n")