Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm

2017-03-22 17:29:01 -05:00

..

_defines.dm

…

~defines.dm

…

bones.dm

Medical tweaks

2017-01-23 23:43:44 -06:00

encased.dm

Medical tweaks

2017-01-23 23:43:44 -06:00

face.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

generic.dm

Medical tweaks

2017-01-23 23:43:44 -06:00

implant.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

limb_reattach.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

organs_internal.dm

Medical tweaks

2017-01-23 23:43:44 -06:00

other.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

2017-03-22 17:29:01 -05:00

robotics.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

slimes.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

surgery.dm

Another glorious bugfix

2016-11-16 20:48:04 -06:00