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

..

Cleanable

though-this-world-may-be-broken

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

turfdecals

Added Syndicate base and ported over turf decals

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

cleanable.dm

fix runtime

2019-09-04 22:20:28 -04:00

contraband.dm

though-this-world-may-be-broken

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

crayon.dm

Crayon Fixes (#12327)

2019-09-17 14:43:18 -07:00

decal.dm

Fix code review issues (planetary_atmos and Initialize())

2019-04-04 23:23:30 +02:00

misc.dm

nor-shall-our-souls-falter

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

remains.dm

next-we-melt-the-memories-that-are

2019-09-09 16:20:04 -04:00

warning_stripes.dm

tidyup

2018-10-07 12:43:37 +01:00