Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 ...

# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.

2018-01-22 12:10:19 -05:00

..

calamity

…

changeling

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

cult

Polaris Sync

2017-11-04 13:37:13 -04:00

endgame

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

epidemic

It's CentCOM not CentCOMM

2017-07-21 04:29:39 -04:00

events

Polaris sync

2017-12-21 04:01:07 -05:00

extended

…

heist

Ups the required readies to 12

2017-11-11 16:53:32 -06:00

infiltrator

…

malfunction

…

meme

…

meteor

Meteors No Longer Hurt Floors

2018-01-17 20:57:17 -05:00

mixed

grammar never ends (#4421)

2017-12-08 15:30:34 -06:00

ninja

…

nuclear

Ups the required readies to 12

2017-11-11 16:53:32 -06:00

revolution

…

sandbox

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

technomancer

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

traitor

…

wizard

…

events.dm

Makes ion storms not emag bots

2017-10-04 13:45:41 -04:00

game_mode_latespawn.dm

…

game_mode.dm

Replaces NT Relation with Economic Status

2018-01-07 14:12:10 -08:00

gameticker.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

newobjective.dm

Replaces intelliCards with intelliCores.

2017-07-13 00:14:34 -07:00

objective.dm

Changes the old hyposprays to the new hyposprays. (#4223)

2017-11-15 16:31:50 -06:00

setupgame.dm

…