Lohikar dcf1b7d3ea Fix merge conflicts with mining changes

2017-03-22 17:54:52 -05:00

..

carbonpaper.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

clipboard.dm

…

faxmachine.dm

Fix fax machines (#1483)

2017-01-09 17:13:59 +02:00

filingcabinet.dm

Printing Fixes (#1476)

2017-01-09 00:44:42 +02:00

folders.dm

Removes unused pressure_resistance variable.

2016-02-03 18:17:52 -05:00

handlabeler.dm

…

paper_bundle.dm

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

paper.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

paperbin.dm

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

papershredder.dm

Shredder Movement & Law Controller (#1700)

2017-02-04 00:15:49 +02:00

pen.dm

RnD & Cat fixes (#1913)

2017-03-12 12:18:58 +02:00

photocopier.dm

Fix #1494 (#1496)

2017-01-10 18:01:33 +02:00

photography.dm

Removed uneceserry variable

2015-11-22 13:23:45 +02:00

silicon_photography.dm

Fixes AI camera not working and moves can_capture_turf to the mob.

2015-10-10 18:43:26 +03:00

stamps.dm

Removes unused pressure_resistance variable.

2016-02-03 18:17:52 -05:00