please work now.

maps/map_files/CORSAT/Corsat.dmm

@@ -24631,7 +24631,7 @@
 /area/corsat/gamma/biodome/complex)
 "bTQ" = (
 /obj/structure/surface/table/reinforced,
-/obj/item/device/gripper,
+/obj/item/prop/gripper,
 /turf/open/floor/corsat/retrosquareslight,
 /area/corsat/sigma/south/complex)
 "bTU" = (

maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm

@@ -18708,7 +18708,7 @@
 /area/prison/security/monitoring/highsec)
 "btD" = (
 /obj/structure/surface/table/reinforced,
-/obj/item/device/matter_decompiler,
+/obj/item/prop/matter_decompiler,
 /turf/open/floor/prison/redfull,
 /area/prison/hallway/central/west)
 "btE" = (

maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm

@@ -15742,7 +15742,7 @@
 /obj/structure/machinery/shower{
 	pixel_y = 13
 	},
-/obj/item/tool/soap/nanotrasen,
+/obj/item/tool/soap/weyland_yutani,
 /turf/open/floor/prison/kitchen/southwest,
 /area/fiorina/tumor/civres)
 "lWy" = (

maps/map_files/New_Varadero/New_Varadero.dmm

@@ -19724,15 +19724,15 @@
 	pixel_x = 4;
 	pixel_y = 10
 	},
-/obj/item/tool/soap/nanotrasen{
+/obj/item/tool/soap/weyland_yutani{
 	pixel_x = 3;
 	pixel_y = 7
 	},
-/obj/item/tool/soap/nanotrasen{
+/obj/item/tool/soap/weyland_yutani{
 	pixel_x = 2;
 	pixel_y = 11
 	},
-/obj/item/tool/soap/nanotrasen{
+/obj/item/tool/soap/weyland_yutani{
 	desc = "Teetering at the brink! A life's thread, about to be cut short.";
 	pixel_x = 5;
 	pixel_y = 15

maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm

@@ -2787,7 +2787,7 @@
 	},
 /obj/structure/surface/table/reinforced/prison,
 /obj/item/device/mass_spectrometer,
-/obj/item/device/matter_decompiler,
+/obj/item/prop/matter_decompiler,
 /turf/open/floor/strata/multi_tiles/southwest,
 /area/strata/ag/interior/outpost/canteen/personal_storage)
 "ake" = (

maps/map_files/USS_Almayer/USS_Almayer.dmm

@@ -16774,7 +16774,7 @@
 /turf/open/floor/almayer/green/northwest,
 /area/almayer/living/offices)
 "cWw" = (
-/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
+/obj/structure/machinery/cm_vending/gear/staff_officer_armory,
 /turf/open/floor/almayer/redfull,
 /area/almayer/command/cic)
 "cWy" = (
@@ -27307,8 +27307,7 @@
 	},
 /obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
 	dir = 4;
-	name = "Normandy Remote Control Console";
-	shuttleId = "dropship_normandy"
+	name = "Dropship Remote Control Console"
 	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
@@ -33101,7 +33100,7 @@
 	name = "General Listening Channel";
 	pixel_y = 28
 	},
-/obj/structure/machinery/cm_vending/clothing/staff_officer_armory,
+/obj/structure/machinery/cm_vending/gear/staff_officer_armory,
 /turf/open/floor/almayer/redfull,
 /area/almayer/command/cic)
 "jSo" = (
@@ -37162,6 +37161,13 @@
 "lAl" = (
 /turf/open/floor/almayer/orange/east,
 /area/almayer/squads/bravo)
+"lAm" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/closed/wall/almayer/white/reinforced,
+/area/almayer/medical/medical_science)
 "lAu" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{
 	dir = 1
@@ -42020,9 +42026,8 @@
 	},
 /obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
 	dir = 4;
-	name = "Normandy Remote Control Console";
 	pixel_y = -12;
-	shuttleId = "dropship_normandy"
+	name = "Remote dropship navigation computer"
 	},
 /turf/open/floor/almayer/redfull,
 /area/almayer/living/offices/flight)
@@ -43174,7 +43179,7 @@
 "obo" = (
 /obj/structure/disposalpipe/up/almayer{
 	dir = 8;
-	id = "almayerlink_med_req"
+	id = "almayerlink_med1_req"
 	},
 /turf/closed/wall/almayer,
 /area/almayer/squads/req)
@@ -45106,6 +45111,13 @@
 "oNp" = (
 /turf/open/floor/almayer/test_floor4,
 /area/almayer/medical/hydroponics)
+"oNy" = (
+/obj/structure/disposalpipe/down/almayer{
+	dir = 4;
+	id = "almayerlink_med_req"
+	},
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/south1)
 "oNJ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N"
@@ -54679,11 +54691,6 @@
 /obj/structure/window/reinforced/toughened{
 	dir = 4
 	},
-/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
-	dir = 8;
-	name = "Alamo Remote Control Console";
-	shuttleId = "dropship_alamo"
-	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
 "sKM" = (
@@ -56022,6 +56029,13 @@
 "tni" = (
 /turf/open/floor/almayer/sterile_green_side/north,
 /area/almayer/medical/operating_room_three)
+"tnS" = (
+/obj/structure/disposalpipe/up/almayer{
+	dir = 8;
+	id = "almayerlink_med_req"
+	},
+/turf/closed/wall/almayer/white/reinforced,
+/area/almayer/medical/hydroponics)
 "tnY" = (
 /obj/structure/machinery/cryopod{
 	pixel_y = 6
@@ -66161,9 +66175,9 @@
 	},
 /obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
 	dir = 8;
-	name = "Alamo Remote Control Console";
 	pixel_y = 12;
-	shuttleId = "dropship_alamo"
+	shuttleId = "dropship_alamo";
+	name = "Remote dropship navigation computer"
 	},
 /turf/open/floor/almayer/redfull,
 /area/almayer/living/offices/flight)
@@ -66811,6 +66825,13 @@
 	},
 /turf/open/floor/almayer/green/north,
 /area/almayer/hallways/lower/port_midship_hallway)
+"xAc" = (
+/obj/structure/disposalpipe/down/almayer{
+	dir = 8;
+	id = "almayerlink_med1_req"
+	},
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/south1)
 "xAe" = (
 /turf/closed/wall/almayer/research/containment/wall/corner,
 /area/almayer/medical/containment/cell)
@@ -98081,7 +98102,7 @@ iKy
 iKy
 iKy
 wAE
-baw
+oNy
 baw
 qYC
 kwo
@@ -98284,7 +98305,7 @@ qQu
 qQu
 qQu
 wAE
-baw
+ley
 vbB
 ley
 kwo
@@ -98487,7 +98508,7 @@ dME
 bRO
 llo
 wAE
-baw
+xAc
 dBp
 gVA
 tQV
@@ -99877,7 +99898,7 @@ iYf
 bIM
 wPz
 iUo
-vOy
+lAm
 xqp
 lzA
 vkp
@@ -100080,7 +100101,7 @@ mTp
 wiW
 wPz
 jeq
-rQy
+tnS
 wWR
 vti
 vkp