PsiOmegaDelta 5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm

2015-12-08 08:09:37 +01:00

..

devices

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

2015-12-06 11:34:36 +01:00

robot

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

2015-09-05 09:24:30 +02:00

stacks

Merge pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +02:00

weapons

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

2015-12-08 08:09:37 +01:00

apc_frame.dm

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

2015-06-08 09:57:33 +02:00

blueprints.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

bodybag.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

contraband.dm

…

crayons.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

Added get_bodytype() species proc as groundwork for subspecies.

2015-08-22 02:53:16 +09:30

shooting_range.dm

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

2015-07-30 10:49:37 +02:00

toys.dm

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

2015-07-11 10:58:49 +02:00

trash.dm

…