Rob Nelson dd9691bb54 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into melting ...

Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/setup.dm

2014-11-02 12:47:21 -08:00

..

admin

Optimized and refactored list2text, text2list, and replacetext.

2014-11-01 23:14:41 -08:00

assembly

…

atmos_automation

Fixing Atmos Automation Console Deconstruction

2014-10-21 15:55:05 +02:00

awaymissions

Rewrote maploader to act faster and better handle set variables (a.k.a basically reimplemented BYOND map parser to load DM maps at init or in-game).

2014-10-31 01:22:49 +01:00

client

Merge pull request #1755 from Angelite191/mech-organs

2014-10-27 20:46:39 -05:00

clothing

Merge remote-tracking branch 'origin/Bleeding-Edge' into bay_hydro_port

2014-10-31 12:02:10 -05:00

customitems

…

detectivework

…

Economy

…

events

Merge pull request #1744 from dylanstrategie/Events

2014-10-30 10:50:53 -05:00

ext_scripts

…

flufftext

Optimized and refactored list2text, text2list, and replacetext.

2014-11-01 23:14:41 -08:00

food

Adds ability to cook internal organs using the deep-fryer, grill, and

2014-10-27 22:25:52 -04:00

genetics

…

genetics2

…

hydroponics

Fixes from bay upstream for hydro rewrite

2014-10-31 11:41:26 -05:00

icon generation

…

library

Merge pull request #1711 from DeityLink/some-more-cult-stuff

2014-10-26 10:51:34 -05:00

liquid

…

maps

…

media

Set emag cost on some objects.

2014-10-28 17:48:27 -07:00

mining

Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into melting

2014-11-02 12:47:21 -08:00

mob

Merge pull request #1824 from eswordthecat/Bleeding-Edge

2014-11-02 08:20:16 -06:00

nano

Import baystation12 nui resources fix.

2014-10-25 06:48:39 -08:00

organs

Fix #1439

2014-10-27 16:09:20 -05:00

paperwork

sepia cameras

2014-10-30 21:56:31 +01:00

power

Merge remote-tracking branch 'origin/Bleeding-Edge' into bay_hydro_port

2014-10-31 12:02:10 -05:00

projectiles

Fix travis

2014-10-31 12:12:52 -05:00

reagents

Ryetalyn stops jittering.

2014-11-02 02:12:20 +00:00

recycling

…

research

Merge pull request #1823 from ComicIronic/FabIndex

2014-11-02 10:46:40 -06:00

scripting

…

security levels

…

store

…

supermatter

…

surgery

Merge pull request #1777 from dylanstrategie/Surgery

2014-11-02 08:20:36 -06:00

telesci

…

virus2

fix #1406

2014-10-27 01:21:05 -05:00