TechnoAlchemist e2a6dac71f Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff ...

fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi

2016-04-28 12:03:31 -07:00

..

glass.dm

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

leather.dm

adds sinew restraints, changes sinew droprate.

2016-04-26 14:10:42 -07:00

light.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

mineral.dm

Merge pull request #17108 from Bawhoppen/sandbagsz

2016-04-27 20:23:21 -04:00

sheet_types.dm

makes the path /animalhide

2016-04-24 22:07:51 -07:00

sheets.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00