Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm

2017-06-01 17:27:00 -04:00

..

_defines.dm

Fixes hemostat surgery.

2015-12-02 14:42:41 +00:00

~defines.dm

Fixes hemostat surgery.

2015-12-02 14:42:41 +00:00

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

Allow MMI/Posi/Digi brains w/o minds to be put in

2017-03-12 01:15:40 -05:00

slimes.dm

Surgical tools will no longer cause damage on help intent

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

surgery.dm

Surgery Modifications

2017-05-31 17:41:02 -04:00