Techhead0 f41300bbe3 Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox ...

Conflicts:
	maps/exodus-1.dmm

2015-05-13 03:10:36 -04:00

..

devices

Merge pull request #9218 from Zuhayr/hailers

2015-05-12 15:00:36 +02:00

robot

Changed steel material name to a define.

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

stacks

Changed steel material name to a define.

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

weapons

Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox

2015-05-13 03:10:36 -04: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

Changed steel material name to a define.

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

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

shooting_range.dm

Adds Destroys.

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

toys.dm

Changed steel material name to a define.

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

trash.dm

Adds bread tube trash item

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