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

…

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

…

destilery

…

detectivework

…

DetectiveWork

…

events

…

ext_scripts

Made IRCbot's password and host a config option.

2013-08-05 14:07:06 +01:00

flufftext

…

food

…

genetics

…

icon generation

…

library

Revert "Experimentally readding Delete Book verb."

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

liquid

…

maps

…

mining

…

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

…

power

…

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

…

scripting

…

security levels

…

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