PsiOmega a9034bca66 Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork ...

Conflicts:
	code/modules/mob/living/simple_animal/shade.dm
	code/setup.dm

2015-03-30 22:55:24 +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

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

cult

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

2015-03-30 22:55:24 +02:00

epidemic

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

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

events

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

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

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

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

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

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

Resolving bugs with the game mode refactor.

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

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

Working on gamemode/antagonist code.

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

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 pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

setupgame.dm

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

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