shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I accidentally all the maps. whoops

Browse Source
This commit is contained in:
Poojawa
2019-08-04 06:27:28 -05:00
parent 7d65ddb417
commit dcbcf704da
8 changed files with 39 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm
+1 -1
View File
@@ -147,7 +147,7 @@
/area/ruin/unpowered/xenonest)
"aH" = (
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
"aI" = (
_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
+1 -1
View File
@@ -34,7 +34,7 @@
},
/area/ruin/unpowered)
"g" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/structure/mirror{
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+1
View File
@@ -279,6 +279,7 @@
},
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
(1,1,1) = {"
a
a
_maps/RandomZLevels/moonoutpost19.dmm
+22 -47
View File
@@ -1970,21 +1970,14 @@
},
/area/awaymission/moonoutpost19/syndicate)
"dE" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/main)
"dF" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/main)
"dG" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/item/mining_scanner,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
@@ -2543,7 +2536,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -2563,7 +2556,7 @@
/obj/machinery/door/airlock/maintenance{
req_access_txt = "201"
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -2572,7 +2565,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/turf_decal/tile/purple{
dir = 8
},
@@ -2750,7 +2743,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -26
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/structure/alien/weeds,
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -3187,7 +3180,7 @@
},
/area/awaymission/moonoutpost19/research)
"gl" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/turf_decal/tile/purple{
dir = 8
},
@@ -3389,7 +3382,7 @@
/obj/item/shard{
icon_state = "small"
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -3407,15 +3400,6 @@
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/research)
"gF" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/turf/open/floor/plasteel/white{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/research)
"gG" = (
/obj/structure/cable,
/obj/machinery/power/apc/highcap/fifteen_k{
@@ -4379,7 +4363,7 @@
},
/area/awaymission/moonoutpost19/research)
"is" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plasteel/white{
heat_capacity = 1e+006
},
@@ -6489,7 +6473,7 @@
/obj/machinery/light/small{
dir = 8
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -6500,7 +6484,7 @@
},
/area/awaymission/moonoutpost19/arrivals)
"mQ" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plasteel{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
dir = 8;
@@ -6514,13 +6498,13 @@
id_tag = "awaydorm2";
name = "Dorm 2"
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/arrivals)
"mS" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -6565,7 +6549,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/awaymission/moonoutpost19/arrivals)
"mZ" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -6686,7 +6670,7 @@
},
/area/awaymission/moonoutpost19/arrivals)
"nq" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/machinery/camera{
c_tag = "Dormitories";
dir = 4;
@@ -6811,7 +6795,7 @@
/obj/item/shard{
icon_state = "small"
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006
@@ -6821,7 +6805,7 @@
/obj/structure/grille/broken,
/obj/item/stack/rods,
/obj/item/shard,
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006;
@@ -6830,7 +6814,7 @@
},
/area/awaymission/moonoutpost19/arrivals)
"nE" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006;
@@ -6839,16 +6823,7 @@
},
/area/awaymission/moonoutpost19/arrivals)
"nF" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006;
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
"nG" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
@@ -36601,7 +36576,7 @@ fd
fv
fW
gl
gF
gl
gR
gR
gR
@@ -39966,7 +39941,7 @@ mZ
ni
nq
kG
nG
nF
kE
kE
kE
@@ -47371,7 +47346,7 @@ ac
ac
ac
ba
dF
dE
ac
ac
ac
_maps/RandomZLevels/wildwest.dmm
+3 -3
View File
@@ -957,7 +957,7 @@
/obj/structure/mineral_door/wood{
icon_state = "wood"
},
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating/ironsand{
icon_state = "ironsand1"
},
@@ -998,13 +998,13 @@
},
/area/awaymission/wildwest/gov)
"dt" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating/ironsand{
icon_state = "ironsand1"
},
/area/awaymission/wildwest/mines)
"du" = (
/obj/effect/decal/cleanable/blood/footprints/tracks/wheels,
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/wood,
/area/awaymission/wildwest/mines)
"dv" = (
tools/mapmerge2/dmi.py
+3 -1
View File
@@ -45,6 +45,8 @@ class Dmi:
@classmethod
def from_file(cls, fname):
image = Image.open(fname)
if image.mode != 'RGBA':
image = image.convert('RGBA')
# no metadata = regular image file
if 'Description' not in image.info:
@@ -250,4 +252,4 @@ if __name__ == '__main__':
Dmi.from_file(os.path.join(dirpath, filename))
count += 1
print(f"Successfully parsed {count} dmi files")
print(f"Successfully parsed {count} dmi files")
tools/mapmerge2/dmm.py
+7 -13
View File
@@ -343,7 +343,7 @@ def _parse(map_raw_text):
in_map_block = False
in_coord_block = False
in_map_string = False
iter_x = 0
base_x = 0
adjust_y = True
curr_num = ""
@@ -487,7 +487,7 @@ def _parse(map_raw_text):
curr_x = int(curr_num)
if curr_x > maxx:
maxx = curr_x
iter_x = 0
base_x = curr_x
curr_num = ""
reading_coord = "y"
elif reading_coord == "y":
@@ -521,21 +521,15 @@ def _parse(map_raw_text):
adjust_y = False
else:
curr_y += 1
if curr_x > maxx:
maxx = curr_x
if iter_x > 1:
curr_x = 1
iter_x = 0
curr_x = base_x
else:
curr_key = BASE * curr_key + base52_r[char]
curr_key_len += 1
if curr_key_len == key_length:
iter_x += 1
if iter_x > 1:
curr_x += 1
grid[curr_x, curr_y, curr_z] = duplicate_keys.get(curr_key, curr_key)
if curr_x > maxx:
maxx = curr_x
curr_x += 1
curr_key = 0
curr_key_len = 0
@@ -551,4 +545,4 @@ def _parse(map_raw_text):
data = DMM(key_length, Coordinate(maxx, maxy, maxz))
data.dictionary = dictionary
data.grid = grid
return data
return data
tools/mapmerge2/update_paths.py
+1 -1
View File
@@ -173,4 +173,4 @@ if __name__ == "__main__":
parser.add_argument("--directory", "-d", help="path to maps directory, defaults to _maps/")
parser.add_argument("--inline", "-i", help="treat update source as update string instead of path", action="store_true")
parser.add_argument("--verbose", "-v", help="toggle detailed update information", action="store_true")
main(parser.parse_args())
main(parser.parse_args())