ZomgPonies/Paradise — pull request #235 by alex-gh (2014-05-30 18:29:58+00:00)
Title: TC use count appears on round end

Conflicts:
code/datums/uplink_item.dm
code/game/objects/items/devices/uplinks.dm

Adds Icons and purchase list

Conflicts:
code/datums/uplink_item.dm
code/game/gamemodes/traitor/traitor.dm
code/stylesheet.dm

CSS is hard

Conflicts:
code/game/gamemodes/traitor/traitor.dm

Mah Indents

Made Purchase Log Text rather than List

Conflicts:
code/game/objects/items/devices/uplinks.dm

Moved images to top "survived" line

Conflicts:
code/game/objects/items/devices/uplinks.dm

Boxes show contents

Nuke Ops Group Shaming

Conflicts:
code/game/gamemodes/nuclear/nuclear.dm

Uses compiled list for uplinks

Conflicts:
code/game/objects/items/devices/uplinks.dm