kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

clipboard.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

contract.dm

[MIRROR] Devil refactor+small revamp (#887)

2017-05-18 09:06:01 -05:00

filingcabinet.dm

A bunch of Initialize()s now have return values

2017-04-25 03:51:57 -05:00

folders.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

handlabeler.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

paper_cutter.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

paper.dm

this didn't mirror for some reason

2017-05-19 22:43:52 -05:00

paperbin.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

paperplane.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

pen.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

photocopier.dm

Adds feedback for photocopier on something specific.

2017-04-18 18:07:45 -05:00

photography.dm

Refactors picture frames to use wall frames system

2017-04-21 17:54:34 -05:00

stamps.dm

April sync (#360)

2017-04-13 23:37:00 -05:00