LetterJay e57cf81636 Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

..

glass.dm

Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464)

2018-05-13 06:13:36 -05:00

leather.dm

Fixed stacks sometimes having the wrong amount if created on another stack

2018-05-11 17:30:32 -05:00

light.dm

Fixed stacks sometimes having the wrong amount if created on another stack

2018-05-11 17:30:32 -05:00

mineral.dm

Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568

2018-05-02 01:26:27 +00:00

sheet_types.dm

Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

sheets.dm

…