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

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

subtypes

…

blood.dm

…

misc.dm

…

organ_external.dm

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

2015-09-11 08:38:28 +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

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

2015-09-11 08:38:28 +02:00

organ.dm

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

2015-10-11 17:17:41 +02:00

pain.dm

…

robolimbs.dm

…

wound.dm

More tweaks to cut wound stages.

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