CosmicScientist 2844c80ed5 Fixing merge conflicts

2015-08-08 15:43:38 +01:00

..

glass.dm

Automatic stack merging

2015-08-01 10:34:50 -07:00

leather.dm

Ian costume is now Corgi costume, made from corgi hide, can be put on a corgi to visually hide if they're shaved, get corgi hide from butchering corgis, furismurder

2015-07-28 20:19:26 +01:00

light.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

mineral.dm

Fixed plasma not stacking.

2015-07-07 17:38:23 +01:00

sheet_types.dm

Separates construction into the door and a frame

2015-07-11 11:25:14 -04:00

sheets.dm

REMOVES CABLE CUFF

2015-06-06 16:21:41 -05:00