Chinsky 5b168c8e4b Merge branch 'dev-freeze' into dev ...

Conflicts:
	icons/obj/ammo.dmi

2013-11-30 05:15:22 +04: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

Merge pull request #3759 from Baystation12/dev-freeze

2013-10-11 11:41:06 -07:00

cult

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

epidemic

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

events

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00

extended

…

heist

Raider state display compile fix.

2013-11-20 18:47:37 +10:30

malfunction

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00: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

Fixes #3248

2013-11-23 00:57:40 +10:30

nuclear

Nuke merge.

2013-11-23 00:44:19 +10:30

revolution

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

2013-09-02 23:32:33 +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

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

2013-09-02 23:32:33 +01:00

gameticker.dm

Merge branch 'dev' of github.com:Baystation12/Baystation12 into bs12-hooks

2013-11-25 21:17:07 +00: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