Mloc-Argent cf193b4893 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev

2013-08-05 22:53:25 +01:00

..

admin

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

2013-08-05 22:53:25 +01:00

assembly

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

awaymissions

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

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

client

Added a deadchat toggle for all players.

2013-07-27 22:54:30 -04:00

clothing

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2013-08-04 01:40:32 +04: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

- Added a config option that requires players to have played a certain number of days to select some jobs to play. The option is turned off by default and requires the database to work. See screenshot for default age requirement.

2013-01-15 03:39:46 +00:00

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

Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from.

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

genetics

Replaced monkey with confusion effect.

2012-11-11 19:35:01 +01:00

icon generation

…

library

Committing a fix for recursive books

2012-11-15 20:30:36 +00: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 branch 'dev' of github.com:Baystation12/Baystation12 into dev

2013-08-05 22:53:25 +01:00

organs

Merge resolution.

2013-08-05 08:00:03 -07: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

Fixed language datum comparison, fixed staff of change runtime.

2013-08-06 07:33:07 -07:00

reagents

Merge resolution.

2013-08-05 08:00:03 -07:00

recycling

DRY BLOOD FOR THE BLOOD GOD.

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

research

Commented out blob and wish granter.

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

scripting

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

security levels

Maint_all_access and req_one_access.

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

surgery

Typo fix, retractor step bugfix.

2013-07-25 03:06:06 +03:00

virus2

Fix for #3430.

2013-08-05 03:06:31 +03:00