Kyep 102ff67095 fixes merge conflict

2018-08-01 04:13:22 -07:00

..

carbonpaper.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

clipboard.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

fax.dm

Nightshifts & Randomized Station Time

2018-03-25 23:01:04 -07:00

faxmachine.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

filingcabinet.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

folders.dm

fix docs, change timing

2018-06-17 21:39:17 -07:00

frames.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

handlabeler.dm

Merge remote-tracking branch 'upstream/master' into camera-damage-refactor

2018-07-15 16:31:50 -04:00

paper_bundle.dm

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

paper.dm

Cleans out various macro redefinitions or useless use of syntax

2018-07-30 23:24:35 -07:00

paperbin.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

paperplane.dm

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

pen.dm

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

photocopier.dm

AGHHHHHHHHHHHHHHHHHHH WHATTT

2018-07-17 04:58:36 -04:00

photography.dm

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

silicon_photography.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

stamps.dm

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00