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

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/reagents/reagent_containers/glass.dm

2015-06-16 10:30:50 +02:00

..

devices

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

2015-06-16 10:30:50 +02:00

robot

Fixes #9063

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

stacks

Fixes #9777

2015-06-10 23:14:34 +09:30

weapons

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

2015-06-16 10:30:50 +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

…

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

Fixes #9443.

2015-05-23 19:38:31 +02:00

trash.dm

Adds bread tube trash item

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