Zuhayr 794ca4064e Merge resolution.

2013-11-29 22:36:36 +10:30

..

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 resolution.

2013-11-29 22:36:36 +10:30

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

…

meteor

…

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

…

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

…

factions.dm

…

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

…

newobjective.dm

…

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