ZomgPonies ebfa0a0fd2 Merge branch 'pr/2' ...

Conflicts:
	baystation12.dme
	config/example/dbconfig.txt

2013-08-17 15:22:49 -04:00

..

admin

General code chances

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

Merge branch 'pr/2'

2013-08-17 15:22:49 -04:00

clothing

Revert "Revert "Moving files around to make code changes more modular from base BS12""

2013-08-12 02:04:07 -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

…

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

…

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

Much more probable fix for deadchat breaking on clientless ghosts.

2013-08-17 14:18:01 +01:00

organs

Fix for #3535.

2013-08-17 00:26:27 +03: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

Fully reverts clickdelay change.

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

reagents

Compile fix.

2013-08-13 13:47:22 +03: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

…

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

PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too.

2013-08-11 17:13:58 +01:00