From d857015cb0e8ae70ea7aa49671ac9e508f00a137 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Sun, 13 Oct 2024 07:36:03 +0500 Subject: [PATCH] Fix linter --- .../RandomRuins/SpaceRuins/convoy_ambush.dmm | 2 +- _maps/map_files220/RandomZLevels/beach.dmm | 6 +-- .../map_files220/RandomZLevels/blackmesa.dmm | 44 +++++++++---------- _maps/map_files220/RandomZLevels/caves.dmm | 4 +- .../RandomZLevels/gate_lizard.dmm | 18 ++++---- .../RandomZLevels/spacebattle.dmm | 10 ++--- _maps/map_files220/RandomZLevels/wildwest.dmm | 6 +-- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm index 363a7d61a31b..7b8344da9eb6 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm @@ -742,7 +742,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "FP" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/unpowered/unpowered_structures) "FZ" = ( diff --git a/_maps/map_files220/RandomZLevels/beach.dmm b/_maps/map_files220/RandomZLevels/beach.dmm index 6843462d558d..b6aa95de8a2f 100644 --- a/_maps/map_files220/RandomZLevels/beach.dmm +++ b/_maps/map_files220/RandomZLevels/beach.dmm @@ -1026,7 +1026,7 @@ /area/awaymission/beach) "mP" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plating, /area/awaymission/beach) "mQ" = ( @@ -1888,7 +1888,7 @@ /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "zw" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "zF" = ( @@ -2619,7 +2619,7 @@ /area/awaymission/beach) "Iz" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plating, /area/awaymission/beach) "IA" = ( diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm index 1478b9c49c44..74c0c4d5c9ef 100644 --- a/_maps/map_files220/RandomZLevels/blackmesa.dmm +++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm @@ -87,7 +87,7 @@ /area/awaymission/black_mesa/tram_room) "ajf" = ( /obj/machinery/light_construct/directional/west, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/cryo_storage) "ajx" = ( @@ -457,7 +457,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/science_decon_room) "aEC" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) "aED" = ( @@ -3816,7 +3816,7 @@ /turf/simulated/floor/engine, /area/awaymission/black_mesa/hecu_zone_test_chambers) "eFJ" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plating, /area/awaymission/black_mesa/dorm_tunnel) "eFO" = ( @@ -4314,7 +4314,7 @@ /area/awaymission/black_mesa/hecu_zone_towards_facility) "fkH" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plating, /area/awaymission/black_mesa/tram_tunnel) "flK" = ( @@ -6087,7 +6087,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_infirmary) "hvE" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plating, /area/awaymission/black_mesa/entrance_tunnel) "hwz" = ( @@ -6825,7 +6825,7 @@ /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/entering_zone) "ivV" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) "ivZ" = ( @@ -8772,7 +8772,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/cryo_storage) "kMu" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/hecu_zone_camp) "kNg" = ( @@ -10093,7 +10093,7 @@ /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) "mpn" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/acid_lake_building) "mpu" = ( @@ -10805,7 +10805,7 @@ /area/awaymission/black_mesa/entrance) "ngU" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plating, /area/awaymission/black_mesa/entrance_tunnel) "nhd" = ( @@ -10857,7 +10857,7 @@ "njE" = ( /obj/machinery/light_construct/directional/west, /obj/effect/gibspawner/human, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) "njT" = ( @@ -10917,7 +10917,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/hecu_zone_camp) "noB" = ( @@ -11652,7 +11652,7 @@ }, /area/awaymission/black_mesa/genetics_elevator) "ohx" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_feesh) "oih" = ( @@ -12503,7 +12503,7 @@ /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/genetics_elevator) "pfy" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_downstairs_atrium) "pfE" = ( @@ -12528,7 +12528,7 @@ }, /area/awaymission/black_mesa/resonant_chamber) "pgX" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/cryo_storage) "phm" = ( @@ -12691,7 +12691,7 @@ /area/awaymission/black_mesa/xen/nihilanth_computer) "psS" = ( /obj/effect/decal/cleanable/blood/old, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) "ptr" = ( @@ -15944,7 +15944,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_hallway) "tuo" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plating, /area/awaymission/black_mesa/tram_tunnel) "tuH" = ( @@ -17377,7 +17377,7 @@ /area/awaymission/black_mesa/resonant_chamber) "viz" = ( /obj/effect/decal/cleanable/blood/old, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/acid_lake_building) "viD" = ( @@ -17671,7 +17671,7 @@ /area/awaymission/black_mesa/hecu_zone_camp) "vEG" = ( /obj/machinery/light/directional/west, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_feesh) "vEP" = ( @@ -17863,7 +17863,7 @@ /obj/machinery/door/window/reinforced/normal{ dir = 4 }, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/hecu_zone_camp) "vPi" = ( @@ -18898,7 +18898,7 @@ /area/awaymission/black_mesa/hecu_zone_external_sec) "xaE" = ( /obj/machinery/light/directional/east, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_feesh) "xaY" = ( @@ -18964,7 +18964,7 @@ /area/awaymission/black_mesa/xen/acid_lake) "xdF" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plating, /area/awaymission/black_mesa/dorm_tunnel) "xdZ" = ( @@ -19283,7 +19283,7 @@ /area/awaymission/black_mesa/science_internal) "xyX" = ( /obj/effect/decal/remains/human, -/obj/item/salvage/loot/russian, +/obj/item/salvage/loot/soviet, /turf/simulated/floor/plating, /area/awaymission/black_mesa/security_outpost) "xzz" = ( diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index f7271e502741..52637e5ab819 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -7500,7 +7500,7 @@ "Od" = ( /obj/effect/turf_decal/delivery, /obj/effect/spawner/random_spawners/dirt_often, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -8541,7 +8541,7 @@ "TV" = ( /obj/effect/turf_decal/delivery/white, /obj/effect/spawner/random_spawners/dirt_often, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index f0aeca59d16c..fe643a032755 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -6716,7 +6716,7 @@ "iMH" = ( /obj/effect/turf_decal/delivery, /obj/effect/spawner/random_spawners/dirt_frequent, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "iMN" = ( @@ -8754,7 +8754,7 @@ /area/awaymission/jungle_planet/outside/cave) "liA" = ( /obj/effect/turf_decal/plaque, -/obj/structure/statue/russian_mulebot{ +/obj/structure/statue/soviet_mulebot{ name = "CargoMULE" }, /turf/simulated/floor/plasteel, @@ -12769,7 +12769,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -13084,7 +13084,7 @@ }, /area/awaymission/jungle_planet/outside/cave/small) "qOq" = ( -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/river) "qOs" = ( @@ -13270,7 +13270,7 @@ "qYR" = ( /obj/effect/turf_decal/delivery, /obj/effect/spawner/random_spawners/dirt_often, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -14208,7 +14208,7 @@ "sba" = ( /obj/effect/turf_decal/delivery, /obj/effect/spawner/random_spawners/dirt_maybe, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "sbj" = ( @@ -14317,7 +14317,7 @@ "sjJ" = ( /obj/effect/turf_decal/delivery, /obj/effect/spawner/random_spawners/dirt_maybe, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18517,7 +18517,7 @@ /area/awaymission/jungle_planet/inside) "xtn" = ( /obj/effect/turf_decal/delivery, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -19174,7 +19174,7 @@ /area/awaymission/jungle_planet/inside/complex) "ykF" = ( /obj/effect/turf_decal/delivery, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "ylm" = ( diff --git a/_maps/map_files220/RandomZLevels/spacebattle.dmm b/_maps/map_files220/RandomZLevels/spacebattle.dmm index 674eeb6db1ef..bd9b8e4eee52 100644 --- a/_maps/map_files220/RandomZLevels/spacebattle.dmm +++ b/_maps/map_files220/RandomZLevels/spacebattle.dmm @@ -511,7 +511,7 @@ /area/awaymission/space_battle/cruiser) "bw" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "bx" = ( @@ -4732,7 +4732,7 @@ /area/awaymission/space_battle/hallway6) "os" = ( /obj/effect/turf_decal/delivery, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/space_battle/syndicate/syndicate2) "ou" = ( @@ -5582,7 +5582,7 @@ /area/awaymission/space_battle/syndicate/syndicate1) "ro" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/space_battle/syndicate/syndicate2) "rp" = ( @@ -8334,7 +8334,7 @@ "zX" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "zY" = ( @@ -10975,7 +10975,7 @@ "HU" = ( /obj/effect/turf_decal/delivery, /obj/machinery/light/small/directional/east, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "HV" = ( diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm index dd8dacd5c122..b86f645b0c32 100644 --- a/_maps/map_files220/RandomZLevels/wildwest.dmm +++ b/_maps/map_files220/RandomZLevels/wildwest.dmm @@ -23,7 +23,7 @@ "aj" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2338,7 +2338,7 @@ /area/awaymission/wildwest/wildwest_refine) "we" = ( /obj/effect/turf_decal/delivery, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2674,7 +2674,7 @@ "zP" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/item/salvage/ruin/russian, +/obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ icon_state = "dark" },