PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm

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

..

subtypes

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robolimbs2

2015-05-30 14:31:19 -04:00

blood.dm

mob/living/Life() now handles blood.

2015-06-14 11:14:31 +02:00

misc.dm

Organ cleanup, stat to DEAD, world removal

2015-05-25 14:50:02 +09:30

organ_external.dm

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

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

organ_icon.dm

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

2015-06-07 10:51:41 +02:00

organ_internal.dm

Changes IPC eyes to optics, generalizes vision organs

2015-05-27 02:18:11 -04:00

organ_stump.dm

Replaces setting ORGAN_ROBOT flag with robotize() call

2015-05-30 14:25:53 -04:00

organ.dm

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

2015-06-22 16:59:19 +02:00

pain.dm

Updates species checks

2015-05-27 01:34:50 -04:00

robolimbs.dm

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

wound.dm

Fixes droplimb wound not handling damage type

2015-07-08 15:17:50 -04:00