Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

autotraitor

Fixes #3517

2013-08-23 14:21:08 -04:00

blob

Commented out blob and wish granter.

2013-08-03 12:51:41 -07:00

changeling

Partial fix for #2284.

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

cult

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

epidemic

Fixed a typo.

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

events

Added two ears back.

2013-08-27 22:05:27 +01:00

extended

…

heist

Removes Vox flavour text carried over from chargen.

2013-08-13 00:03:14 -07:00

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 two ears back.

2013-08-27 22:05:27 +01:00

revolution

Misc formatting errors.

2013-08-27 22:10:47 +01: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

"Fixes" law 0.

2013-08-28 01:55:02 +01:00

wizard

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01: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

Misc formatting errors.

2013-08-27 22:10:47 +01:00

gameticker.dm

Changed vote settings to game mode votes other than extended will not be announced.

2013-08-23 05:47:45 -07: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

Vox theft objectives should check lockers and other storage now.

2013-08-25 02:53:07 -07:00

setupgame.dm

Added two ears back.

2013-08-27 22:05:27 +01:00