Chinsky 7f62dfc5b1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/robot.dm
	code/setup.dm

2013-10-10 14:30:34 +04:00

..

admin

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

assembly

…

awaymissions

Recommitting PA sprites by Flash Kirby.

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

client

Fancy ghosts!

2013-10-06 16:10:47 +04:00

clothing

Merge pull request #3727 from fauxki/dev

2013-10-08 21:23:42 -07:00

customitems

Merge branch 'master' into dev

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

destilery

…

detectivework

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01: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 pull request #3745 from comma/ghosts

2013-10-10 03:06:40 -07:00

nano

Multiple minor updates to Nano.

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

organs

No idea why, but it caused all mobs spawn with deformed limbs.

2013-10-06 14:11:13 +04:00

paperwork

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

power

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

projectiles

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

reagents

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

recycling

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

research

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

scripting

…

security levels

Maint_all_access and req_one_access.

2013-08-04 16:29:41 +03:00

surgery

Fixes for typos.

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

virus2

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00