Skip to content

Commit

Permalink
Fixup maps in TGM format
Browse files Browse the repository at this point in the history
5a37fc7: maps/map_files/BigRed/BigRed.dmm
5a37fc7: maps/map_files/LV624/LV624.dmm
5a37fc7: maps/map_files/LV624/standalone/clfship.dmm

Automatically commited by: tools\mapmerge2\fixup.py
  • Loading branch information
Detective-Google committed Feb 6, 2025
1 parent f605020 commit 7c0ec1f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions maps/map_files/BigRed/BigRed.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,14 @@
/obj/structure/surface/table,
/turf/open/floor/white,
/area/bigredv2/outside/marshal_office)
"acN" = (
/obj/structure/bed,
/obj/item/bedsheet/brown{
layer = 3.1
},
/obj/effect/landmark/corpsespawner/security/liaison,
/turf/open/floor/wood,
/area/bigredv2/outside/admin_building)
"acP" = (
/turf/open/mars,
/area/bigredv2/outside/n)
Expand Down Expand Up @@ -22680,14 +22688,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached/cement_sunbleached15,
/area/bigredv2/outside/nw)
"hqC" = (
/obj/structure/bed,
/obj/item/bedsheet/brown{
layer = 3.1
},
/obj/effect/landmark/corpsespawner/security/liaison,
/turf/open/floor/wood,
/area/bigredv2/outside/admin_building)
"hqD" = (
/turf/open/floor/asteroidwarning/southwest,
/area/bigredv2/outside/lz2_south_cas)
Expand Down Expand Up @@ -61431,7 +61431,7 @@ aNQ
aOO
aUg
aof
hqC
acN
aOO
aXn
aof
Expand Down
10 changes: 5 additions & 5 deletions maps/map_files/LV624/LV624.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,10 @@
/obj/structure/window/framed/colony,
/turf/open/floor/plating/platebotc,
/area/lv624/lazarus/quartstorage)
"acc" = (
/obj/item/explosive/grenade/high_explosive,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/north_east_jungle)
"acd" = (
/obj/structure/pipes/standard/manifold/hidden/cyan{
dir = 8
Expand Down Expand Up @@ -16423,10 +16427,6 @@
/obj/item/stack/sheet/wood,
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
"ovV" = (
/obj/item/explosive/grenade/high_explosive,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/north_east_jungle)
"owe" = (
/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
pixel_x = 8
Expand Down Expand Up @@ -46905,7 +46905,7 @@ lSs
vjH
vSG
fuY
ovV
acc
tyG
iwh
jRm
Expand Down
10 changes: 5 additions & 5 deletions maps/map_files/LV624/standalone/clfship.dmm
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/item/ammo_magazine/rifle/boltaction,
/turf/open/floor/damaged3/west,
/area/lv624/lazarus/crashed_ship)
"ag" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/ammo_magazine/rifle/mar40,
Expand Down Expand Up @@ -732,10 +736,6 @@
},
/turf/open/floor/wood,
/area/lv624/lazarus/crashed_ship)
"yK" = (
/obj/item/ammo_magazine/rifle/boltaction,
/turf/open/floor/damaged3/west,
/area/lv624/lazarus/crashed_ship)
"yT" = (
/obj/structure/barricade/metal/wired{
icon_state = "metal_2"
Expand Down Expand Up @@ -2692,7 +2692,7 @@ dN
ok
Pu
qU
yK
aa
Xx
xk
dN
Expand Down

0 comments on commit 7c0ec1f

Please sign in to comment.