Commit Graph

11 Commits

Author SHA1 Message Date
SilentSpike
159937dc45 Merge branch 'master' into ace_spectator
Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
2015-07-26 14:15:24 +01:00
SilentSpike
13201866bd Module icon 2015-07-17 23:31:31 +01:00
jonpas
f1f9ee1365 Added module icon, removed comment 2015-06-09 18:27:58 +02:00
SilentSpike
e3c09a7099 Added icon to unconscious module 2015-06-01 20:56:58 +01:00
SilentSpike
b72512e3f1 Zeus modules require larger icons 2015-06-01 20:44:50 +01:00
SilentSpike
cd6474c748 Adding module icons 2015-06-01 20:44:47 +01:00
bux578
8a55c282e1 add repair module icon 2015-04-21 13:27:45 +02:00
bux578
c44b944044 add missing icons 2015-03-25 06:32:08 +01:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
bux578
1114e12186 add first batch of module icons, naming conventions 2015-03-23 13:56:59 +01:00
bux578
b6423cc011 add icons psd 2015-03-11 10:38:22 +01:00