Commit Graph

3 Commits

Author SHA1 Message Date
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
ChuckTheSheep
7491cd7b65 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
2014-05-30 20:28:35 +02:00
johnsonmt88@gmail.com
1a8fb7c09e Another small chunk of reorganizing objects.
I've cleared out most of the .dm files in code/game/objects/ and put it into appropriate files/folders. The stuff I've left is stuff I believe may conflict with carn's work and some code for stuff that does not have a home yet.

TODO:
- Files that were left in code/game/objects that may conflict with carns work
- Go through all the files in all the subfolders of code/game/objects.
- Move all the defines from /defines/ to their proper spots

Not much right?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4520 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-22 21:55:46 +00:00