Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm

2017-06-01 17:27:00 -04:00

..

automata

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

building

Random map generator fixes, cleanup

2015-08-13 16:59:16 +09:30

drop

Merge pull request #3475 from SpadesNeil/aces-gun-stuff

2017-05-31 18:11:25 -05:00

mazes

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

noise

if you don't rename all of something, bad things happen m'kay kids

2017-02-04 15:46:03 +00:00

_random_map_setup.dm

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

random_map_verbs.dm

Random map generator fixes, cleanup

2015-08-13 16:59:16 +09:30

random_map.dm

Optimizes restart

2016-03-16 14:49:37 +03:00