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

..

devices

Ensures drained_this_tick is actually set.

2015-05-06 12:30:05 +02:00

robot

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

2015-04-26 15:52:18 +02:00

stacks

Adds Destroys.

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

weapons

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

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

apc_frame.dm

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

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

ashtray.dm

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

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

blueprints.dm

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

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

shooting_range.dm

Adds Destroys.

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

toys.dm

Crayons are now children of pens.

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

trash.dm

Adds bread tube trash item

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