Neerti 94a2ec5bf1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2 ...

Conflicts:
	.travis.yml
	polaris.dme

2015-07-26 16:01:27 -04:00

..

antagonist

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

area

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04:00

dna

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-26 10:21:36 +02:00

gamemodes

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-26 10:21:36 +02:00

jobs

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

machinery

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04:00

magic

…

mecha

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-26 10:21:36 +02:00

objects

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04:00

turfs

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2

2015-07-16 22:46:53 -04:00

vehicles

…

verbs

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

asteroid.dm

Refactored random map generator system and added several terrain generators.

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

atoms_movable.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-30 08:59:34 +02:00

atoms.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-26 10:21:36 +02:00

base_turf.dm

Refactored random map generator system and added several terrain generators.

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

json.dm

…

periodic_news.dm

…

response_team.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Supply shuttle and crate fixes

2015-05-23 16:15:04 +01:00