Кучка фиксов

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -111,6 +111,7 @@
 	else
 		new /obj/item/clothing/accessory/storage/webbing(src)
 
+	new /obj/item/clothing/head/hardhat/red(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/weapon/reagent_containers/spray/extinguisher(src)

code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm

@@ -26,7 +26,7 @@
 	//connect to a nearby scanner pad
 	owned_scanner = locate(/obj/machinery/artifact_scanpad) in get_step(src, dir)
 	if(!owned_scanner)
-		owned_scanner = locate(/obj/machinery/artifact_scanpad) in orange(1, src)
+		owned_scanner = locate(/obj/machinery/artifact_scanpad) in orange(7, src)
 
 /obj/machinery/artifact_analyser/ui_interact(mob/user)
 	if(stat & (NOPOWER|BROKEN) || !Adjacent(user) && !issilicon(user) && !isobserver(user))
@@ -35,7 +35,7 @@
 	var/dat = "<B>Anomalous material analyser</B><BR>"
 	dat += "<HR>"
 	if(!owned_scanner)
-		owned_scanner = locate() in orange(1, src)
+		owned_scanner = locate() in orange(7, src)
 
 	if(!owned_scanner)
 		dat += "<b><font color=red>Unable to locate analysis pad.</font></b><br>"

maps/RandomZLevels/wildwest.dmm

@@ -637,28 +637,16 @@
 /area/awaymission/wildwest/mansion)
 "cp" = (
 /obj/structure/closet/secure_closet/freezer/kitchen,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
-/area/awaymission/wildwest/mansion)
-"cq" = (
-/obj/structure/table/woodentable,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "cr" = (
 /obj/structure/table/woodentable,
 /obj/machinery/kitchen_machine/microwave,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "cs" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "ct" = (
 /obj/structure/lattice,
@@ -688,11 +676,6 @@
 /obj/structure/stool/bed/chair/wood/wings,
 /turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
-"cz" = (
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
-/area/awaymission/wildwest/mansion)
 "cA" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/simulated/floor/wood,
@@ -723,19 +706,11 @@
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
-"cG" = (
-/mob/living/simple_animal/hostile/creature,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
-/area/awaymission/wildwest/mansion)
 "cH" = (
 /obj/effect/landmark/corpse/chef{
 	mobname = "Chef"
 	},
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "cI" = (
 /obj/structure/bookcase{
@@ -805,23 +780,17 @@
 "cV" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "cW" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/kitchenknife/butch,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "cX" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/snacks/soup/stew,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "cY" = (
 /obj/structure/stool/bed/chair/comfy/black{
@@ -853,23 +822,17 @@
 "dd" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread/cheese,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/plating,
 /area/awaymission/wildwest/mansion)
 "de" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/kitchen/rollingpin,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "df" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cake/lemon,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion{
 	dir = 1;
 	icon_state = "fwindow"
@@ -919,26 +882,20 @@
 "dq" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/wine,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "dr" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass,
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass,
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass,
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "ds" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/patron,
-/turf/simulated/floor{
-	icon_state = "stage_bleft"
-	},
+/turf/simulated/floor/wood,
 /area/awaymission/wildwest/mansion)
 "dt" = (
 /obj/effect/decal/cleanable/blood/tracks,
@@ -12279,13 +12236,13 @@ bR
 bY
 bP
 cp
-cz
-cz
-cz
-cz
-cz
-cG
-cz
+cn
+cn
+cn
+cn
+cn
+cN
+cn
 dq
 bP
 bY
@@ -12535,14 +12492,14 @@ bw
 bR
 bY
 bP
-cq
-cz
-cz
-cz
-cz
+cF
+cn
+cn
+cn
+cn
 cV
 dd
-cz
+cn
 dq
 bP
 bY
@@ -12793,13 +12750,13 @@ bR
 bY
 bP
 cr
-cz
-cG
-cz
-cz
+cn
+cN
+cn
+cn
 cW
 de
-cz
+cn
 dr
 bP
 bY
@@ -13049,14 +13006,14 @@ bv
 bR
 bY
 bP
-cq
-cz
+cF
+cn
 cH
-cz
-cz
+cn
+cn
 cX
 df
-cz
+cn
 ds
 bP
 bY
@@ -13307,13 +13264,13 @@ bR
 bY
 bP
 cs
-cz
-cz
-cz
-cz
-cz
-cz
-cz
+cn
+cn
+cn
+cn
+cn
+cn
+cn
 ds
 bP
 bY