phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction ...

Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm

2016-04-26 21:49:51 +02:00

..

clipboard.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

filingcabinet.dm

First commit of this big PR

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

folders.dm

Exports

2016-04-13 06:01:40 +03:00

handlabeler.dm

First commit of this big PR

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

paper_cutter.dm

HUD item slots no longer show item placeholders when there are actual items inside

2016-03-22 08:00:38 +03:00

paper.dm

Fixed some remaining variables

2016-04-24 13:21:14 +01:00

paperbin.dm

Second commits.

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

pen.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

photocopier.dm

First commit of this big PR

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

photography.dm

First commit of this big PR

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

stamps.dm

removes a bunch of .0

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