Chinsky 55671d7485 Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode ...

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/screen1_old.dmi

2013-03-06 17:04:45 +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

Fix for too many changelings.

2013-03-02 19:59:16 +01: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 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode

2013-03-06 17:04:45 +04:00

extended

Fixes a separate infinite loop error, as detailed here: https://github.com/ss13-daedalus/daedalus/issues/2

2012-05-10 14:34:32 +01:00

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

Changes Secret-Nuke ready requirements from 15 to 25.

2013-02-14 22:50:01 -05: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

Fixed runtime in traitor equip.

2013-02-20 08:58:09 +04:00

wizard

Wizard: Hugbox Edition.

2013-02-06 19:58:53 +04:00

events.dm

restructured event system, re-merged CIB's event system with TG's

2013-02-10 21:24:31 +10: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

Fixes issue #2384

2013-02-20 09:15:27 +04:00

gameticker.dm

updated roundstart music

2013-03-05 17:15:12 +10:00

intercept_report.dm

Fixed a bug with intercept reports.

2013-02-14 16:29:07 +01:00

newobjective.dm

Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain.

2013-02-25 19:48:00 -08: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