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

Conflicts:
	code/game/objects/items/weapons/power_cells.dm

2015-05-22 08:26:13 +02:00

..

devices

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

2015-05-22 08:26:13 +02:00

robot

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

stacks

Updating stools/stool padding.

2015-05-17 12:53:23 +09:30

weapons

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

2015-05-22 08:26:13 +02:00

apc_frame.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

ashtray.dm

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +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

…

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

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

trash.dm

…