LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 ...

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

2018-05-20 23:11:16 -05:00

..

clipboard.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

contract.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

filingcabinet.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

folders.dm

[s]Fixes writing bugs/exploits

2018-02-15 16:10:03 -06:00

handlabeler.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

paper_cutter.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

paper_premade.dm

Merge pull request #35453 from 81Denton/aluminium-with-two-i

2018-02-09 12:49:08 -06:00

paper.dm

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:11:16 -05:00

paperbin.dm

Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788

2018-04-10 07:20:33 +00:00

paperplane.dm

[s] Fixes altclick exploits

2018-02-11 05:08:00 -06:00

pen.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

photocopier.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

photography.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

stamps.dm

Update stamps.dm

2018-01-24 15:39:45 -06:00