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

Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm

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

..

blob

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

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

calamity

Resolving bugs with spawn order and delays.

2015-03-21 11:49:42 +10:30

changeling

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

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

cult

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

2015-08-11 18:47:05 +01: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

Fixes #10368

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

malfunction

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

2015-06-18 10:59:45 +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

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

2015-03-21 11:08:17 +10: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 the atom_pool, now datum_pool, to handle any datum object.

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

traitor

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

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

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 150702-MoneyMoneyMoney

2015-08-13 08:06:11 +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

Fixes #10129

2015-07-14 05:18:58 +09:30

setupgame.dm

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

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