Mloc 4d928843b1 Merge pull request #3609 from Zuhayr/dev ...

Stuff from dev-freeze.

2013-08-28 10:40:58 -07:00

..

admin

Merge pull request #3609 from Zuhayr/dev

2013-08-28 10:40:58 -07:00

assembly

…

awaymissions

Added two ears back.

2013-08-27 22:05:27 +01:00

client

Merge pull request #3609 from Zuhayr/dev

2013-08-28 10:40:58 -07:00

clothing

Merge pull request #3609 from Zuhayr/dev

2013-08-28 10:40:58 -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

Revert "Experimentally readding Delete Book verb."

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

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

Merge pull request #3609 from Zuhayr/dev

2013-08-28 10:40:58 -07:00

nano

* Nano UIs now "work" with AI and Cyborgs.

2013-08-26 23:39:52 +01:00

organs

Added two ears back.

2013-08-27 22:05:27 +01:00

paperwork

Added IA stamps, IA office has a receiving desk.

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

power

Commented out APC switching from Malf AI.

2013-08-25 02:35:05 -07:00

projectiles

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

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

reagents

Misc formatting errors.

2013-08-27 22:10:47 +01:00

recycling

DRY BLOOD FOR THE BLOOD GOD.

2013-06-01 10:56:59 +04:00

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