Remie Richards 897e8c5b88 Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work ...

Conflicts:
	code/game/objects/items/weapons/storage/storage.dm

2016-09-02 18:04:18 +01:00

..

clipboard.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

contract.dm

Removes var/ from arguments

2016-08-12 21:22:45 -04:00

filingcabinet.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

folders.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

handlabeler.dm

Revert "Fixes issues with packagewrap, trashbag, handlabeler, "

2016-09-01 12:18:24 -04:00

paper_cutter.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

paper.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

paperbin.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

paperplane.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

pen.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

photocopier.dm

Fix #19596: fixed inserting and removing things in and out of photocopier: now we correctly pass user variable into remove_photocopy() and do_insertion()

2016-08-02 04:17:23 +05:00

photography.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

stamps.dm

[s] Removes another world << from stamps (#17655)

2016-05-14 06:41:13 -05:00