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

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02:00

..

bones.dm

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

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

encased.dm

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

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

face.dm

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

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

generic.dm

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

2015-06-26 20:28:47 +02:00

implant.dm

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

2015-06-26 20:28:47 +02:00

limb_reattach.dm

Fixed changelog

2015-05-20 09:37:54 +03:00

organs_internal.dm

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

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

other.dm

Readded preview icon for IPC, added language and blurb.

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

robotics.dm

Additional IPC tweaks.

2015-05-31 02:30:57 +09:30

slimes.dm

Converted over hatchets and scythes.

2015-05-17 00:15:46 +09:30

surgery.dm

Merged with dev.

2015-03-31 11:17:13 +10:30