Mloc-Argent 31d1307ed2 Merge branch 'master' into dev ...

Conflicts:
	code/modules/virus2/effect.dm

2013-08-20 21:57:01 +01:00

..

admin

Added new armour to raider generation proc.

2013-08-19 19:05:32 -07:00

assembly

…

awaymissions

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

client

Nano UI Framework

2013-08-19 22:52:23 +01:00

clothing

New vox armour.

2013-08-19 19:02:27 -07:00

customitems

Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request.

2013-07-22 17:37:39 +01:00

destilery

…

detectivework

Phasing out world loops, pt 1

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

DetectiveWork

Fix for #3406.

2013-08-01 17:11:12 +03:00

events

Changes to the radiation storm event...

2013-08-04 00:16:36 -04:00

ext_scripts

Made IRCbot's password and host a config option.

2013-08-05 14:07:06 +01:00

flufftext

Several ZAS fixes.

2013-07-25 21:34:12 -07:00

food

…

genetics

…

icon generation

…

library

…

liquid

…

maps

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

mining

Commented out blob and wish granter.

2013-08-03 12:51:41 -07:00

mob

Borer prompt will now actually work without runtimes.

2013-08-19 15:46:40 -07:00

nano

Nano UI Framework

2013-08-19 22:52:23 +01:00

organs

More dismemberment fixes

2013-08-20 02:06:56 +01:00

paperwork

Beakers and other glass containers now hide their contents, only showing the amount.

2013-07-22 17:38:34 +01:00

power

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

projectiles

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

2013-08-13 22:21:09 +01:00

reagents

Merge branch 'master' into dev

2013-08-13 22:21:37 +01:00

recycling

…

research

Reagent scanner's addition.

2013-08-17 17:00:33 +03:00

scripting

…

security levels

Maint_all_access and req_one_access.

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

surgery

Borer surgery fix.

2013-08-12 13:44:51 -07:00

virus2

Merge branch 'master' into dev

2013-08-20 21:57:01 +01:00