Arokha Sieyes 805b473976 Polaris Sync Merge ...

Fixed Polaris merge conflicts
* Space controller merge conflict

2017-03-18 00:58:12 -04:00

..

calamity

…

changeling

Merge pull request #3052 from Anewbe/emp_things

2017-03-14 21:39:01 -04:00

cult

Polaris Sync Merge

2017-03-18 00:58:12 -04:00

endgame

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

epidemic

…

events

Merge large polaris changes

2017-03-02 22:44:17 -05:00

extended

…

heist

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

malfunction

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

meme

…

meteor

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

mixed

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

ninja

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

nuclear

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

revolution

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

sandbox

…

technomancer

Polaris Sync Merge

2017-03-18 00:58:12 -04:00

traitor

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

wizard

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

events.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00

game_mode_latespawn.dm

Removes Last Minute Autoantag

2017-01-11 23:21:38 -05:00

game_mode.dm

Ensures post-start antag selection does not select banned people or ghosts or anything else it isn't meant to

2016-06-29 23:58:07 +01:00

gameticker.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00

newobjective.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

objective.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

setupgame.dm

…