Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage ...

# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm

2019-09-21 12:40:07 -04:00

..

sheets

Merge remote-tracking branch 'upstream/master' into universal-damage

2019-09-21 12:40:07 -04:00

tiles

though-our-bodies-be-ravaged

2019-09-15 19:49:52 -04:00

medical.dm

though-this-world-may-be-broken

2019-09-15 05:53:43 -04:00

nanopaste.dm

Gives nanopaste overheal

2018-12-03 01:03:47 -05:00

rods.dm

Added Syndicate base and ported over turf decals

2019-03-31 20:26:02 +02:00

stack_recipe.dm

Removes a leading var

2018-08-23 01:38:56 -04:00

stack.dm

nor-shall-our-souls-falter

2019-09-17 16:06:09 -04:00

telecrystal.dm

Replaces uplink management by automated sharing

2019-01-03 16:29:31 +00:00