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

Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm

2015-12-08 08:09:37 +01:00

..

_defines.dm

Fixes hemostat surgery.

2015-12-02 08:56:58 +01:00

~defines.dm

Fixes hemostat surgery.

2015-12-02 08:56:58 +01: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

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

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

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/master' into dev-freeze

2015-12-08 08:09:37 +01: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

Updates macro/span use.

2015-12-02 09:25:00 +01:00

other.dm

Readded preview icon for IPC, added language and blurb.

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

robotics.dm

Updates macro/span use.

2015-12-02 09:25:00 +01:00

slimes.dm

Converted over hatchets and scythes.

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

surgery.dm

Updates macro/span use.

2015-12-02 09:25:00 +01:00