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

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm

2015-08-05 09:16:50 +02:00

..

devices

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

2015-08-05 09:16:50 +02:00

robot

Fixes #10353

2015-07-29 23:16:27 +02:00

stacks

Fixes #8210

2015-07-17 09:24:13 +03:00

weapons

Fixes #10372.

2015-08-03 09:20:36 +02: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

Fixes projectiles being able to hit humans in organs they do not have.

2015-07-28 20:23:26 -04:00

toys.dm

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

2015-07-10 12:57:46 +02:00

trash.dm

Adds bread tube trash item

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