Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

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

..

calamity

…

changeling

Merge pull request #3335 from LorenLuke/Sting-Range

2017-04-30 09:17:33 -05:00

cult

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

endgame

Port tg/paradise/good soft-edge lighting

2017-04-12 19:11:45 -04:00

epidemic

…

events

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

extended

…

heist

Merc and Heist back up to oldish numbers, heist round ends normally.

2017-04-25 18:55:36 -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

Changes Shields

2017-04-13 00:36:13 -04: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

Merc and Heist back up to oldish numbers, heist round ends normally.

2017-04-25 18:55:36 -05:00

revolution

September Polaris Sync (#545)

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

sandbox

…

technomancer

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -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

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04: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

Convert to using Mediamanager lobby music

2017-05-08 02:33:46 -04: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

…