Neerti 6906acf193 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two ...

Conflicts:
	code/game/turfs/simulated/floor.dm
	icons/mob/back.dmi
	maps/exodus-3.dmm
	polaris.dme

2015-05-10 04:21:37 -04:00

..

admin

Merge pull request #9162 from volas/admin_stuff3

2015-05-10 10:11:29 +02:00

alarm

…

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

Fixes rlimb assignment for hands/feet in chargen

2015-05-08 21:12:15 -04:00

clothing

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04: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

Fixes #9029.

2015-04-30 10:22:58 +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 branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

hydroponics

Merge pull request #9093 from Baystation12/master

2015-05-05 01:42:57 +03:00

icon generation

…

library

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

2015-04-24 09:59:05 +02: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

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

mob

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

nano

Station alarm monitor changes.

2015-05-08 11:22:29 +02:00

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

Updates code based off of GinjaNinja's Feedback

2015-05-05 17:16:10 +02: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

Crayons are now children of pens.

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

recycling

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

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

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04: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

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

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

shuttles

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

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

spells

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

supermatter

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

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

surgery

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

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

vehicles

Grilles and rods.

2015-05-02 21:35:02 +02:00

virus2

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

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