Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 ...

Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme

2015-10-10 23:17:26 -04:00

..

calamity

Antag system cleanup/fixes.

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

changeling

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

cult

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

endgame

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

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

epidemic

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

events

Updates blob

2015-10-05 18:10:16 +03:00

extended

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

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

heist

Hopefully fixes some bugs that came out of that merge.

2015-09-06 20:00:01 -04:00

malfunction

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

2015-10-07 08:14:30 +02:00

meme

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

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

meteor

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

mixed

Added a handful of new mixed-antagonist modes.

2015-09-05 18:05:39 +09:30

ninja

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

nuclear

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

revolution

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

sandbox

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

traitor

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

wizard

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04: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 remote-tracking branch 'upstream/dev' into 150907-UplinkUses

2015-09-09 08:18:26 +02:00

gameticker.dm

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

2015-09-05 09:35:02 +02:00

newobjective.dm

Fix gender issues, some typos from various files

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

objective.dm

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

2015-09-05 09:35:02 +02:00

setupgame.dm

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

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