Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 ...

# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme

2018-02-07 19:30:50 -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

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

surgery.dm

Fixes multisurgery

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