PsiOmegaDelta 185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm

2015-12-08 08:23:10 +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

…

encased.dm

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

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

face.dm

…

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

…

organs_internal.dm

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

2015-12-06 11:48:20 +01:00

other.dm

…

robotics.dm

Updates macro/span use.

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

slimes.dm

…

surgery.dm

Updates macro/span use.

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