Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 ...

# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme

2018-01-04 22:44:04 -05:00

..

calamity

…

changeling

Grammar time, again. (#4402)

2017-12-05 14:34:45 -06:00

cult

Polaris Sync

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

endgame

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04: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

Renames Infiltrator gamemode to Team Traitor

2017-07-05 00:17:17 -04:00

malfunction

…

meme

…

meteor

Meteors Will Not Explode the Surface

2018-01-01 07:49:08 -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

…

technomancer

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -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

Removes Forced Antag Draft

2017-07-07 00:23:59 -04:00

gameticker.dm

Minor fixes to Polaris Merge

2017-12-23 21:54:07 -05: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

…