SinTwo 6bb5409349 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade ...

Conflicts:
	code/modules/admin/holder2.dm

2016-08-15 12:26:53 -04:00

..

adminpaper.dm

gets rid of unneeded code in adminpaper

2016-08-12 21:58:15 +01:00

carbonpaper.dm

…

clipboard.dm

a whole lot of nanoui upgrades

2016-06-24 00:43:16 -04:00

faxmachine.dm

allows check_rights to accept either mobs or clients.

2016-08-12 21:48:52 +01:00

filingcabinet.dm

…

folders.dm

a whole lot of nanoui upgrades

2016-06-24 00:43:16 -04:00

handlabeler.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

paper_bundle.dm

a whole lot of nanoui upgrades

2016-06-24 00:43:16 -04:00

paper.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade

2016-08-15 12:26:53 -04:00

paperbin.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

papershredder.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

pen.dm

…

photocopier.dm

refactors admin faxes to allow for more simple to use fax creation and replying.

2016-08-12 19:58:52 +01:00

photography.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

silicon_photography.dm

…

stamps.dm

New stamps for warden and cargo.

2016-07-23 15:42:08 +01:00