Vetinari ee617bc4f8 Dev Update ...

Update my Dev repo to bs12's dev post master merge. Should allow pull
request to automerge now.

2014-03-05 12:23:49 +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

Dev Update

2014-03-05 12:23:49 +11: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

…

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

Dev Update

2014-03-05 12:23:49 +11:00

flufftext

…

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

Dev Update

2014-03-05 12:23:49 +11:00

mob

Dev Update

2014-03-05 12:23:49 +11: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

Dev Update

2014-03-05 12:23:49 +11:00

projectiles

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

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

reagents

Dev Update

2014-03-05 12:23:49 +11:00

recycling

Runtime fix

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

research

Dev Update

2014-03-05 12:23:49 +11:00

scripting

…

security levels

Dev Update

2014-03-05 12:23:49 +11:00

supermatter

Dev Update

2014-03-05 12:23:49 +11:00

surgery

Dev Update

2014-03-05 12:23:49 +11:00

telesci

Because we HAVE to define Del() three times

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

virus2

…