Chinsky f53fa1dee2 Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro ...

Conflicts:
	code/modules/virus2/disease2.dm
	code/modules/virus2/effect.dm

2013-10-06 13:34:50 +04:00

..

admin

Merge branch 'master' into dev

2013-09-26 10:26:03 +01:00

assembly

…

awaymissions

Recommitting PA sprites by Flash Kirby.

2013-09-01 21:10:39 +01:00

client

Multiple minor updates to Nano.

2013-09-19 01:39:59 +01:00

clothing

Merge branch 'virofixes' into viro

2013-10-06 05:23:47 +04:00

customitems

Merge branch 'master' into dev

2013-09-26 10:26:03 +01:00

destilery

…

detectivework

Made modules/detectivework and economy lowercase

2013-09-30 00:22:32 -04:00

economy

Renamed file so defines go before they are used.

2013-09-30 21:06:42 +04:00

events

moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database)

2013-09-20 13:35:49 +10:00

ext_scripts

Expansion of every "icon = ''" path.

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

flufftext

…

food

…

genetics

…

icon generation

Expansion of every "icon = ''" path.

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

library

More attempts at string limit string reduction.

2013-08-31 20:13:03 +01:00

liquid

…

maps

…

mining

Mining shuttle console now tells you if the shuttle is moving or not

2013-09-22 15:48:39 -04:00

mob

Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro

2013-10-06 13:34:50 +04:00

nano

Multiple minor updates to Nano.

2013-09-19 01:39:59 +01:00

organs

Changes to Shutdown Syndrome.

2013-10-06 09:04:41 +04:00

paperwork

Missed a couple 'color to item_color' in stamps.dm

2013-09-29 23:57:08 -04:00

power

Merge branch 'master' into dev

2013-09-26 10:26:03 +01:00

projectiles

Merge conflict fix.

2013-09-14 22:49:11 +03:00

reagents

Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro

2013-10-06 13:34:50 +04:00

recycling

Verb categories.

2013-09-19 08:30:05 +03:00

research

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

scripting

…

security levels

…

surgery

Fixes for typos.

2013-09-19 08:37:29 +03:00

virus2

Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro

2013-10-06 13:34:50 +04:00