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

Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm

2015-11-06 17:43:05 +01:00

..

blob

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

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

calamity

Adds antag datum flag that is used to exlude the type from random selection.

2015-11-05 08:48:05 +01:00

changeling

Merge pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +02:00

cult

Merge pull request #11340 from Baystation12/master

2015-10-21 10:36:30 +02:00

endgame

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

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

epidemic

Merge pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +02: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

Merge pull request #11289 from Kearel/secRemoveMaster

2015-10-13 20:27:56 +02:00

malfunction

Merge pull request #11340 from Baystation12/master

2015-10-21 10:36:30 +02:00

meme

Merge pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +02: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

Merge pull request #11289 from Kearel/secRemoveMaster

2015-10-13 20:27:56 +02:00

nuclear

Merge pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +02:00

revolution

Merge pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +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 pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +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

If an antag could not be auto-spawned, the game rechecks in the minimum time.

2015-10-12 13:03:51 -04:00

game_mode.dm

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

2015-10-16 11:04:43 +02:00

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