PsiOmega 3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi

2015-06-01 09:07:03 +02:00

..

devices

Fixes #9488

2015-05-31 01:43:06 +09:30

robot

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

2015-05-30 16:11:57 +02:00

stacks

Cosmetic fixups.

2015-05-31 17:10:49 +09:30

weapons

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

2015-06-01 09:07:03 +02:00

apc_frame.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +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

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