Zuhayr 2cf9a18f9e Merge pull request #3572 from Baystation12/master ...

Merging master into dev.

2013-08-22 23:01:15 -07:00

..

admin

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-08-22 15:29:59 -07:00

assembly

…

awaymissions

…

client

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-08-22 15:29:59 -07: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

…

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

Revert "Experimentally readding Delete Book verb."

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

liquid

…

maps

…

mining

Commented out blob and wish granter.

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

mob

Merge pull request #3572 from Baystation12/master

2013-08-22 23:01:15 -07:00

nano

I added nanomanager.update_uis(src) to the cryo.dm Topic(). This method updates all UIs attached to the (src) object.Fixed issue with Nano UI windows taking seconds to load.

2013-08-21 01:50:50 +02:00

organs

Small fixes to hair.

2013-08-22 15:12:59 +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 pull request #3572 from Baystation12/master

2013-08-22 23:01:15 -07:00