Ccomp5950 98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm

2014-03-18 19:44:19 -05:00

..

admin

Merge branch 'master' into dev

2014-03-08 12:02:32 +04:00

assembly

…

awaymissions

…

client

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

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

clothing

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05: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

Adds a C library alternative to the ircbot nudge script.

2014-03-04 10:08:17 +00:00

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

medical manual

2014-02-16 02:29:20 +11:00

liquid

…

maps

…

mining

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

2014-03-18 19:44:19 -05:00

mob

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

2014-03-18 19:44:19 -05:00

nano

NanoUI Caching and SMES tweaks

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

organs

Fixed blood injections not transmitting viruses properly.

2014-03-10 16:16:14 +04:00

paperwork

Talisman icon fix

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

power

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

2014-03-18 19:44:19 -05:00

projectiles

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

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

reagents

Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays

2014-03-16 21:16:31 -05:00

recycling

APC Area update initial commit.

2014-03-07 23:42:28 -06:00

research

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

2014-03-04 18:29:03 -06:00

scripting

…

security levels

Configuration option: Ability to set ERT to be admin call only.

2014-03-02 06:20:26 -06:00

supermatter

Changed supermatter messages to reflect what they actually mean.

2014-02-28 15:28:11 -08:00

surgery

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05:00

telesci

Because we HAVE to define Del() three times

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

virus2

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

2014-03-18 19:44:19 -05:00