Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -04:00

..

_defines.dm

Fixes several resleeving bugs

2017-02-22 21:39:33 -05:00

circuitboards.dm

Adds the Body Designer for resleeving

2017-04-09 16:23:35 -04:00

computers.dm

Move to Eris Computers

2017-04-19 16:51:10 -04:00

designer.dm

Tether 7 work

2017-04-30 20:07:44 -04:00

documents.dm

Sleevecards!

2017-04-06 17:59:58 -04:00

implant.dm

Update do_after in backup implanter

2017-04-05 00:21:10 -04:00

infocore.dm

Save weight when resleeving while here

2017-04-10 18:19:02 -04:00

infomorph_software.dm

Sleevecards!

2017-04-06 17:59:58 -04:00

infomorph.dm

Fix VOREStation use of color macros so we pass the new stringent macro tests.

2017-05-08 22:34:13 -04:00

machines.dm

Un-scale HUDs for micros and macros.

2017-04-19 23:59:16 -04:00

sleevecard.dm

Sleevecards!

2017-04-06 17:59:58 -04:00