SinTwo 4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2016-07-22 23:39:19 -04:00

..

carbonpaper.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

clipboard.dm

Changes types of ghosts and eyes

2016-02-20 15:36:05 +03:00

faxmachine.dm

Fixes part 1

2016-06-20 23:32:18 -04:00

filingcabinet.dm

Construction Update

2016-03-25 16:02:36 -04:00

folders.dm

Changes types of ghosts and eyes

2016-02-20 15:36:05 +03:00

handlabeler.dm

item_state cleanup

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

paper_bundle.dm

Reverts the second mob clean up because of incomplete implementation.

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

paper.dm

Adds SolGov logo to Paperwork and SolGov Stamps

2016-07-21 15:29:08 -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

Fixes issues travis found

2016-03-11 11:59:51 +03:00

photocopier.dm

Fixes part 1

2016-06-20 23:32:18 -04:00

photography.dm

item_state cleanup

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

silicon_photography.dm

Gives AI the hud, sorts the verbs

2016-02-05 17:21:04 +03:00

stamps.dm

Adds SolGov logo to Paperwork and SolGov Stamps

2016-07-21 15:29:08 -04:00