Hubblenaut 1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm

2015-05-12 14:39:21 +02: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

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

awaymissions

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

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

client

As per Ginja's suggestion, dummies are now used one per prefs datum.

2015-05-12 07:24:25 +03:00

clothing

Merge pull request #8946 from Zuhayr/miningstuff

2015-05-12 13:13:31 +03:00

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

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

2015-05-12 13:40:47 +02: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

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

2015-05-12 13:40:47 +02:00

hydroponics

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

2015-05-12 13:40:47 +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

materials

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

mining

qdel

2015-05-12 13:12:58 +09:30

mob

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

2015-05-12 14:39:21 +02: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

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

power

Merge pull request #8946 from Zuhayr/miningstuff

2015-05-12 13:13:31 +03:00

projectiles

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

2015-05-12 13:40:47 +02:00

random_map

Clean server start.

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

reagents

Merge pull request #8946 from Zuhayr/miningstuff

2015-05-12 13:13:31 +03:00

recycling

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

research

Merge pull request #8946 from Zuhayr/miningstuff

2015-05-12 13:13:31 +03: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