cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Map Conflict Fixing Helper (#22421)

Browse Source 
* Trimmed down map_merge function to be simpler and straightforward, no
more recycling keys;
New function get_key, looks up a dict key by abusing python;
New function key_int_value, converts a base 52 key to a base 10 integer
value;
Map helper functions are no longer dependent on global values;
Reorganized map_helpers.py;

* Added Map Conflict Fixer Helper;
Changed parse_map function to accept a map's raw text instead of a file
path;
Tweaked some map merger code;

* Map Conflict Fixer readme.md entry

completed readme.md

more

Removed debug code
This commit is contained in:
xxalpha
2016-12-25 03:25:54 +00:00
committed by oranges
parent a5a5dcdeba
commit 8e80afbf86
6 changed files with 692 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/admin/verbs/mapping.dm
View File

@@ -45,6 +45,12 @@ var/list/admin_verbs_debug_mapping = list(
/client/proc/manipulate_organs
)
/obj/effect/debugging/mapfix_marker
name = "map fix marker"
icon = 'icons/mob/screen_gen.dmi'
icon_state = "mapfixmarker"
desc = "I am a mappers mistake."
/obj/effect/debugging/marker
icon = 'icons/turf/areas.dmi'
icon_state = "yellow"