Segrain 35621466e1 Merge conflict fix.

2013-09-14 22:49:11 +03:00

..

admin

First pass on experimental change that allows zones to "Sleep"

2013-09-11 11:43:42 -07:00

assembly

…

awaymissions

Recommitting PA sprites by Flash Kirby.

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

client

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00

clothing

Merge conflict fix.

2013-09-14 22:49:11 +03:00

customitems

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

2013-09-02 23:32:33 +01:00

destilery

…

detectivework

…

DetectiveWork

More attempts at string limit string reduction.

2013-08-31 20:13:03 +01:00

events

Changes to the radiation storm event...

2013-08-04 00:16:36 -04:00

ext_scripts

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

flufftext

…

food

…

genetics

…

icon generation

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

library

More attempts at string limit string reduction.

2013-08-31 20:13:03 +01:00

liquid

…

maps

…

mining

…

mob

Merge conflict fix.

2013-09-14 22:49:11 +03:00

nano

Updated the documentation for the ui_interact proc.

2013-09-11 22:24:21 +01:00

organs

Bicaridine slows but does not stop internal bleeding.

2013-09-02 17:53:28 +01:00

paperwork

Merge conflict fix.

2013-09-14 22:49:11 +03:00

power

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

projectiles

Merge conflict fix.

2013-09-14 22:49:11 +03:00

reagents

Updated the documentation for the ui_interact proc.

2013-09-11 22:24:21 +01:00

recycling

Iconfix.

2013-09-13 19:40:09 +03:00

research

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

scripting

…

security levels

Maint_all_access and req_one_access.

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

surgery

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

virus2

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00