Chinsky c4997a34f1 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm

2013-02-02 20:00:10 +04:00

..

autotraitor

compile fixes and cleanup

2013-01-07 02:36:52 +10:00

blob

-Now instead of just giving an angry message, any living mob with a client and the nuke disk that hits a transition on Z1 on them will have their momentum reversed, effectively sending them back where they came from. (Dead and clientless mobs still have the disk deleted from them)

2013-01-10 19:07:02 +00:00

changeling

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-21 05:05:17 +10:00

cult

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 01:02:27 +10:00

epidemic

required_players_secret added, which is the number of players needed for a game mode to start when that mode has been chosen at random.

2013-01-16 04:10:59 +08:00

events

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 01:02:27 +10:00

extended

…

malfunction

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 01:02:27 +10:00

meme

required_players_secret added, which is the number of players needed for a game mode to start when that mode has been chosen at random.

2013-01-16 04:10:59 +08:00

meteor

-Changed emitters.

2012-12-30 10:47:25 +00:00

nuclear

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-21 05:05:17 +10:00

revolution

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-21 05:05:17 +10:00

sandbox

-Added a config option, which defaults to off, which will let the gamemodes Wizard, Malf and Rev carry on playing without round interruption. Meaning...

2013-01-07 20:53:03 +00:00

traitor

minor tweaks and cleanup with events, readded meteor shower and grid check events, removed most unused event files (left some interesting ones)

2013-01-21 19:15:38 +10:00

wizard

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 01:02:27 +10:00

events.dm

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature

2013-01-31 11:15:32 +01:00

factions.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

game_mode.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-21 05:05:17 +10:00

gameticker.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-01-30 16:39:00 +04:00

intercept_report.dm

Committed Rolan7's patch to add more convenience to Hydroponics. The feature list includes:

2012-12-07 13:27:33 +00:00

newobjective.dm

Merged money, ATMs, bible changes, nullrod changes, policetape.

2012-09-03 01:29:53 +01:00

objective.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

setupgame.dm

-Added a "landmarks_list"; the game will now check for landmarks in the list instead of the world.

2012-09-09 22:27:06 +00:00