Firecage 7f96592b87 Merge Conflict Fix

2016-01-27 13:29:38 +02:00

..

clipboard.dm

Makes burn_state use defines

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

filingcabinet.dm

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

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

folders.dm

Makes burn_state use defines

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

handlabeler.dm

Fixes not being able to move during jaunting if you are cuffed and pulled.

2015-10-08 00:48:00 +02:00

paper.dm

Line ending apocalypse

2015-12-17 14:12:37 +13:00

paperbin.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06: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

Removes Grab from photocopier

2016-01-24 19:11:09 -06:00

photography.dm

Detectives camera is now a subtype. Changed maps to have the subtype instead of the modified regular camera.

2016-01-03 07:36:12 -05:00

stamps.dm

removes a bunch of .0

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