PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm

2015-04-08 10:55:26 +02:00

..

blob

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

calamity

Resolving bugs with spawn order and delays.

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

changeling

Removes the bullshit ling meta message

2015-04-04 13:40:15 +03:00

cult

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

2015-04-08 10:55:26 +02:00

epidemic

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

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

events

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

extended

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

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

heist

Resolving bugs with spawn order and delays.

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

malfunction

Resolving bugs with spawn order and delays.

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

meme

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

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

meteor

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

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

ninja

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

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

nuclear

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

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

revolution

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

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

sandbox

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

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

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

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

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

Fixes a few incidental bugs with the antag and organ changes.

2015-04-01 06:33:47 -07: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

Merge with dev.

2015-03-30 08:36:52 +10:30

setupgame.dm

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

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