PsiOmegaDelta cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm

2015-06-30 08:24:43 +02:00

..

devices

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

2015-06-30 08:24:43 +02:00

robot

Fixes #9063

2015-05-30 05:16:01 +09:30

stacks

Updates fire_act() implementations to work better with lower temperature fires

2015-06-26 00:40:55 -04:00

weapons

Merge pull request #9871 from mwerezak/extinguisher

2015-06-22 15:36:55 +01:00

apc_frame.dm

Refactors /obj/item/apc_frame to /obj/item/frame/apc

2015-06-07 06:26:10 +02:00

blueprints.dm

Dev merge.

2015-05-11 18:45:14 +09:30

bodybag.dm

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

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

contraband.dm

Now possible to order a kit with a random toxin and syringe - 4TC

2015-02-20 21:13:34 +01:00

crayons.dm

Crayons are now children of pens.

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

glassjar.dm

Minor jar fixes

2015-04-16 17:30:01 +03:00

latexballoon.dm

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

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

paintkit.dm

Minor amendments to mech kits and icons.

2015-05-13 17:04:52 +09:30

shooting_range.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

toys.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

trash.dm

Adds bread tube trash item

2015-03-24 04:03:06 -04:00