PsiOmega d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml

2015-05-30 16:11:57 +02:00

..

subtypes

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

2015-05-30 16:11:57 +02:00

blood.dm

Removes redundant surgery for brain and eye repair, now covered by organ repair in general.

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

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-05-30 16:11:57 +02:00

organ_icon.dm

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

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

organ_internal.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

organ_stump.dm

Generalized head reattachment to work with all limbs.

2015-05-19 07:09:00 +03:00

organ.dm

Dev-freeze into dev merge.

2015-05-30 00:31:12 +09:30

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 organ fixes. Yay.

2015-04-03 21:47:37 -07:00