Zuhayr 9d5f14298d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/gamemodes/traitor/traitor.dm
	code/modules/mob/living/silicon/pai/pai.dm

2015-09-07 11:03:41 +09:30

..

blob

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

calamity

Antag system cleanup/fixes.

2015-09-04 18:28:05 +09:30

changeling

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

2015-09-05 09:24:30 +02:00

cult

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

2015-09-05 09:24:30 +02:00

endgame

Puts the world end handling inside a spawn instead of sleep.

2015-07-13 10:13:45 +02:00

epidemic

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

events

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

2015-06-26 20:28:47 +02:00

extended

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

heist

Antag system cleanup/fixes.

2015-09-04 18:28:05 +09:30

malfunction

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

2015-09-05 09:24:30 +02:00

meme

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

meteor

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

ninja

Antag system cleanup/fixes.

2015-09-04 18:28:05 +09:30

nuclear

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

2015-09-05 09:24:30 +02:00

revolution

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

2015-09-05 09:24:30 +02:00

sandbox

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

traitor

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-09-07 11:03:41 +09:30

wizard

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

2015-09-05 09:24:30 +02:00

events.dm

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

2015-07-27 10:20:20 +02:00

game_mode_latespawn.dm

Tweaks.

2015-09-06 11:19:54 +09:30

game_mode.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-09-07 11:03:41 +09:30

gameticker.dm

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

2015-09-05 09:24:30 +02:00

newobjective.dm

Fix gender issues, some typos from various files

2015-08-11 13:41:40 +03:00

objective.dm

Antag system cleanup/fixes.

2015-09-04 18:28:05 +09:30

setupgame.dm

Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173.

2015-05-15 23:19:57 +09:30