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

..

devices

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

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

mountable_frames

…

robot

Port TG hitby refactor and detonation of items by projectiles

2019-09-09 22:57:31 -04:00

stacks

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

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

weapons

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

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

ashtray.dm

fixes

2019-04-24 00:49:23 -04:00

blueprints.dm

though-this-world-may-be-broken

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

bodybag.dm

…

candle.dm

first-we-burn-away-the-world-that-was

2019-09-09 14:48:29 -04:00

cardboard_cutouts.dm

nor-shall-our-souls-falter

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

changestone.dm

…

contraband.dm

Standardized colors, finished change wrapper choosing and modified templates and their sizes

2019-06-30 19:46:13 +02:00

control_wand.dm

door remote logs

2019-07-28 17:49:04 -04:00

crayons.dm

Crayon Fixes (#12327)

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

dehy_carp.dm

Even better water handling

2019-06-03 00:31:03 +02:00

documents.dm

though-this-world-may-be-broken

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

flag.dm

though-our-bodies-be-ravaged

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

latexballoon.dm

nor-shall-our-souls-falter

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

misc.dm

…

mixing_bowl.dm

…

random_items.dm

WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?!

2019-08-26 18:23:09 -04:00

shooting_range.dm

…

toys.dm

though-our-bodies-be-ravaged

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

trash.dm

though-this-world-may-be-broken

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