Merge branch 'translate' into Perevod_AI

ss220club · Dec 14, 2023 · 98d9fda · 98d9fda
2 parents 2100240 + 5d56576
commit 98d9fda
Show file tree

Hide file tree

Showing 10 changed files with 4,957 additions and 3,895 deletions.
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm
@@ -1,10 +1,4 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aX" = (
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plasteel/airless{
-	icon_state = "dark"
-	},
-/area/ruin/space/unpowered/unpowered_structures)
 "aZ" = (
 /obj/structure/chair{
 	dir = 8
@@ -384,12 +378,6 @@
 	},
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/ruin/space/powered)
-"rI" = (
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel/airless{
-	icon_state = "dark"
-	},
-/area/ruin/space/unpowered/unpowered_structures)
 "sn" = (
 /obj/structure/disposalpipe/segment{
 	pixel_x = -1;
@@ -2833,7 +2821,7 @@ zv
 mU
 dx
 wB
-aX
+cG
 Dq
 Dq
 PZ
@@ -2889,7 +2877,7 @@ wr
 zv
 YP
 wB
-rI
+wB
 tU
 NK
 NK
@@ -2946,7 +2934,7 @@ wr
 zv
 Sw
 cj
-aX
+cG
 Wv
 Wv
 cG
@@ -4819,8 +4807,8 @@ tZ
 bf
 TA
 wB
-rI
-rI
+wB
+wB
 SA
 RP
 wr

diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm
@@ -43,6 +43,14 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"dj" = (
+/obj/structure/table,
+/obj/item/gps/ruin{
+	pixel_x = 32;
+	gpstag = "####"
+	},
+/turf/simulated/floor/mineral/plastitanium/red/airless,
+/area/ruin/space/unpowered/unpowered_structures)
 "dE" = (
 /obj/structure/grille/broken,
 /obj/effect/landmark/damageturf,
@@ -1538,7 +1546,7 @@ Ly
 Ly
 VC
 VC
-OI
+dj
 Ui
 hp
 VC