PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

2015-04-24 17:13:37 +02:00

..

blob

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

2015-04-24 17:13:37 +02:00

calamity

Resolving bugs with spawn order and delays.

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

changeling

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

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

cult

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

2015-04-24 17:13:37 +02:00

endgame

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

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

epidemic

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

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

events

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

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

extended

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

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

heist

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

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

malfunction

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

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

meme

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

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

meteor

Adds Destroys.

2015-04-24 17:11:14 +02:00

ninja

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

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

nuclear

Adds Destroys.

2015-04-24 17:11:14 +02:00

revolution

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

2015-03-31 01:37:55 -04:00

sandbox

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

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

traitor

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

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

wizard

Further description fixes

2015-03-30 01:17:57 +01:00

events.dm

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

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

game_mode.dm

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

2015-03-27 11:13:53 +10:30

gameticker.dm

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

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

intercept_report.dm

Efficiency: Joblist

2014-03-10 21:57:36 -05:00

newobjective.dm

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

objective.dm

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

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

setupgame.dm

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

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