diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index e7fe13add05..e048d4023b3 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -1435,6 +1435,10 @@ icon_state = "cmo" }, /area/shuttle/escape) +"fz" = ( +/mob/living/carbon/human/monkey/magic, +/turf/simulated/floor/wood, +/area/wizard_station) "fE" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, @@ -7038,6 +7042,14 @@ icon_state = "dark" }, /area/ghost_bar) +"yl" = ( +/turf/simulated/wall/indestructible/boss, +/area/space/centcomm) +"ym" = ( +/obj/structure/table/wood, +/obj/item/ashtray/bronze, +/turf/simulated/floor/carpet/green, +/area/ghost_bar) "yp" = ( /obj/item/radio/intercom/syndicate{ pixel_x = 28 @@ -7215,6 +7227,10 @@ }, /turf/simulated/floor/plasteel/freezer, /area/ghost_bar) +"zx" = ( +/obj/structure/kitchenspike, +/turf/simulated/floor/wood, +/area/wizard_station) "zy" = ( /obj/machinery/door/airlock/public/glass{ name = "Computer Hub" @@ -7552,10 +7568,9 @@ /turf/simulated/wall/indestructible/riveted, /area/centcom/gamma) "AZ" = ( -/obj/structure/table/wood, -/obj/item/ashtray/bronze, -/turf/simulated/floor/carpet/green, -/area/ghost_bar) +/obj/effect/baseturf_helper/asteroid/basalt, +/turf/simulated/floor/wood, +/area/wizard_station) "Ba" = ( /obj/structure/rack, /obj/item/clothing/suit/wizrobe/marisa, @@ -7783,10 +7798,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) -"BR" = ( -/obj/structure/kitchenspike, -/turf/simulated/floor/wood, -/area/wizard_station) "BT" = ( /obj/effect/landmark/spawner/tdomeobserve, /turf/simulated/floor/plasteel/dark, @@ -7801,7 +7812,7 @@ }, /area/syndicate_mothership) "BX" = ( -/turf/simulated/floor/plating/asteroid/basalt/airless, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/wizard_station) "BY" = ( /turf/simulated/floor/plasteel{ @@ -12621,10 +12632,6 @@ /obj/structure/filingcabinet/security, /turf/simulated/floor/wood, /area/centcom/control) -"Sv" = ( -/mob/living/carbon/human/monkey/magic, -/turf/simulated/floor/wood, -/area/wizard_station) "Sw" = ( /obj/structure/sign/poster/official/high_class_martini, /turf/simulated/wall/indestructible/riveted, @@ -13158,7 +13165,7 @@ }, /area/holodeck/source_knightarena) "UJ" = ( -/turf/simulated/floor/plating/lava/smooth/airless, +/turf/simulated/floor/plating/lava/smooth/mapping_lava, /area/wizard_station) "UK" = ( /turf/simulated/floor/holofloor/carpet, @@ -13239,7 +13246,7 @@ desc = "She lies just out of reach, as always. She somehow has your only toolbox."; dir = 1 }, -/turf/simulated/floor/plating/asteroid/basalt/airless, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/wizard_station) "Vg" = ( /turf/simulated/floor/plasteel{ @@ -58193,27 +58200,27 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl aN aN aN @@ -58450,27 +58457,27 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +yl +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +yl aN aN aN @@ -58707,27 +58714,27 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +yl +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +yl aN aN aN @@ -58963,28 +58970,28 @@ aN aN aN aN -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aN +yl +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +BX +BX +UJ +UJ +UJ +UJ +yl aN aN aN @@ -59220,28 +59227,28 @@ aN aN aN aN -aa -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -aa aN +yl +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +UJ +UJ +yl aN aN aN @@ -59471,13 +59478,17 @@ aN aN "} (175,1,1) = {" -aN -aN -aN -aN -aN -aN -aa +yl +yl +yl +yl +yl +yl +yl +yl +UJ +UJ +BX UJ UJ UJ @@ -59494,11 +59505,7 @@ UJ UJ UJ UJ -UJ -UJ -UJ -aa -aN +yl aN aN aN @@ -59728,13 +59735,14 @@ aN aN "} (176,1,1) = {" -aN -aN -aN -aN -aN -aN -aa +yl +UJ +UJ +UJ +UJ +UJ +UJ +UJ UJ UJ UJ @@ -59754,14 +59762,13 @@ UJ UJ UJ UJ -aa -aN -aN -aN -aN -aN -aN -aN +yl +yl +yl +yl +yl +yl +yl aN aN aN @@ -59985,13 +59992,14 @@ aN aN "} (177,1,1) = {" -aN -aN -aN -aN -aN -aN -aa +yl +UJ +UJ +UJ +UJ +UJ +UJ +UJ UJ UJ UJ @@ -60011,16 +60019,15 @@ UJ UJ UJ UJ -aa -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +yl +yl +yl aN aN aN @@ -60242,13 +60249,14 @@ aN aN "} (178,1,1) = {" -aa -aa -aa -aa -aa -aa -aa +yl +UJ +UJ +BX +UJ +UJ +UJ +UJ UJ UJ UJ @@ -60268,17 +60276,16 @@ UJ UJ UJ UJ -aa -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +yl +yl aN aN aN @@ -60499,9 +60506,10 @@ aN aN "} (179,1,1) = {" -aa +yl UJ UJ +BX UJ UJ UJ @@ -60525,17 +60533,16 @@ UJ UJ UJ UJ -aa -aa -aa -aa -aa -aa -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +yl aN aN aN @@ -60756,7 +60763,8 @@ aN aN "} (180,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -60787,12 +60795,11 @@ UJ UJ UJ UJ -aa -aa -aa -aN -aN -aN +UJ +UJ +UJ +UJ +yl aN aN aN @@ -61013,7 +61020,8 @@ aN aN "} (181,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -61040,16 +61048,15 @@ xH UJ UJ UJ +BX UJ UJ UJ UJ +BX UJ UJ -aa -aa -aN -aN +yl aN aN aN @@ -61270,7 +61277,8 @@ aN aN "} (182,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -61297,16 +61305,15 @@ xH UJ UJ UJ +BX +BX UJ UJ UJ +BX +BX UJ -UJ -UJ -UJ -aa -aN -aN +yl aN aN aN @@ -61527,7 +61534,8 @@ aN aN "} (183,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -61540,10 +61548,10 @@ UJ UJ BX BX -UJ +BX GN -BR -Sv +zx +fz ed fx GN @@ -61560,10 +61568,9 @@ UJ UJ UJ UJ +BX UJ -aa -aN -aN +yl aN aN aN @@ -61784,7 +61791,8 @@ aN aN "} (184,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -61797,7 +61805,7 @@ UJ UJ UJ UJ -UJ +BX xH hy ed @@ -61808,6 +61816,7 @@ yx Ee Ue xH +BX UJ UJ UJ @@ -61818,9 +61827,7 @@ UJ UJ UJ UJ -aa -aN -aN +yl aN aN aN @@ -62041,7 +62048,8 @@ aN aN "} (185,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -62054,7 +62062,7 @@ xH xH xH xH -UJ +BX xH iO ed @@ -62065,6 +62073,7 @@ sl Lu Wk xH +BX UJ UJ UJ @@ -62075,9 +62084,7 @@ UJ UJ UJ UJ -aa -aN -aN +yl aN aN aN @@ -62298,7 +62305,8 @@ aN aN "} (186,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -62323,6 +62331,7 @@ xH xH xH xH +BX UJ UJ UJ @@ -62332,9 +62341,7 @@ UJ UJ UJ UJ -aa -aN -aN +yl aN aN aN @@ -62555,7 +62562,8 @@ aN aN "} (187,1,1) = {" -aa +yl +BX UJ UJ UJ @@ -62580,7 +62588,7 @@ ZH Oo ZU xH -xH +GN xH UJ UJ @@ -62589,9 +62597,8 @@ UJ UJ UJ UJ -aa -aN -aN +UJ +yl aN aN aN @@ -62812,7 +62819,8 @@ aN aN "} (188,1,1) = {" -aa +yl +BX UJ UJ UJ @@ -62844,11 +62852,10 @@ UJ UJ UJ UJ +BX UJ UJ -aa -aN -aN +yl aN aN aN @@ -63069,7 +63076,8 @@ aN aN "} (189,1,1) = {" -aa +yl +BX UJ UJ UJ @@ -63101,11 +63109,10 @@ UJ UJ UJ UJ +BX UJ UJ -aa -aN -aN +yl aN aN aN @@ -63326,7 +63333,8 @@ aN aN "} (190,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -63343,7 +63351,7 @@ xH xH xH Qj -ed +AZ ed ai Yo @@ -63358,11 +63366,10 @@ UJ UJ UJ UJ +BX UJ UJ -aa -aN -aN +yl aN aN aN @@ -63583,7 +63590,8 @@ aN aN "} (191,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -63617,9 +63625,8 @@ UJ UJ UJ UJ -aa -aN -aN +UJ +yl aN aN aN @@ -63840,7 +63847,8 @@ aN aN "} (192,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -63874,9 +63882,8 @@ UJ UJ UJ UJ -aa -aN -aN +UJ +yl aN aN aN @@ -64097,7 +64104,8 @@ aN aN "} (193,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -64121,19 +64129,18 @@ qu qu qu qu -qu sX +qu xH xH UJ UJ +BX UJ UJ UJ UJ -aa -aN -aN +yl aN aN aN @@ -64354,7 +64361,8 @@ aN aN "} (194,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -64379,18 +64387,17 @@ ZU Os ZU xH -xH +GN xH UJ UJ UJ +BX +BX UJ UJ UJ -UJ -aa -aN -aN +yl aN aN aN @@ -64611,7 +64618,8 @@ aN aN "} (195,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -64636,6 +64644,8 @@ xH xH xH xH +BX +BX UJ UJ UJ @@ -64644,10 +64654,7 @@ UJ UJ UJ UJ -UJ -aa -aN -aN +yl aN aN aN @@ -64868,7 +64875,8 @@ aN aN "} (196,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -64893,6 +64901,7 @@ UJ UJ UJ BX +BX UJ UJ UJ @@ -64902,9 +64911,7 @@ UJ UJ UJ UJ -aa -aN -aN +yl aN aN aN @@ -65125,7 +65132,8 @@ aN aN "} (197,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -65159,9 +65167,8 @@ UJ UJ UJ UJ -aa -aN -aN +UJ +yl aN aN aN @@ -65382,7 +65389,8 @@ aN aN "} (198,1,1) = {" -aa +yl +UJ UJ UJ UJ @@ -65412,13 +65420,12 @@ UJ UJ UJ UJ +BX +BX UJ UJ UJ -UJ -aa -aN -aN +yl aN aN aN @@ -65639,12 +65646,13 @@ aN aN "} (199,1,1) = {" -aa +yl UJ UJ UJ UJ UJ +BX UJ UJ UJ @@ -65670,12 +65678,11 @@ UJ UJ UJ UJ +BX +BX UJ UJ -UJ -aa -aN -aN +yl aN aN aN @@ -65896,7 +65903,15 @@ aN aN "} (200,1,1) = {" -aa +yl +UJ +UJ +BX +UJ +UJ +BX +BX +BX UJ UJ UJ @@ -65920,19 +65935,11 @@ UJ UJ UJ UJ +BX +BX UJ UJ -UJ -UJ -UJ -UJ -UJ -UJ -UJ -aa -aa -aN -aN +yl aN aN aN @@ -66153,7 +66160,11 @@ aN aN "} (201,1,1) = {" -aa +yl +UJ +UJ +BX +BX UJ UJ UJ @@ -66176,6 +66187,8 @@ UJ UJ UJ UJ +BX +BX UJ UJ UJ @@ -66183,13 +66196,7 @@ UJ UJ UJ UJ -UJ -aa -aa -aa -aN -aN -aN +yl aN aN aN @@ -66410,43 +66417,43 @@ aN aN "} (202,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aN -aN -aN -aN -aN +yl +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +yl aN aN aN @@ -66667,43 +66674,43 @@ aN aN "} (203,1,1) = {" -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +yl +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +yl +yl aN aN aN @@ -66924,42 +66931,42 @@ aN aN "} (204,1,1) = {" -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +yl +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +yl +yl +yl aN aN aN @@ -67181,40 +67188,40 @@ aN aN "} (205,1,1) = {" -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl +yl aN aN aN @@ -71712,7 +71719,7 @@ Me bJ Jy qN -AZ +ym Ah Nh Me @@ -72740,7 +72747,7 @@ Nr Jy Jy UH -AZ +ym JX yO qf diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 61a5e0bb833..aa0f52677d9 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama return switch(severity) if(1.0) - ChangeTurf(baseturf) + ChangeTurf(baseturf, keep_icon = FALSE) // we do not keep the icon so that asteroid platings can work properly if(2.0) switch(pick(1,2;75,3)) if(1)