Chinsky 5c8ceae2fa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll ...

Conflicts:
	code/modules/mob/new_player/preferences_setup.dm

2015-05-12 06:04:22 +03:00

..

admin

new object-based lighting system

2015-05-10 20:54:25 +01:00

alarm

more lightweight camera caching

2015-05-10 17:06:30 +01:00

assembly

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

2015-04-24 17:13:37 +02:00

awaymissions

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

2015-04-24 17:13:37 +02:00

client

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

2015-05-12 06:04:22 +03:00

clothing

Merge pull request #8903 from Mloc/lightwrite

2015-05-11 09:26:04 +09:30

customitems

Adds foxeye's custom item

2015-05-02 11:19:52 +03:00

detectivework

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

economy

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

2015-05-09 11:13:05 +02:00

events

remove the sub-area system

2015-05-10 17:06:29 +01:00

examine

The examine tab now lists the available pen commands.

2015-05-05 09:03:43 +02:00

ext_scripts

…

flufftext

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

food

…

games

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

genetics

…

holodeck

new object-based lighting system

2015-05-10 20:54:25 +01:00

hydroponics

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

2015-05-11 09:28:59 +02:00

icon generation

…

library

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

lighting

new object-based lighting system

2015-05-10 20:54:25 +01:00

liquid

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

maps

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mining

new object-based lighting system

2015-05-10 20:54:25 +01:00

mob

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

2015-05-12 06:04:22 +03:00

nano

Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime

2015-05-10 23:20:56 +09:30

organs

Fixes #8823

2015-04-27 00:26:53 -04:00

overmap

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

2015-04-24 17:13:37 +02:00

paperwork

Crayons are now children of pens.

2015-05-05 08:41:24 +02:00

power

mood lighting for computers

2015-05-10 20:54:29 +01:00

projectiles

Merge pull request #9069 from RavingManiac/dev

2015-05-06 17:27:21 +03:00

random_map

Clean server start.

2015-04-18 15:32:25 +02:00

reagents

Added construction drone sprites from Pawn.

2015-05-11 14:46:47 +09:30

recycling

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

2015-05-02 21:50:11 +02:00

research

mood lighting for computers

2015-05-10 20:54:29 +01:00

scripting

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

security levels

…

shieldgen

new object-based lighting system

2015-05-10 20:54:25 +01:00

shuttles

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

spells

new object-based lighting system

2015-05-10 20:54:25 +01:00

supermatter

new object-based lighting system

2015-05-10 20:54:25 +01:00

surgery

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

vehicles

new object-based lighting system

2015-05-10 20:54:25 +01:00

virus2

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00