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

Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm

2015-08-27 08:53:22 +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/master' into dev-freeze

2015-08-13 09:01:10 +02:00

organ_icon.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-22 03:11:53 +09:30

organ_internal.dm

Fixes #10546

2015-08-12 12:06:31 -04:00

organ_stump.dm

Initial fixes

2015-08-08 11:10:28 -04:00

organ.dm

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

2015-08-27 08:53:22 +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

More tweaks to cut wound stages.

2015-07-30 11:46:49 -04:00