From 3e19392c73062013cadab5728c219448fd771f6a Mon Sep 17 00:00:00 2001 From: Legendaxe <102746941+Legendaxe@users.noreply.github.com> Date: Sat, 16 Dec 2023 19:06:50 +0200 Subject: [PATCH 1/8] update paths --- .../RandomRuins/LavaRuins/scp_facility.dmm | 2 +- _maps/map_files220/RandomZLevels/caves.dmm | 2 +- _maps/map_files220/generic/Lavaland.dmm | 238 +++++++++--------- _maps/map_files220/generic/centcomm.dmm | 89 ++----- 4 files changed, 145 insertions(+), 186 deletions(-) diff --git a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm index 30c33518943d..e1b05fa340bd 100644 --- a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm +++ b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm @@ -826,7 +826,7 @@ }, /area/ruin/unpowered/misc_lavaruin) "HJ" = ( -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "HN" = ( /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index 902a197ec42f..bd2186504249 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -5432,7 +5432,7 @@ }, /area/awaymission/caves/build/reqpower_build) "BH" = ( -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/awaymission/caves) "BK" = ( /obj/item/stack/rods, diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm index 9ac6014669e7..f05615226571 100644 --- a/_maps/map_files220/generic/Lavaland.dmm +++ b/_maps/map_files220/generic/Lavaland.dmm @@ -64,7 +64,7 @@ /turf/simulated/mineral/random/volcanic, /area/lavaland/surface/outdoors) "aj" = ( -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "ak" = ( /turf/simulated/mineral/random/volcanic, @@ -1935,7 +1935,7 @@ /obj/structure/sign/nanotrasen{ pixel_x = 32 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "ei" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1963,7 +1963,7 @@ dir = 1 }, /obj/structure/stone_tile/center/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "ek" = ( /obj/machinery/door/airlock/mining/glass{ @@ -2581,7 +2581,7 @@ dir = 1 }, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "fp" = ( /turf/simulated/floor/plasteel{ @@ -3082,7 +3082,7 @@ "go" = ( /obj/structure/stone_tile/block, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "gp" = ( /obj/machinery/door/airlock/maintenance{ @@ -3342,14 +3342,14 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "gO" = ( /obj/structure/stone_tile/block{ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "gP" = ( /obj/structure/stone_tile/slab, @@ -3417,7 +3417,7 @@ "hc" = ( /obj/structure/stone_tile/slab, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "hd" = ( /obj/machinery/iv_drip, @@ -3492,7 +3492,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "hv" = ( /obj/effect/decal/cleanable/dirt, @@ -3554,7 +3554,7 @@ /area/lavaland/surface/outdoors/legion) "hI" = ( /obj/structure/stone_tile/block/burnt, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "hJ" = ( /obj/structure/stone_tile/block{ @@ -4022,7 +4022,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "jH" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -4034,7 +4034,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "jJ" = ( /obj/structure/firelock_frame, @@ -4061,7 +4061,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "jN" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -4073,7 +4073,7 @@ /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/center/cracked, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "jP" = ( /turf/simulated/floor/plasteel{ @@ -4105,7 +4105,7 @@ /obj/structure/stone_tile/block{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "jW" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ @@ -4116,7 +4116,7 @@ dir = 8 }, /obj/structure/stone_tile/center/burnt, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "ka" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -4142,7 +4142,7 @@ network = list("Mining Outpost") }, /obj/structure/extinguisher_cabinet/directional/east, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "kf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -4257,7 +4257,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "kD" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -4271,7 +4271,7 @@ }, /obj/structure/stone_tile/center, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "kE" = ( /obj/structure/lattice/catwalk/mining, @@ -4300,7 +4300,7 @@ }, /obj/structure/stone_tile/center/cracked, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "kI" = ( /turf/simulated/wall/mineral/titanium, @@ -4317,7 +4317,7 @@ }, /obj/structure/stone_tile/center, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "kM" = ( /turf/simulated/wall/indestructible/boss, @@ -4468,7 +4468,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "lt" = ( /obj/structure/stone_tile/block/burnt, @@ -4496,11 +4496,11 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "lw" = ( /obj/structure/stone_tile/cracked, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "lx" = ( /obj/structure/fans/tiny, @@ -4516,7 +4516,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "lz" = ( /obj/structure/stone_tile/cracked{ @@ -4526,7 +4526,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "lD" = ( /obj/structure/stone_tile/block/cracked{ @@ -4536,7 +4536,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "lE" = ( /obj/structure/stone_tile/block/cracked{ @@ -4546,7 +4546,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "lF" = ( /obj/structure/stone_tile/block/cracked{ @@ -4559,7 +4559,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "lG" = ( /obj/structure/stone_tile/block/cracked{ @@ -4593,7 +4593,7 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "lO" = ( /obj/effect/decal/cleanable/dirt, @@ -4618,7 +4618,7 @@ dir = 6 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "lR" = ( /obj/structure/stone_tile/block/cracked{ @@ -4642,7 +4642,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "lU" = ( /obj/structure/stone_tile/block{ @@ -4664,7 +4664,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "lZ" = ( /obj/structure/stone_tile/block/cracked{ @@ -4674,7 +4674,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "ma" = ( /obj/structure/stone_tile/block/cracked{ @@ -4695,7 +4695,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "md" = ( /obj/structure/stone_tile/block{ @@ -4714,7 +4714,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "mf" = ( /obj/structure/stone_tile/center/cracked, @@ -4758,7 +4758,7 @@ }, /obj/structure/stone_tile/cracked, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "mn" = ( /obj/structure/stone_tile/block/cracked, @@ -4833,7 +4833,7 @@ /obj/structure/stone_tile{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "mw" = ( /obj/structure/stone_tile{ @@ -4842,11 +4842,11 @@ /obj/structure/stone_tile{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "mx" = ( /obj/structure/stone_tile, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "my" = ( /obj/structure/stone_tile/cracked{ @@ -4879,7 +4879,7 @@ /obj/structure/stone_tile{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "mD" = ( /obj/structure/stone_tile, @@ -5188,7 +5188,7 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "nC" = ( /obj/structure/stone_tile/block{ @@ -5257,7 +5257,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "oj" = ( /obj/structure/lattice/catwalk/mining, @@ -5286,7 +5286,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "oA" = ( /obj/effect/decal/cleanable/cobweb2, @@ -5350,7 +5350,7 @@ dir = 8 }, /obj/structure/stone_tile/center/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "oP" = ( /obj/structure/reagent_dispensers/watertank, @@ -5407,7 +5407,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "pd" = ( /obj/structure/extinguisher_cabinet/directional/east, @@ -5557,7 +5557,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "qR" = ( /obj/structure/stone_tile{ @@ -5586,7 +5586,7 @@ dir = 9 }, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "rj" = ( /obj/structure/chair{ @@ -5669,7 +5669,7 @@ dir = 4 }, /obj/structure/railing, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "rQ" = ( /obj/structure/stone_tile/block/cracked{ @@ -5716,7 +5716,7 @@ "rW" = ( /obj/structure/stone_tile/surrounding/cracked, /obj/structure/stone_tile/center/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "rY" = ( /obj/structure/stone_tile/block{ @@ -5825,7 +5825,7 @@ /obj/structure/stone_tile/block/burnt{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "sO" = ( /obj/effect/decal/cleanable/dirt, @@ -5902,7 +5902,7 @@ dir = 8 }, /obj/structure/stone_tile/center/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "to" = ( /obj/effect/decal/cleanable/dirt, @@ -6100,7 +6100,7 @@ }, /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/center, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "uk" = ( /obj/structure/stone_tile{ @@ -6226,7 +6226,7 @@ dir = 8 }, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "uR" = ( /obj/machinery/suit_storage_unit/lavaland, @@ -6242,13 +6242,13 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "va" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "vb" = ( /obj/machinery/computer/shuttle/mining{ @@ -6601,7 +6601,7 @@ dir = 4 }, /obj/structure/stone_tile/center/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "wY" = ( /obj/item/clothing/mask/gas/clown_hat, @@ -6616,7 +6616,7 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "xc" = ( /obj/structure/stone_tile/surrounding_tile, @@ -6710,7 +6710,7 @@ /area/mine/outpost/hallway/west) "xG" = ( /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "xL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6757,7 +6757,7 @@ "xT" = ( /obj/structure/lattice/catwalk/mining, /obj/structure/railing/corner, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "xW" = ( /obj/structure/stone_tile/block{ @@ -6862,11 +6862,11 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "yD" = ( /obj/structure/stone_tile/block, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "yG" = ( /obj/structure/stone_tile/block/cracked{ @@ -6897,7 +6897,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "yS" = ( -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "yW" = ( /obj/structure/stone_tile{ @@ -6939,7 +6939,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "zh" = ( /obj/structure/stone_tile/block{ @@ -7055,7 +7055,7 @@ /obj/structure/stone_tile/block{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "zR" = ( /obj/structure/disposalpipe/segment{ @@ -7123,7 +7123,7 @@ "Af" = ( /obj/structure/stone_tile/block, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Aj" = ( /obj/structure/stone_tile/block{ @@ -7168,7 +7168,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "As" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7540,7 +7540,7 @@ /obj/structure/railing{ dir = 6 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "Cy" = ( /obj/machinery/door/airlock{ @@ -7923,12 +7923,12 @@ }, /area/mine/outpost/medbay) "EA" = ( -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "EB" = ( /obj/structure/stone_tile/slab/cracked, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "ED" = ( /obj/structure/stone_tile/slab, @@ -7973,7 +7973,7 @@ dir = 8 }, /obj/structure/stone_tile/center, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "EO" = ( /obj/item/kirbyplants, @@ -8045,7 +8045,7 @@ /obj/structure/stone_tile/block/burnt{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Fv" = ( /obj/machinery/power/terminal{ @@ -8164,7 +8164,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Gh" = ( /obj/structure/cable{ @@ -8253,7 +8253,7 @@ /area/lavaland/surface/outdoors/outpost/catwalk) "GS" = ( /obj/structure/stone_tile, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "GT" = ( /obj/structure/stone_tile/cracked{ @@ -8297,12 +8297,12 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Hf" = ( /obj/structure/lattice/catwalk/mining, /obj/structure/railing, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "Hi" = ( /obj/structure/bedsheetbin, @@ -8318,7 +8318,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "Hu" = ( /obj/structure/stone_tile/block, @@ -8373,7 +8373,7 @@ /obj/structure/stone_tile/block{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "HG" = ( /obj/structure/stone_tile{ @@ -8417,7 +8417,7 @@ /obj/structure/railing{ dir = 10 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "HN" = ( /obj/machinery/door/airlock/security/glass{ @@ -8502,7 +8502,7 @@ }, /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/center, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Ik" = ( /obj/structure/stone_tile/block{ @@ -8510,7 +8510,7 @@ }, /obj/structure/stone_tile, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Il" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8527,7 +8527,7 @@ /area/mine/outpost/production) "Iw" = ( /obj/structure/stone_tile/cracked, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "Ix" = ( /obj/structure/lattice/catwalk/mining, @@ -8671,7 +8671,7 @@ dir = 1 }, /obj/structure/stone_tile/center, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Jl" = ( /obj/structure/table, @@ -8702,7 +8702,7 @@ dir = 8 }, /obj/structure/stone_tile/surrounding_tile, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Jx" = ( /obj/structure/shuttle/engine/heater, @@ -8729,7 +8729,7 @@ pixel_y = 11; pixel_x = -9 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "JI" = ( /obj/structure/stone_tile/surrounding, @@ -8781,7 +8781,7 @@ dir = 1 }, /obj/structure/stone_tile/surrounding_tile, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "JZ" = ( /obj/effect/decal/cleanable/dirt, @@ -8816,7 +8816,7 @@ /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Kl" = ( /obj/structure/table, @@ -8941,7 +8941,7 @@ /obj/structure/stone_tile/surrounding/cracked{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "KL" = ( /obj/structure/fans/tiny, @@ -8957,7 +8957,7 @@ /obj/structure/stone_tile/slab/burnt, /obj/structure/stone_tile/slab, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "KR" = ( /obj/machinery/flasher{ @@ -9062,7 +9062,7 @@ dir = 8 }, /obj/structure/stone_tile/center, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "LJ" = ( /obj/structure/stone_tile/block, @@ -9095,7 +9095,7 @@ dir = 1 }, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "LO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9147,7 +9147,7 @@ /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "LW" = ( /obj/structure/stone_tile/surrounding/burnt, @@ -9157,7 +9157,7 @@ "Ma" = ( /obj/structure/stone_tile/slab/burnt, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Mf" = ( /obj/structure/stone_tile/center, @@ -9197,7 +9197,7 @@ dir = 4 }, /obj/structure/stone_tile/center, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Mn" = ( /obj/machinery/suit_storage_unit/lavaland, @@ -9230,7 +9230,7 @@ }, /obj/structure/stone_tile, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Mz" = ( /obj/structure/stone_tile{ @@ -9304,7 +9304,7 @@ }, /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/center/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "MX" = ( /obj/machinery/mineral/equipment_vendor, @@ -9379,7 +9379,7 @@ dir = 1 }, /obj/structure/railing, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "Nn" = ( /obj/structure/stone_tile/block/cracked, @@ -9592,7 +9592,7 @@ /obj/structure/railing/corner{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "OU" = ( /obj/machinery/door_control/shutter/south{ @@ -9628,7 +9628,7 @@ "Pg" = ( /obj/structure/stone_tile/surrounding/cracked, /obj/structure/stone_tile/center/burnt, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Pk" = ( /obj/structure/stone_tile{ @@ -9731,7 +9731,7 @@ /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "PX" = ( /turf/simulated/wall, @@ -9794,7 +9794,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "QE" = ( /obj/effect/decal/cleanable/dirt, @@ -9848,7 +9848,7 @@ /area/lavaland/surface/outdoors) "QQ" = ( /obj/structure/stone_tile/block/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "QR" = ( /obj/structure/cable{ @@ -10023,7 +10023,7 @@ }, /obj/structure/stone_tile/surrounding_tile/cracked, /obj/structure/stone_tile/center, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "RU" = ( /obj/structure/stone_tile{ @@ -10072,7 +10072,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Sk" = ( /obj/structure/stone_tile{ @@ -10134,14 +10134,14 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "SH" = ( /obj/structure/stone_tile, /obj/structure/stone_tile/block{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "SO" = ( /obj/effect/turf_decal/box, @@ -10158,7 +10158,7 @@ }, /obj/structure/stone_tile/surrounding_tile/cracked, /obj/structure/stone_tile/center/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "ST" = ( /obj/structure/stone_tile{ @@ -10241,7 +10241,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "TF" = ( /obj/structure/sign/nanotrasen{ @@ -10304,7 +10304,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Uh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10414,7 +10414,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "UG" = ( /obj/structure/stone_tile/block{ @@ -10431,7 +10431,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "UO" = ( /obj/structure/stone_tile, @@ -10654,14 +10654,14 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "VM" = ( /obj/structure/stone_tile/block, /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "VN" = ( /obj/structure/bed, @@ -10727,7 +10727,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/legion) "VV" = ( /obj/machinery/firealarm/directional/west, @@ -10992,7 +10992,7 @@ /area/lavaland/surface/outdoors/outpost/catwalk) "XL" = ( /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "XM" = ( /obj/item/firealarm_electronics, @@ -11036,7 +11036,7 @@ /obj/structure/railing{ dir = 9 }, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "XU" = ( /obj/structure/stone_tile/slab/burnt, @@ -11269,14 +11269,14 @@ }, /obj/structure/stone_tile, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/lava/smooth/mapping_lava, +/turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Zo" = ( /obj/structure/stone_tile/block, /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "Zu" = ( /obj/structure/stone_tile/surrounding, @@ -11364,7 +11364,7 @@ /area/mine/outpost/maintenance/south) "ZL" = ( /obj/structure/stone_tile/surrounding_tile/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/lavaland/surface/outdoors/legion) "ZM" = ( /obj/effect/turf_decal/stripes/corner{ diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 5e9cda2d8d3b..abaedc81ffc8 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -10862,7 +10862,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/specops) "hnP" = ( -/turf/simulated/floor/plating/lava/smooth/airless, +/turf/simulated/floor/lava, /area/wizard_station) "hnT" = ( /obj/machinery/economy/vending/wallmed/syndicate{ @@ -11203,7 +11203,7 @@ /area/trader_station/sol) "hym" = ( /obj/structure/stone_tile/slab/cracked, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/ruin/space/bubblegum_arena) "hyA" = ( /obj/structure/curtain/open/shower{ @@ -14168,12 +14168,6 @@ /obj/item/toy/plushie/corgi, /turf/simulated/floor/grass/jungle, /area/centcom/ss220/library) -"jxt" = ( -/obj/structure/ore_box, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "jxO" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 8 @@ -15022,12 +15016,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_elite) -"kjx" = ( -/obj/effect/turf_decal/delivery/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "kjH" = ( /obj/structure/table/wood/fancy/black, /obj/structure/chair/stool/bar{ @@ -17444,7 +17432,7 @@ /turf/simulated/floor/wood/oak, /area/syndicate_mothership/control) "lOn" = ( -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/ruin/space/bubblegum_arena) "lOq" = ( /obj/structure/curtain/black{ @@ -19261,7 +19249,7 @@ /area/syndicate_mothership) "njf" = ( /obj/structure/stone_tile/slab/burnt, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/ruin/space/bubblegum_arena) "njR" = ( /obj/structure/fans/tiny/invisible, @@ -25715,15 +25703,6 @@ }, /turf/simulated/floor/carpet/cyan, /area/centcom/ss220/general) -"rNu" = ( -/obj/effect/turf_decal/delivery/white, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "rNA" = ( /obj/structure/closet/crate/secure/bin{ color = "36373a" @@ -26583,7 +26562,7 @@ /obj/structure/stone_tile/surrounding/burnt, /obj/structure/stone_tile/center/burnt, /obj/effect/landmark/spawner/bubblegum, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, +/turf/simulated/floor/lava/lava_land_surface, /area/ruin/space/bubblegum_arena) "spM" = ( /obj/structure/rack, @@ -29926,12 +29905,6 @@ }, /turf/simulated/floor/wood/fancy/oak, /area/centcom/ss220/bar) -"uLd" = ( -/obj/effect/turf_decal/delivery/red, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "uMm" = ( /obj/structure/flora/tree/jungle, /obj/item/flashlight/lantern{ @@ -33934,15 +33907,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/bar) -"xrm" = ( -/obj/effect/turf_decal/delivery/red, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "xsg" = ( /obj/structure/table/wood, /obj/item/vending_refill/nta, @@ -34230,11 +34194,6 @@ icon_state = "rampbottom" }, /area/syndicate_mothership/elite_squad) -"xBZ" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "xCo" = ( /obj/vehicle/bike{ dir = 8 @@ -43932,13 +43891,13 @@ fnU gOQ tCJ haI -jxt +jsg ivS ala qsk ovP haI -jxt +jsg gFk gOQ fnU @@ -44188,14 +44147,14 @@ vxx fnU gOQ ocR -xBZ -kjx ovP dJp ovP +dJp +ovP +nRS +jsg nRS -jxt -rNu mpq gOQ gOQ @@ -44445,14 +44404,14 @@ vxx fnU gOQ tCJ -uLd +bcl nlb -xrm +haI jsg -xrm +haI +ovP +bcl ovP -uLd -xBZ oEC gOQ gOQ @@ -48306,10 +48265,10 @@ viA viA lrc dlt -xBZ -xBZ -xBZ -xBZ +ovP +ovP +ovP +ovP cji rJo rJo @@ -48563,10 +48522,10 @@ viA viA viA dlt -xBZ -xBZ -xBZ -xBZ +ovP +ovP +ovP +ovP cji nbn nbn From 278fbec8639e5da8e3b0821fa031556db3f31f0e Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Tue, 26 Dec 2023 18:34:00 +1000 Subject: [PATCH 2/8] =?UTF-8?q?=D0=97=D0=B0=D1=81=D0=BF=D0=B0=D0=B2=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BC=D0=BE=D0=B1=D1=8B=20?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D1=8E=D1=82=20=D1=80=D0=B0=D0=BD=D0=B4=D0=BE?= =?UTF-8?q?=D0=BC=D0=BD=D1=8B=D0=B9=20=D0=A2=D0=A2=D0=A1=20=D0=B3=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D1=81=20=D0=BF=D0=BE=20=D0=B3=D0=B5=D0=BD=D0=B4?= =?UTF-8?q?=D0=B5=D1=80=D1=83,=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B5=20=D0=B7=D0=B5=D1=80=D0=BA=D0=B0=D0=BB?= =?UTF-8?q?=D0=BE=20=D0=B4=D0=B0=D0=B5=D1=82=20=D0=B2=D1=8B=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=B3=D0=BE=D0=BB=D0=BE=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/objects/structures/mirror.dm | 2 ++ code/modules/admin/verbs/gimmick_team.dm | 2 ++ modular_ss220/text_to_speech/_tts.dm | 2 +- .../code/base_seeds/mobs/_base.dm | 15 +++++++-- .../code/base_seeds/mobs/other.dm | 6 ++++ .../code/base_seeds/objs/objs.dm | 8 +++++ .../text_to_speech/code/tts_preferences.dm | 5 +-- modular_ss220/text_to_speech/code/tts_seed.dm | 33 +++++++++++++++---- .../text_to_speech/code/tts_subsystem.dm | 3 ++ 9 files changed, 64 insertions(+), 12 deletions(-) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index eabccdf939a5..573749b79b62 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -163,6 +163,8 @@ if(voice_choice) curse(user) + tts_choose(choice, H) // SS220 ADD + /obj/structure/mirror/magic/ui_close(mob/user) curse(user) diff --git a/code/modules/admin/verbs/gimmick_team.dm b/code/modules/admin/verbs/gimmick_team.dm index 5f656a35904c..51bc8613f99e 100644 --- a/code/modules/admin/verbs/gimmick_team.dm +++ b/code/modules/admin/verbs/gimmick_team.dm @@ -85,6 +85,8 @@ if(is_syndicate) SSticker.mode.traitors |= H.mind //Adds them to extra antag list + H.change_voice(H) // SS220 ADD + players_spawned++ if(players_spawned >= teamsize) break diff --git a/modular_ss220/text_to_speech/_tts.dm b/modular_ss220/text_to_speech/_tts.dm index 0d82e9c7d564..32dd3f6729f8 100644 --- a/modular_ss220/text_to_speech/_tts.dm +++ b/modular_ss220/text_to_speech/_tts.dm @@ -1,4 +1,4 @@ -/datum/modpack/example +/datum/modpack/tts name = "Text-To-Speech" desc = "Озвучка фраз." author = "furior" diff --git a/modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm b/modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm index facb46fd1f48..3ce278075e47 100644 --- a/modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm +++ b/modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm @@ -1,5 +1,16 @@ //Fallback values for TTS voices -/mob/living - tts_seed = "Angel" +/mob/living/carbon/Initialize() + . = ..() + if(!tts_seed) + tts_seed = get_random_tts_seed_gender() +/mob/living/silicon/Initialize() + . = ..() + if(!tts_seed) + tts_seed = get_random_tts_seed_gender() + +/mob/living/carbon/human/Initialize(mapload, datum/species/new_species) + . = ..() + if(dna) + dna.tts_seed_dna = tts_seed diff --git a/modular_ss220/text_to_speech/code/base_seeds/mobs/other.dm b/modular_ss220/text_to_speech/code/base_seeds/mobs/other.dm index 07757a188d6e..5e5c1efd7052 100644 --- a/modular_ss220/text_to_speech/code/base_seeds/mobs/other.dm +++ b/modular_ss220/text_to_speech/code/base_seeds/mobs/other.dm @@ -12,6 +12,12 @@ /mob/living/simple_animal/bot tts_seed = null +/mob/living/simple_animal/bot/mulebot + tts_seed = "Training_robot" + +/mob/living/simple_animal/bot/honkbot + tts_seed = "Training_robot" + /mob/living/simple_animal/slime tts_seed = "Chen" diff --git a/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm b/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm index f65e9be6188d..77e8b7c1fe94 100644 --- a/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm +++ b/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm @@ -15,3 +15,11 @@ /obj/item/ttsdevice tts_seed = "Xenia" + +/obj/structure/mirror/magic/Initialize(mapload, newdir, building) + . = ..() + options |= list("TTS-Voice") + +/obj/structure/mirror/magic/proc/tts_choose(choice, mob/living/carbon/human/H) + H.tts_seed = get_random_tts_seed_gender(H.gender) + H.dna.tts_seed_dna = H.tts_seed diff --git a/modular_ss220/text_to_speech/code/tts_preferences.dm b/modular_ss220/text_to_speech/code/tts_preferences.dm index c19f23b3d7c3..b7ec9b44557b 100644 --- a/modular_ss220/text_to_speech/code/tts_preferences.dm +++ b/modular_ss220/text_to_speech/code/tts_preferences.dm @@ -13,8 +13,9 @@ /datum/character_save/copy_to(mob/living/carbon/human/character) . = ..() - character.tts_seed = tts_seed - character.dna.tts_seed_dna = tts_seed + if(tts_seed) + character.tts_seed = tts_seed + character.dna.tts_seed_dna = tts_seed /datum/ui_module/tts_seeds_explorer name = "Эксплорер TTS голосов" diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index d9f806aff8a5..40b4af315852 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -20,8 +20,14 @@ tts_seeds = SStts220.tts_seeds_names else tts_seeds = SStts220.get_available_seeds(src) - - var/new_tts_seed = input(user || src, "Выберите голос:", "Настройка персонажа", tts_seed) as null|anything in tts_seeds + var/new_tts_seed + if(user.client && user.client.prefs.active_character.tts_seed && (user.gender == user.client.prefs.active_character.gender)) + if(alert(user || src, "Оставляем голос вашего персонажа [user.client.prefs.active_character.real_name]?", "Выбор голоса", "Нет", "Да") == "Да") + new_tts_seed = user.client.prefs.active_character.tts_seed + if(!new_tts_seed) + var/tts_gender = get_converted_tts_seed_gender(user.gender) + //new_tts_seed = tgui_input_list(user, "Меняем голос?", "Преобразуем голос", SStts220.tts_list_names_gender[tts_gender], timeout = 60 SECONDS) + new_tts_seed = input(user, "Выберите голос вашего персонажа", "Преобразуем голос") as null|anything in SStts220.tts_list_names_gender[tts_gender] if(!new_tts_seed) return null if(!silent_target && ismob(src) && src != user) @@ -41,11 +47,6 @@ tts_seed = new_tts_seed return new_tts_seed -/mob/living/carbon/human/Initialize(mapload, datum/species/new_species) - . = ..() - if(dna) - dna.tts_seed_dna = tts_seed - /mob/living/carbon/human/change_dna(datum/dna/new_dna, include_species_change, keep_flavor_text) . = ..() tts_seed = dna.tts_seed_dna @@ -61,6 +62,24 @@ set category = "Subsystems" change_voice() +/atom/proc/get_converted_tts_seed_gender() + switch(gender) + if(MALE) + return TTS_GENDER_MALE + if(FEMALE) + return TTS_GENDER_FEMALE + else + return TTS_GENDER_ANY + +/atom/proc/pick_tts_seed_gender() + var/tts_gender = get_converted_tts_seed_gender() + return pick(SStts220.tts_list_names_gender[tts_gender]) + +/atom/proc/get_random_tts_seed_gender() + var/tts_choice = pick_tts_seed_gender(gender) + var/datum/tts_seed/seed = SStts220.tts_seeds[tts_choice] + return seed.name + /** * Surgery to change the voice of TTS. * Below are the operations for organics and IPC. diff --git a/modular_ss220/text_to_speech/code/tts_subsystem.dm b/modular_ss220/text_to_speech/code/tts_subsystem.dm index e37caed029b5..6dd04fba02e8 100644 --- a/modular_ss220/text_to_speech/code/tts_subsystem.dm +++ b/modular_ss220/text_to_speech/code/tts_subsystem.dm @@ -34,6 +34,8 @@ SUBSYSTEM_DEF(tts220) var/list/tts_seeds_names_by_donator_levels = list() var/list/datum/tts_provider/tts_providers = list() + var/list/tts_list_names_gender = list(TTS_GENDER_ANY = list(), TTS_GENDER_MALE = list(), TTS_GENDER_FEMALE = list()) + var/list/tts_local_channels_by_owner = list() var/list/tts_requests_queue = list() @@ -182,6 +184,7 @@ SUBSYSTEM_DEF(tts220) tts_seeds[seed.name] = seed tts_seeds_names += seed.name tts_seeds_names_by_donator_levels["[seed.required_donator_level]"] += list(seed.name) + tts_list_names_gender[seed.gender] += seed.name tts_seeds_names = sortTim(tts_seeds_names, /proc/cmp_text_asc) /datum/controller/subsystem/tts220/Initialize(start_timeofday) From b0ee3cc89f6afe1e2c68632f5b2bbd590d4464b8 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Tue, 26 Dec 2023 18:51:59 +1000 Subject: [PATCH 3/8] =?UTF-8?q?=D0=9C=D0=B0=D0=B3=D0=B8=D1=87=D0=B5=D1=81?= =?UTF-8?q?=D0=BA=D0=BE=D0=B5=20=D0=B7=D0=B5=D1=80=D0=BA=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=20=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5=D1=82=20=D0=A2=D0=A2=D0=A1=20?= =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=BE=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm b/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm index 77e8b7c1fe94..cde27bbff9f3 100644 --- a/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm +++ b/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm @@ -18,8 +18,8 @@ /obj/structure/mirror/magic/Initialize(mapload, newdir, building) . = ..() - options |= list("TTS-Voice") + options |= list("Voice TTS") /obj/structure/mirror/magic/proc/tts_choose(choice, mob/living/carbon/human/H) - H.tts_seed = get_random_tts_seed_gender(H.gender) - H.dna.tts_seed_dna = H.tts_seed + if(choice == "Voice TTS") + H.change_voice(H) From ac1ddf8b6e37cc2cae3e166ac0dd295f77b61408 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Tue, 26 Dec 2023 19:04:39 +1000 Subject: [PATCH 4/8] =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D1=80=D0=B0=D1=89=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=BA=D0=BE=D0=B4=20=D0=B8=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm b/modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm index 3ce278075e47..25855266feb9 100644 --- a/modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm +++ b/modular_ss220/text_to_speech/code/base_seeds/mobs/_base.dm @@ -1,11 +1,6 @@ //Fallback values for TTS voices -/mob/living/carbon/Initialize() - . = ..() - if(!tts_seed) - tts_seed = get_random_tts_seed_gender() - -/mob/living/silicon/Initialize() +/mob/living/Initialize() . = ..() if(!tts_seed) tts_seed = get_random_tts_seed_gender() From 0a5dea24e79e303902821a6c0836b3ae1fe23f44 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Wed, 27 Dec 2023 01:15:52 +1000 Subject: [PATCH 5/8] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../text_to_speech/code/base_seeds/objs/objs.dm | 4 ++-- modular_ss220/text_to_speech/code/tts_seed.dm | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm b/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm index cde27bbff9f3..a889cdd5190c 100644 --- a/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm +++ b/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm @@ -20,6 +20,6 @@ . = ..() options |= list("Voice TTS") -/obj/structure/mirror/magic/proc/tts_choose(choice, mob/living/carbon/human/H) +/obj/structure/mirror/magic/proc/tts_choose(choice, mob/living/carbon/human/human_to_update) if(choice == "Voice TTS") - H.change_voice(H) + human_to_update.change_voice(human_to_update) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 40b4af315852..a71239b0fe15 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -20,16 +20,16 @@ tts_seeds = SStts220.tts_seeds_names else tts_seeds = SStts220.get_available_seeds(src) + var/datum/character_save/active_character = user?.client?.prefs.active_character var/new_tts_seed - if(user.client && user.client.prefs.active_character.tts_seed && (user.gender == user.client.prefs.active_character.gender)) - if(alert(user || src, "Оставляем голос вашего персонажа [user.client.prefs.active_character.real_name]?", "Выбор голоса", "Нет", "Да") == "Да") - new_tts_seed = user.client.prefs.active_character.tts_seed + if(active_character.tts_seed && (user.gender == active_character.gender)) + if(alert(user || src, "Оставляем голос вашего персонажа [active_character.real_name]?", "Выбор голоса", "Нет", "Да") == "Да") + new_tts_seed =active_character.tts_seed if(!new_tts_seed) var/tts_gender = get_converted_tts_seed_gender(user.gender) - //new_tts_seed = tgui_input_list(user, "Меняем голос?", "Преобразуем голос", SStts220.tts_list_names_gender[tts_gender], timeout = 60 SECONDS) new_tts_seed = input(user, "Выберите голос вашего персонажа", "Преобразуем голос") as null|anything in SStts220.tts_list_names_gender[tts_gender] - if(!new_tts_seed) - return null + if(!new_tts_seed) + return null if(!silent_target && ismob(src) && src != user) INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(tts_cast), null, src, tts_test_str, new_tts_seed, FALSE) if(user) @@ -78,6 +78,8 @@ /atom/proc/get_random_tts_seed_gender() var/tts_choice = pick_tts_seed_gender(gender) var/datum/tts_seed/seed = SStts220.tts_seeds[tts_choice] + if(!seed) + return null return seed.name /** From 1f4438666def7d950a5764e78dfbb9868150f1d2 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Wed, 27 Dec 2023 04:55:17 +1000 Subject: [PATCH 6/8] =?UTF-8?q?=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87?= =?UTF-8?q?=D0=B8=D0=B2=D0=B0=D0=B5=D0=BC=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=20=D0=B3=D0=BE=D0=BB=D0=BE=D1=81=D0=B0=20=D0=BF=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=BD=D0=B0=D1=82-=D1=82=D0=B8=D1=80=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/text_to_speech/code/tts_seed.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index a71239b0fe15..a4acad6e7a29 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -16,18 +16,21 @@ var/static/tts_test_str = "Так звучит мой голос." var/tts_seeds + var/tts_gender = get_converted_tts_seed_gender(user.gender) + var/list/list_genders = SStts220.tts_list_names_gender[tts_gender] if(user && (check_rights(R_ADMIN, FALSE, user) || override)) - tts_seeds = SStts220.tts_seeds_names + tts_seeds = list_genders else - tts_seeds = SStts220.get_available_seeds(src) + var/list/not_available_tts_seeds = list_genders - SStts220.get_available_seeds(src) + tts_seeds = list_genders - not_available_tts_seeds + var/datum/character_save/active_character = user?.client?.prefs.active_character var/new_tts_seed if(active_character.tts_seed && (user.gender == active_character.gender)) if(alert(user || src, "Оставляем голос вашего персонажа [active_character.real_name]?", "Выбор голоса", "Нет", "Да") == "Да") - new_tts_seed =active_character.tts_seed + new_tts_seed = active_character.tts_seed if(!new_tts_seed) - var/tts_gender = get_converted_tts_seed_gender(user.gender) - new_tts_seed = input(user, "Выберите голос вашего персонажа", "Преобразуем голос") as null|anything in SStts220.tts_list_names_gender[tts_gender] + new_tts_seed = input(user, "Выберите голос вашего персонажа", "Преобразуем голос") as null|anything in tts_seeds if(!new_tts_seed) return null if(!silent_target && ismob(src) && src != user) From 7f5c54264e8f04f49307cdb7a85814c948da97a0 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Wed, 27 Dec 2023 05:21:47 +1000 Subject: [PATCH 7/8] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC?= =?UTF-8?q?=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B0=20=D1=82=D0=B8=D1=80=20=D0=B3=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D1=81=D0=BE=D0=B2=20=D1=83=20=D0=BC=D0=B0=D0=B3=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D1=85=20=D0=B7=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm b/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm index a889cdd5190c..493e43abc5a1 100644 --- a/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm +++ b/modular_ss220/text_to_speech/code/base_seeds/objs/objs.dm @@ -22,4 +22,4 @@ /obj/structure/mirror/magic/proc/tts_choose(choice, mob/living/carbon/human/human_to_update) if(choice == "Voice TTS") - human_to_update.change_voice(human_to_update) + human_to_update.change_voice(human_to_update, TRUE) From ba2deb4d3e478868240795d18cfe6417e4fae396 Mon Sep 17 00:00:00 2001 From: PhantornRU <41479614+PhantornRU@users.noreply.github.com> Date: Sat, 30 Dec 2023 11:25:11 +1000 Subject: [PATCH 8/8] Apply suggestions from code review Co-authored-by: dj-34 --- code/game/objects/structures/mirror.dm | 2 +- code/modules/admin/verbs/gimmick_team.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 573749b79b62..f6477a42afe3 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -163,7 +163,7 @@ if(voice_choice) curse(user) - tts_choose(choice, H) // SS220 ADD + tts_choose(choice, H) // SS220 ADD /obj/structure/mirror/magic/ui_close(mob/user) curse(user) diff --git a/code/modules/admin/verbs/gimmick_team.dm b/code/modules/admin/verbs/gimmick_team.dm index 51bc8613f99e..db60559b74f1 100644 --- a/code/modules/admin/verbs/gimmick_team.dm +++ b/code/modules/admin/verbs/gimmick_team.dm @@ -85,7 +85,7 @@ if(is_syndicate) SSticker.mode.traitors |= H.mind //Adds them to extra antag list - H.change_voice(H) // SS220 ADD + H.change_voice(H) // SS220 ADD players_spawned++ if(players_spawned >= teamsize)