Fox McCloud 85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework ...

# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme

2019-08-25 16:51:21 -04:00

..

glass.dm

Update labor stacker

2019-05-31 19:37:25 +02:00

leather.dm

Reworks Plasmamen

2019-08-11 18:56:32 -04:00

light.dm

…

mineral.dm

Update labor stacker

2019-05-31 19:37:25 +02:00

sheet_types.dm

More Lavaland Updates: Primal and Bayonets

2019-08-19 20:02:53 -04:00

sheets.dm

Update labor stacker

2019-05-31 19:37:25 +02:00