Ccomp5950 c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

2014-02-26 09:34:38 -06:00

..

admin

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

2014-02-26 09:34:38 -06:00

assembly

…

awaymissions

…

client

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

2014-02-26 09:34:38 -06:00

clothing

Fix to cloned gun issue - now your holster is located on your tactical armor.

2014-02-22 21:50:21 -06:00

customitems

Replaces modwho and adminwho with staffwho.

2014-01-10 12:49:32 -08:00

destilery

Reintroducing the dough-based cooking system.

2014-02-01 02:17:38 +01:00

detectivework

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

economy

Typo fix.

2014-02-22 06:54:11 +03:00

events

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

ext_scripts

…

flufftext

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

food

Diona roasts needs cooperation for acid

2014-02-01 11:16:55 +01:00

genetics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Fix for unlocking exploit.

2014-02-09 13:34:40 +03:00

mob

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

2014-02-26 09:34:38 -06:00

nano

NanoUI Caching and SMES tweaks

2014-01-12 20:07:48 +00:00

organs

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

paperwork

Talisman icon fix

2014-01-10 17:09:01 -05:00

power

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

2014-02-20 19:16:23 -06:00

projectiles

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

2014-02-26 09:34:38 -06:00

reagents

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

2014-02-26 09:34:38 -06:00

recycling

Mass correction of controler to controller.

2014-01-25 03:15:13 +10:30

research

Merge pull request #4270 from Baystation12/master

2014-01-11 18:18:03 -08:00

scripting

…

security levels

…

supermatter

Supermatter will stop processing when it's in space.

2014-02-15 17:20:54 -06:00

surgery

Merge remote-tracking branch 'upstream/master' into dev

2014-02-03 04:36:03 +03:00

telesci

Because we HAVE to define Del() three times

2014-02-04 11:30:35 -08:00

virus2

…