Mloc 49c0a30301 Merge branch 'master' into dev ...

Conflicts:
	baystation12.dme
	html/changelog.html

2013-09-26 10:26:03 +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

Expansion of every "icon = ''" path.

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

events

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

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

…

meteor

…

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

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

Phasing out world loops, pt 1

2013-06-20 17:21:16 +04:00

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 'master' into dev

2013-09-26 10:26:03 +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

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