Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 ...

# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.

2018-01-22 12:10:19 -05:00

..

_defines.dm

…

~defines.dm

…

bones.dm

Redoes the whole surgery PR

2017-12-08 18:35:50 -06:00

encased.dm

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

face.dm

Redoes the whole surgery PR

2017-12-08 18:35:50 -06:00

generic.dm

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

implant.dm

Fix NIF surgery post-update

2017-12-26 01:50:04 -05:00

limb_reattach.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

organs_internal.dm

Redoes the whole surgery PR

2017-12-08 18:35:50 -06:00

other.dm

Remove relative pathing from debridement surgery

2018-01-20 12:34:39 -05:00

robotics.dm

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

slimes.dm

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

surgery.dm

Fixes multisurgery

2018-01-19 23:26:56 -05:00