Merge upstream

This commit is contained in:
Cyberboss
2017-04-01 23:38:37 -04:00
121 changed files with 2258 additions and 4320 deletions
@@ -117,3 +117,7 @@
/obj/effect/landmark/mapGenerator/snowy
mapGeneratorType = /datum/mapGenerator/snowy
endTurfX = 159
endTurfY = 157
startTurfX = 37
startTurfY = 35