ZomgPonies 91bc429721 Merge branch 'pr/4' ...

Conflicts:
	.gitignore

2013-08-24 17:25:58 -04:00

..

admin

Merge branch 'pr/4'

2013-08-24 17:25:58 -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/4'

2013-08-24 17:25:58 -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

…

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

Fix for invisible wounds.

2013-08-23 15:32:37 +03:00

organs

Fix for negative damage.

2013-08-23 15:33:51 +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

Clown fixes: Access, Waterflower can be filled with anything

2013-08-20 18:37:47 -04:00

recycling

Malf AI action - Robot Factory

2013-08-19 19:27:47 -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

Small fixes to hair.

2013-08-22 15:12:59 +01:00