PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

2015-08-21 20:27:48 +02:00

..

blob

Gives changeNextMove() a better name, default define

2015-06-30 22:29:45 -04:00

calamity

…

changeling

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

cult

Removes MASK/HEADCOVERSMOUTH

2015-08-18 17:20:36 -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

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

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

extended

…

heist

Fixes #10368

2015-07-29 22:48:11 -04:00

malfunction

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

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

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

nuclear

Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end

2015-06-26 01:04:03 +01:00

revolution

Merge resolution.

2015-06-28 06:13:24 +09:30

sandbox

Updates files as necessary to adhere to the new standard.

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

traitor

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

wizard

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

2015-08-11 18:47:05 +01:00

events.dm

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

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

game_mode_latespawn.dm

Refactor/tidies up latejoin antags/in-round antag spawning.

2015-06-21 19:33:49 +09:30

game_mode.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-20 14:09:07 +02:00

gameticker.dm

Merge pull request #10425 from Baystation12/dev-freeze

2015-08-04 13:07:11 +02:00

intercept_report.dm

Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney

2015-08-13 08:06:11 +02:00

newobjective.dm

Fix gender issues, some typos from various files

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

objective.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

setupgame.dm

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

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