PsiOmegaDelta bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors ...

Conflicts:
	code/game/gamemodes/meteor/meteors.dm

2015-06-05 14:59:52 +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

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 'remotes/upstream/dev' into definecrusade

2015-06-05 11:26:25 +03:00

endgame

End game turf changes now simply alters color.

2015-05-29 23:38:09 +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' into 150605-Meteors

2015-06-05 14:59:52 +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

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

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

meme

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

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

meteor

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

ninja

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

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

nuclear

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

2015-05-29 21:51:27 +01: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

Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade

2015-06-05 11:26:25 +03:00

game_mode.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

gameticker.dm

Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade

2015-06-05 11:26:25 +03:00

intercept_report.dm

…

newobjective.dm

Fixes captain's laser gun

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

objective.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

setupgame.dm

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

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