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

..

backpack.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

bags.dm

Major sheet and material refactor.

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

belt.dm

Converted over hatchets and scythes.

2015-05-17 00:15:46 +09:30

bible.dm

More work on severing, improvements to yank-out-object.

2015-03-27 17:51:10 +10:30

boxes.dm

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

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

briefcase.dm

…

fancy.dm

Merge branch 'dev' into ofChemistryAndStuff

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

firstaid.dm

First pass on custom item cleanup/refactor.

2015-05-12 10:53:16 +09:30

internal.dm

Adds Destroys.

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

lockbox.dm

…

misc.dm

Major sheet and material refactor.

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

secure.dm

…

storage.dm

get_mobs_in_view() renamed to get_mobs_or_objects_in_view(). Returns mobs or objects depending on specifications

2015-05-17 16:54:18 +10:00

toolbox.dm

Updates to science

2015-04-04 13:38:03 +03:00

uplink_kits.dm

Fixes #5945, de-copy-pastes parapens and sleepypens

2015-05-28 22:23:37 +01:00

wallets.dm

Crayons are now children of pens.

2015-05-05 08:41:24 +02:00