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

Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi

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

..

admin

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

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

assembly

…

awaymissions

…

client

SMES NanoUI

2014-01-12 01:28:03 +00:00

clothing

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

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

customitems

Replaces modwho and adminwho with staffwho.

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

destilery

…

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

…

ext_scripts

…

flufftext

Optimized and refactored list2text, text2list, and replacetext.

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

food

Roasted diona, for ZomgPonies/Paradise.

2014-01-10 00:26:23 +10:30

genetics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Plasma glass stacking fix

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

mob

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

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

nano

Minor fix for NanoUI

2014-01-09 01:06:24 +00:00

organs

More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.

2014-01-06 14:54:35 +10:30

paperwork

Talisman icon fix

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

power

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

2014-01-23 00:05:53 -06:00

projectiles

Sniper Rifle Zoom proc documentation comments.

2014-01-22 23:46:05 -06:00

reagents

Derp merge deconflict error I made when merging master into dev-freeze.

2014-01-23 01:36:32 -06:00

recycling

…

research

Merge pull request #4270 from Baystation12/master

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

scripting

…

security levels

…

surgery

…

telesci

…

virus2

…