Skip to content

Commit

Permalink
Merge branch 'translate' into loadout-TM
Browse files Browse the repository at this point in the history
  • Loading branch information
dj-34 committed Oct 13, 2024
2 parents 5ca56fa + d7f4dd3 commit de17a70
Show file tree
Hide file tree
Showing 283 changed files with 10,299 additions and 8,821 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
"cM" = (
/obj/effect/mapping_helpers/no_lava,
/turf/template_noop,
/area/lavaland/surface/outdoors/unexplored)
"dh" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/disposalpipe/segment/corner{
Expand Down Expand Up @@ -646,6 +650,9 @@
/obj/machinery/economy/vending/chinese,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
"yh" = (
/turf/template_noop,
/area/lavaland/surface/outdoors/unexplored)
"zd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1443,26 +1450,26 @@ bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bV
bL
bL
bL
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
yh
bL
bL
bL
Expand All @@ -1479,19 +1486,19 @@ bV
bV
ab
ab
bV
bV
bV
bV
ab
bV
bV
bV
bV
bV
ab
ab
yh
yh
yh
yh
ab
yh
yh
yh
yh
yh
yh
yh
yh
ab
GF
ab
Expand Down Expand Up @@ -1524,7 +1531,7 @@ ab
ab
bT
ab
ab
cb
ab
ab
ab
Expand Down Expand Up @@ -2712,9 +2719,9 @@ ab
ab
ab
ab
ab
ab
ab
cM
cM
cM
ab
ab
bL
Expand Down Expand Up @@ -2748,9 +2755,9 @@ bV
bV
bV
bV
ab
ab
ab
cM
cM
cM
bV
bV
bV
Expand Down
Loading

0 comments on commit de17a70

Please sign in to comment.