PsiOmega 9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml

2015-05-07 08:14:57 +02:00

..

admin

Ensures only antags and admins can see AntagOOC.

2015-05-06 11:34:54 +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

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

2015-04-30 08:09:25 +02:00

clothing

Merge pull request #8960 from mwerezak/item-color

2015-04-28 06:25:35 +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

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

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

Crayons are now children of pens.

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

mob

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

2015-05-07 08:14:57 +02:00

nano

Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI

2015-04-29 09:43:47 +03: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

Merge pull request #9007 from PsiOmegaDelta/Initialize

2015-04-30 21:12:06 +03:00

projectiles

Merge pull request #9069 from RavingManiac/dev

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

random_map

…

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

Adds two missing pooling instances and corrects broken grilles health status.

2015-05-02 21:46:30 +02: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