Merge branch 'master' into translate

_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm

@@ -156,10 +156,6 @@
 /obj/machinery/light_construct/directional/east,
 /turf/simulated/floor/mineral/titanium,
 /area/ruin/space/powered)
-"cJ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/indestructible/whiteshuttle/nodiagonal,
-/area/ruin/space/powered)
 "cK" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/hostile/scavengers/gun/spacegun,
@@ -556,19 +552,15 @@
 /area/ruin/space/powered)
 "ng" = (
 /obj/structure/table/wood,
+/obj/item/clothing/mask/cigarette/rollie,
 /obj/item/clothing/mask/cigarette/rollie{
-	list_reagents = list("thc" = 40, "cbd" = 20)
-	},
-/obj/item/clothing/mask/cigarette/rollie{
-	list_reagents = list("thc" = 40, "cbd" = 20);
 	pixel_y = 3
 	},
 /obj/item/storage/fancy/rollingpapers{
 	pixel_y = 7;
 	pixel_x = 6
 	},
 /obj/item/clothing/mask/cigarette/rollie{
-	list_reagents = list("thc" = 40, "cbd" = 20);
 	pixel_y = 3;
 	pixel_x = -4
 	},
@@ -1032,7 +1024,6 @@
 	amount = 1
 	},
 /obj/item/shard{
-	icon_state = "large";
 	pixel_y = 9
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -1933,7 +1924,6 @@
 "Nm" = (
 /obj/structure/computerframe,
 /obj/item/shard{
-	icon_state = "large";
 	pixel_y = 9
 	},
 /obj/effect/decal/cleanable/glass,
@@ -3060,7 +3050,7 @@ Kb
 PT
 PT
 PT
-cJ
+Kb
 Cm
 Jr
 sD

_maps/map_files220/RandomZLevels/blackmarketpackers.dmm

@@ -1329,10 +1329,6 @@
 /obj/structure/spider/stickyweb,
 /turf/simulated/floor/plating,
 /area/awaymission/BMPship/Engines)
-"ea" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/indestructible/whiteshuttle/nodiagonal,
-/area/awaymission/BMPship/Kitchen)
 "eb" = (
 /obj/machinery/door/window/classic/reversed{
 	color = "green"
@@ -1552,11 +1548,6 @@
 	icon_state = "cafeteria"
 	},
 /area/awaymission/BMPship/CommonArea)
-"eK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/r_wall,
-/area/awaymission/BMPship/Containment)
 "eL" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 4
@@ -1566,10 +1557,6 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Engines)
-"eM" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/r_wall,
-/area/awaymission/BMPship/Containment)
 "eN" = (
 /obj/structure/window/reinforced{
 	color = "yellow";
@@ -5734,13 +5721,6 @@
 "HV" = (
 /turf/simulated/wall/indestructible/whiteshuttle,
 /area/awaymission/BMPship/TurretsSouth)
-"HW" = (
-/obj/effect/decal/cleanable/blood/drip{
-	pixel_y = 10;
-	pixel_x = -13
-	},
-/turf/simulated/wall/indestructible/whiteshuttle,
-/area/awaymission/BMPship/MedBay)
 "HZ" = (
 /obj/structure/alien/weeds,
 /obj/item/shard{
@@ -6828,7 +6808,6 @@
 "Vn" = (
 /obj/structure/closet/secure_closet{
 	color = "gold";
-	layer = 2.9;
 	req_access = list(111)
 	},
 /obj/item/tank/internals/oxygen,
@@ -15000,7 +14979,7 @@ LT
 cU
 Pu
 Yh
-eM
+er
 zX
 LC
 CJ
@@ -15387,7 +15366,7 @@ XJ
 ch
 Gy
 Dy
-eM
+er
 Ds
 BI
 er
@@ -15647,7 +15626,7 @@ fE
 WO
 Gy
 Dy
-eK
+er
 Dp
 pV
 er
@@ -15767,7 +15746,7 @@ vr
 ZB
 dw
 Rn
-eM
+er
 er
 er
 er
@@ -15777,7 +15756,7 @@ Ll
 BL
 NZ
 gH
-eM
+er
 er
 er
 TJ
@@ -15907,7 +15886,7 @@ Lu
 FT
 Gs
 LT
-eM
+er
 fD
 lK
 er
@@ -16297,7 +16276,7 @@ MN
 MN
 kn
 nO
-eM
+er
 er
 er
 er
@@ -16427,7 +16406,7 @@ bU
 LT
 kn
 kn
-eM
+er
 At
 MY
 er
@@ -16673,7 +16652,7 @@ aa
 ve
 aT
 Si
-HW
+ve
 Xb
 ZN
 ve
@@ -16817,7 +16796,7 @@ Ll
 ks
 kn
 fx
-eM
+er
 er
 er
 er
@@ -16947,7 +16926,7 @@ Ue
 ku
 kn
 kn
-eM
+er
 fD
 fP
 er
@@ -17197,7 +17176,7 @@ Si
 Si
 ji
 ve
-eM
+er
 el
 xW
 er
@@ -17207,7 +17186,7 @@ Ck
 Ue
 ej
 Qk
-eM
+er
 Zg
 fP
 er
@@ -19408,9 +19387,9 @@ cs
 TU
 aN
 aQ
-ea
+EL
 hw
-ea
+EL
 tA
 kK
 EL

_maps/map_files220/RandomZLevels/wildwest.dmm

@@ -2350,12 +2350,6 @@
 /obj/machinery/light/small/directional/west,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/wildwest/wildwest_mines)
-"wi" = (
-/obj/effect/decal/cleanable/blood/drip{
-	icon_state = "5"
-	},
-/turf/simulated/wall/mineral/sandstone,
-/area/awaymission/wildwest/wildwest_mines)
 "wk" = (
 /obj/item/reagent_containers/drinks/oilcan,
 /obj/effect/decal/cleanable/blood/oil,
@@ -2862,10 +2856,6 @@
 	icon_state = "cultdamage3"
 	},
 /area/awaymission/wildwest/wildwest_vault)
-"Bd" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/mineral/sandstone,
-/area/awaymission/wildwest/wildwest_mines)
 "Be" = (
 /obj/effect/turf_decal/loading_area{
 	dir = 8
@@ -4120,10 +4110,6 @@
 	},
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/awaymission/wildwest/wildwest_refine)
-"Oh" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/simulated/wall/mineral/sandstone,
-/area/awaymission/wildwest/wildwest_mines)
 "Oi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mob_spawn/human/corpse/miner,
@@ -10429,7 +10415,7 @@ xy
 mW
 to
 oy
-wi
+hk
 hk
 hk
 hk
@@ -10566,8 +10552,8 @@ hk
 ED
 hk
 hk
-Oh
-Oh
+hk
+hk
 Os
 JS
 wK
@@ -13688,7 +13674,7 @@ CG
 hk
 Pt
 JS
-Bd
+hk
 xo
 rN
 hk
@@ -14246,7 +14232,7 @@ JS
 wK
 hk
 hk
-Bd
+hk
 hk
 JS
 JS
@@ -15243,7 +15229,7 @@ Kb
 kO
 hk
 ld
-Bd
+hk
 YK
 hk
 Ff

_maps/map_files220/generic/centcomm.dmm

@@ -4617,10 +4617,6 @@
 	icon_state = "darkbluealt"
 	},
 /area/centcom/ss220/admin1)
-"cTi" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/indestructible/riveted,
-/area/centcom/ss220/supply)
 "cTP" = (
 /obj/structure/light_fake/small,
 /turf/simulated/floor/plasteel{
@@ -5284,10 +5280,6 @@
 	icon_state = "darkblue"
 	},
 /area/centcom/ss220/bar)
-"dnp" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/indestructible/opsglass,
-/area/syndicate_mothership)
 "dnK" = (
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/simulated/floor/beach/away/water{
@@ -8285,12 +8277,6 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/shuttle/syndicate_sit)
-"eZe" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/indestructible/syndicate{
-	smoothing_flags = 2
-	},
-/area/syndicate_mothership)
 "eZF" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -51106,7 +51092,7 @@ fnU
 ios
 nrC
 fnU
-eZe
+fnU
 fnU
 bnr
 bnr
@@ -52725,7 +52711,7 @@ adJ
 adJ
 rzI
 rzI
-cTi
+rzI
 rzI
 syo
 rzI
@@ -59322,7 +59308,7 @@ fnU
 fnU
 fnU
 pUk
-dnp
+pUk
 mUz
 ovP
 mzs