Vetinari 1d62ceddaa Merged Upstream ...

This is a big one.

2014-03-04 22:19:09 +11:00

..

admin

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

2014-02-26 09:38:40 -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

Added 3D glasses to Dormitory

2014-03-02 21:31:46 +01: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

medical manual

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

liquid

…

maps

…

mining

Fix for unlocking exploit.

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

mob

Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic

2014-03-02 15:08:55 -06:00

nano

NanoUI Caching and SMES tweaks

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

organs

Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic

2014-03-02 15:08:55 -06:00

paperwork

Talisman icon fix

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

power

Reverted unrelated ZAS modification and unnecessary check.

2014-02-24 07:55:36 -07:00

projectiles

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

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

reagents

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

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

recycling

Runtime fix

2014-02-22 01:07:45 +13:00

research

Laser scalpels are now producable

2014-02-26 15:23:08 -05:00

scripting

…

security levels

…

supermatter

Revert "derp"

2014-02-21 18:17:15 +11:00

surgery

Initial run of surgery steps for laser scalpels

2014-02-25 15:44:01 -05:00

telesci

Because we HAVE to define Del() three times

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

virus2

…