Zuhayr 353ee43bae Uniform.dmi merge resolution.

2014-02-05 18:35:13 +10:30

..

admin

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

2014-01-30 12:14:44 -06:00

assembly

…

awaymissions

…

client

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

2014-02-04 23:55:27 -08:00

clothing

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

2014-02-03 04:36:03 +03: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

Small fixes, again

2014-01-04 21:26:28 +01:00

events

Various

2014-01-11 22:22:24 +01: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

Plasma glass stacking fix

2014-01-11 18:14:51 +13:00

mob

Master merge.

2014-02-05 18:34:23 +10:30

nano

NanoUI Caching and SMES tweaks

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

organs

Master merge.

2014-02-05 18:34:23 +10:30

paperwork

Talisman icon fix

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

power

IPC feeding from APCs, IPC lack of reagent processing.

2014-01-29 15:37:08 +10:30

projectiles

Merge pull request #4342 from Zuhayr/ihategit

2014-01-25 20:24:49 -08:00

reagents

Pepperspray safety.

2014-02-03 05:10:04 +03: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

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

2014-01-30 12:44:33 -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

…