jack-fractal 474f44645d Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-09-12 00:10:12 -04:00

..

admin

Merge resolution, using dev-freeze map.

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

assembly

…

awaymissions

…

client

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-08-28 20:40:19 -07:00

clothing

Wirecutter use on gloves will remove Tajaran and Unathi restrictions.

2013-09-10 00:15:37 -07:00

customitems

Previous commit apparently got swallowed by the git monster.

2013-09-02 21:50:58 +01:00

destilery

…

detectivework

…

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

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

Revert "Experimentally readding Delete Book verb."

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

liquid

…

maps

…

mining

Commented out blob and wish granter.

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

mob

Merge resolution, using dev-freeze map.

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

nano

I added nanomanager.update_uis(src) to the cryo.dm Topic(). This method updates all UIs attached to the (src) object.Fixed issue with Nano UI windows taking seconds to load.

2013-08-21 01:50:50 +02:00

organs

Removed undeeded "ATTACK:"

2013-08-28 03:37:11 +01:00

paperwork

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

power

Merge resolution, using dev-freeze map.

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

projectiles

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-09-12 00:10:12 -04:00

reagents

Merge resolution, using dev-freeze map.

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

recycling

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

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