comma e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm

2013-08-04 01:40:32 +04:00

..

autotraitor

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

2013-07-01 19:49:29 +04:00

blob

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

changeling

Partial fix for #2284.

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

cult

Fixes text errors in ghost manifest runes and newscasters with apostrophes.

2013-07-30 22:36:42 +01:00

epidemic

Fixed a typo.

2013-07-09 16:07:58 +04:00

events

Merge branch 'bleeding-edge-freeze' into viro

2013-07-09 12:49:23 +04:00

extended

…

malfunction

Fixes #2815

2013-06-24 21:55:21 -07: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

ninja

Removed debug outputs

2013-06-30 20:08:46 -07:00

nuclear

Added tool steps to manually remove the bolts on a deployed nuclear weapon.

2013-07-27 00:09:19 -07:00

revolution

Squashed commit of the following:

2013-05-29 13:18:44 -04: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

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

wizard

WIP: Implementing space ninja gamemode

2013-06-15 16:09:23 -07:00

events.dm

Phasing out world loops, pt 1

2013-06-20 17:21:16 +04: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

Derp.

2013-07-11 02:09:01 +04:00

gameticker.dm

Merge branch 'master' into BEF-staging

2013-07-04 13:08:28 +01: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 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

setupgame.dm

…