Merge pull request #44 from KnigTheThrasher/maptestsfixattempt1

Fixes a lot of tests

_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm

@@ -5013,11 +5013,6 @@
 "mZ" = (
 /turf/open/floor/plating/reinforced,
 /area/ruin/interdyne_planetary_base/eng)
-"na" = (
-/obj/structure/table,
-/obj/item/serviette_pack,
-/turf/open/floor/iron/dark/small,
-/area/ruin/interdyne_planetary_base/serv)
 "nb" = (
 /turf/open/floor/iron/dark/small,
 /area/ruin/interdyne_planetary_base/serv)
@@ -5857,12 +5852,6 @@
 "oT" = (
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/ruin/interdyne_planetary_base/main/dorms)
-"oU" = (
-/obj/machinery/vending/dorms{
-	onstation = 0
-	},
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/ruin/interdyne_planetary_base/main/dorms)
 "oV" = (
 /obj/structure/sink/directional/west,
 /obj/machinery/light_switch/directional/east,
@@ -8796,7 +8785,7 @@ Sp
 nP
 oi
 oT
-oU
+oT
 mQ
 ab
 ab
@@ -8968,7 +8957,7 @@ lG
 mg
 mn
 mF
-na
+mH
 nu
 nR
 ok

_maps/RandomRuins/LavaRuins/nova/lavaland_surface_interdyne_base1.dmm

@@ -3116,9 +3116,6 @@
 	},
 /area/ruin/interdyne_planetary_base/cargo)
 "AJ" = (
-/obj/machinery/vending/dorms{
-	onstation = 0
-	},
 /turf/open/floor/wood/parquet,
 /area/ruin/interdyne_planetary_base/main/dorms)
 "AK" = (

_maps/RandomRuins/SpaceRuins/nova/cargodiselost.dmm

@@ -2284,7 +2284,6 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/cargodise_freighter/vault)
 "Jd" = (
-/obj/machinery/vending/dorms,
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 1
 	},

_maps/RandomRuins/SpaceRuins/nova/des_two.dmm

@@ -10452,7 +10452,6 @@
 	dir = 6
 	},
 /obj/machinery/light/warm/directional/east,
-/obj/machinery/vending/dorms,
 /turf/open/floor/wood/large,
 /area/ruin/space/has_grav/nova/des_two/service/dorms)
 "UX" = (

_maps/RandomRuins/SpaceRuins/nova/port_tarkon.dmm

@@ -5876,7 +5876,6 @@
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/port_tarkon/centerhall)
 "NB" = (
-/obj/machinery/vending/dorms,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/port_tarkon/cargo)
 "NC" = (

_maps/RandomRuins/SpaceRuins/nova/spacehotel.dmm

@@ -437,11 +437,6 @@
 /obj/structure/dresser,
 /turf/open/floor/carpet/neon/simple/teal/nodots,
 /area/ruin/space/has_grav/hotel/guestroom/room_3)
-"cP" = (
-/obj/machinery/vending/dorms,
-/obj/effect/turf_decal/siding/dark,
-/turf/open/floor/carpet/black,
-/area/ruin/space/has_grav/hotel)
 "cR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -4081,33 +4076,8 @@
 /area/ruin/space/has_grav/hotel/bar)
 "uQ" = (
 /obj/structure/closet,
-/obj/item/tickle_feather,
-/obj/item/kinky_shocker,
 /obj/item/storage/medkit/regular,
-/obj/item/clothing/sextoy/buttplug{
-	pixel_y = 4
-	},
-/obj/item/clothing/sextoy/dildo{
-	pixel_x = -6;
-	pixel_y = 7
-	},
-/obj/item/spanking_pad,
-/obj/item/clothing/mask/leatherwhip,
-/obj/item/condom_pack,
-/obj/item/condom_pack,
-/obj/item/condom_pack,
-/obj/item/condom_pack,
-/obj/item/electropack/shockcollar,
-/obj/item/storage/box/strippole_kit,
 /obj/item/wrench,
-/obj/item/stack/shibari_rope/glow,
-/obj/item/storage/box/shibari_stand,
-/obj/item/stack/shibari_rope/glow/full,
-/obj/item/storage/box/strippole_kit,
-/obj/item/bdsm_candle,
-/obj/item/bdsm_candle,
-/obj/item/bdsm_candle,
-/obj/item/bdsm_bed_kit,
 /turf/open/floor/carpet/neon/simple/teal/nodots,
 /area/ruin/space/has_grav/hotel/guestroom/room_3)
 "uR" = (
@@ -10959,7 +10929,7 @@ De
 zj
 dJ
 am
-cP
+Ln
 ey
 so
 GX

_maps/map_files/MetaStation/MetaStation.dmm

@@ -41763,7 +41763,8 @@
 /area/station/maintenance/port/greater)
 "oNa" = (
 /obj/machinery/smartfridge/food,
-/turf/closed/wall,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/turf/open/floor/iron/white,
 /area/station/security/prison/mess)
 "oNl" = (
 /obj/machinery/holopad,
@@ -68946,11 +68947,6 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/iron,
 /area/station/science/research)
-"yhH" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/space/basic,
-/area/station/security/prison/garden)
 "yhK" = (
 /obj/structure/chair,
 /obj/effect/turf_decal/stripes/line{
@@ -88017,7 +88013,7 @@ rrt
 sfn
 aaa
 lAu
-yhH
+cmB
 rmM
 eBR
 ogh
@@ -88274,7 +88270,7 @@ aaa
 lMJ
 lMJ
 lMJ
-yhH
+cmB
 uof
 fiA
 fiA
@@ -88531,7 +88527,7 @@ aaa
 lMJ
 aaa
 lAu
-yhH
+cmB
 voX
 vSy
 viQ

_maps/map_files/NSVBlueshift/Blueshift.dmm

@@ -14898,10 +14898,6 @@
 /area/station/security/brig)
 "cPA" = (
 /obj/structure/table,
-/obj/item/serviette_pack{
-	pixel_x = -18;
-	pixel_y = 3
-	},
 /obj/item/plate/oven_tray,
 /obj/item/plate/oven_tray{
 	pixel_y = 2
@@ -27788,9 +27784,6 @@
 /turf/open/floor/plating,
 /area/station/commons/vacant_room/commissary)
 "fnx" = (
-/obj/item/bdsm_candle{
-	pixel_y = 6
-	},
 /obj/structure/table/reinforced/plasmarglass,
 /turf/open/floor/iron/dark/textured_large,
 /area/station/common/night_club/back_stage)
@@ -28646,7 +28639,6 @@
 /turf/open/floor/iron/smooth,
 /area/station/engineering/atmos)
 "fwm" = (
-/obj/machinery/vending/dorms,
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
@@ -29946,7 +29938,6 @@
 	dir = 8
 	},
 /obj/structure/window/spawner/directional/west,
-/obj/structure/bed/pillow_large,
 /turf/open/floor/carpet/purple,
 /area/station/commons/dorms/room4)
 "fLb" = (
@@ -47301,7 +47292,6 @@
 /area/station/commons/vacant_room/commissary)
 "jfj" = (
 /obj/effect/turf_decal/bot,
-/obj/machinery/vending/dorms,
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron/dark/side{
 	dir = 8
@@ -65569,7 +65559,6 @@
 "mEz" = (
 /obj/structure/flora/bush/fullgrass,
 /obj/structure/flora/bush/flowers_pp,
-/obj/structure/bed/pillow_tiny,
 /turf/open/misc/grass,
 /area/station/service/barber)
 "mEC" = (
@@ -67081,13 +67070,6 @@
 /obj/structure/window/spawner/directional/south,
 /turf/open/floor/wood,
 /area/station/service/library)
-"mSP" = (
-/obj/structure/table,
-/obj/item/serviette_pack{
-	pixel_y = 4
-	},
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen/diner)
 "mSZ" = (
 /obj/effect/turf_decal/bot_blue,
 /obj/structure/rack,
@@ -82997,7 +82979,6 @@
 "pWA" = (
 /obj/structure/table,
 /obj/item/wirecutters/makeshift,
-/obj/item/clothing/sextoy/nipple_clamps,
 /obj/item/stock_parts/power_store/cell{
 	pixel_x = -5
 	},
@@ -84964,10 +84945,6 @@
 /area/station/medical/surgery)
 "qpP" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/pill/crocin{
-	pixel_x = -3;
-	pixel_y = 12
-	},
 /obj/item/reagent_containers/pill/lsd{
 	pixel_x = 5;
 	pixel_y = 5
@@ -92196,9 +92173,6 @@
 "rGA" = (
 /obj/structure/table/wood/fancy/blue,
 /obj/item/food/mint,
-/obj/item/serviette_pack{
-	pixel_y = 7
-	},
 /turf/open/floor/carpet/blue,
 /area/station/command/captain_dining)
 "rGB" = (
@@ -95471,7 +95445,6 @@
 	},
 /area/station/security/prison/safe)
 "spj" = (
-/obj/machinery/vending/dorms,
 /obj/machinery/barsign{
 	pixel_y = 32
 	},
@@ -98265,7 +98238,6 @@
 	pixel_x = -4;
 	pixel_y = -5
 	},
-/obj/item/clothing/glasses/nice_goggles,
 /obj/item/clothing/glasses/regular{
 	pixel_x = -3;
 	pixel_y = 3
@@ -101972,10 +101944,6 @@
 /area/station/maintenance/department/crew_quarters/bar)
 "tAw" = (
 /obj/structure/table,
-/obj/item/clothing/gloves/ball_mittens,
-/obj/item/clothing/gloves/ball_mittens,
-/obj/item/clothing/gloves/ball_mittens,
-/obj/item/clothing/gloves/ball_mittens,
 /obj/item/restraints/handcuffs{
 	pixel_y = 4
 	},
@@ -109578,9 +109546,6 @@
 "uWi" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/syringe/contraband/space_drugs,
-/obj/item/reagent_containers/pill/dopamine{
-	pixel_y = 6
-	},
 /obj/item/reagent_containers/syringe/contraband/space_drugs{
 	pixel_x = -3;
 	pixel_y = 5
@@ -111340,10 +111305,6 @@
 "vor" = (
 /turf/closed/wall/rust,
 /area/station/maintenance/department/security)
-"voy" = (
-/obj/machinery/vending/dorms,
-/turf/open/floor/carpet/purple,
-/area/station/common/night_club/back_stage)
 "voA" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 1
@@ -113929,7 +113890,6 @@
 "vLZ" = (
 /obj/structure/flora/bush/fullgrass,
 /obj/structure/flora/bush/flowers_br,
-/obj/structure/bed/pillow_large,
 /turf/open/misc/grass,
 /area/station/service/barber)
 "vMe" = (
@@ -145440,7 +145400,7 @@ pjV
 pjV
 pjV
 qZG
-voy
+sNT
 gXE
 kuh
 bnM
@@ -162646,7 +162606,7 @@ fgJ
 kvR
 nGi
 keZ
-mSP
+qxg
 ftj
 loE
 gWj