From: Thomas <rat@rlyeh-military-affairs>
Date: Mon, 19 Mar 2012 23:54:13 +0000 (+0000)
Subject: Beard, Shaka, headbang, and whitebeard that somehow didn't get commited
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9e438d288df83f1a1a10934f328631c0eb76dfec;p=friendica-addons.git

Beard, Shaka, headbang, and whitebeard that somehow didn't get commited
---

diff --git a/smiley_pack/icons/devilangel/daseesaw.gif b/smiley_pack/icons/devilangel/daseesaw.gif
new file mode 100644
index 00000000..1c04b2ee
Binary files /dev/null and b/smiley_pack/icons/devilangel/daseesaw.gif differ
diff --git a/smiley_pack/icons/devilangel/saint.gif b/smiley_pack/icons/devilangel/saint.gif
new file mode 100644
index 00000000..52c22c48
Binary files /dev/null and b/smiley_pack/icons/devilangel/saint.gif differ
diff --git a/smiley_pack/icons/devilangel/turnevil.gif b/smiley_pack/icons/devilangel/turnevil.gif
new file mode 100644
index 00000000..1490c0f7
Binary files /dev/null and b/smiley_pack/icons/devilangel/turnevil.gif differ
diff --git a/smiley_pack/icons/fight/acid.gif b/smiley_pack/icons/fight/acid.gif
new file mode 100644
index 00000000..fa55f674
Binary files /dev/null and b/smiley_pack/icons/fight/acid.gif differ
diff --git a/smiley_pack/icons/fight/gangs.gif b/smiley_pack/icons/fight/gangs.gif
new file mode 100644
index 00000000..2c655b1f
Binary files /dev/null and b/smiley_pack/icons/fight/gangs.gif differ
diff --git a/smiley_pack/icons/oldcore/beard.png b/smiley_pack/icons/oldcore/beard.png
new file mode 100644
index 00000000..5d4b2846
Binary files /dev/null and b/smiley_pack/icons/oldcore/beard.png differ
diff --git a/smiley_pack/icons/oldcore/headbang.gif b/smiley_pack/icons/oldcore/headbang.gif
new file mode 100644
index 00000000..91ccb8bb
Binary files /dev/null and b/smiley_pack/icons/oldcore/headbang.gif differ
diff --git a/smiley_pack/icons/oldcore/shaka.gif b/smiley_pack/icons/oldcore/shaka.gif
new file mode 100644
index 00000000..336fe3bc
Binary files /dev/null and b/smiley_pack/icons/oldcore/shaka.gif differ
diff --git a/smiley_pack/icons/oldcore/whitebeard.png b/smiley_pack/icons/oldcore/whitebeard.png
new file mode 100644
index 00000000..2a1fccbb
Binary files /dev/null and b/smiley_pack/icons/oldcore/whitebeard.png differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index d71add50..c2d9a241 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -129,6 +129,14 @@ function smiley_pack_smilies(&$a,&$b) {
 	$b['texts'][] = ':devil';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devil' . '" />';	
 	
+	$b['texts'][] = ':daseesaw';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';	
+
+	$b['texts'][] = ':turnevil';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';	
+	
+	$b['texts'][] = ':saint';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';	
 
 	$b['texts'][] = ':graveside';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';	
@@ -278,6 +286,12 @@ function smiley_pack_smilies(&$a,&$b) {
 	$b['texts'][] = ':viking';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
 
+	$b['texts'][] = ':gangs';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
+
+	$b['texts'][] = ':acid';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
+
 	$b['texts'][] = ':alienmonster';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
 
@@ -369,7 +383,26 @@ function smiley_pack_smilies(&$a,&$b) {
 	$b['texts'][] = ':violin';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
 
+	$b['texts'][] = ':headbang';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
+
+		$b['texts'][] = ':beard';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
+
+	$b['texts'][] = ':whitebeard';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
+
+	$b['texts'][] = ':shaka';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
+
+	$b['texts'][] = ':\\.../';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+
+	$b['texts'][] = ':\\ooo/';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
+	$b['texts'][] = ':headdesk';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headdesk.gif' . '" alt="' . ':headdesk' . '" />';
 
 
 }
diff --git a/smiley_pack/smiley_pack.php~ b/smiley_pack/smiley_pack.php~
index bd7c522c..0ac42d00 100644
--- a/smiley_pack/smiley_pack.php~
+++ b/smiley_pack/smiley_pack.php~
@@ -129,6 +129,14 @@ function smiley_pack_smilies(&$a,&$b) {
 	$b['texts'][] = ':devil';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devil' . '" />';	
 	
+	$b['texts'][] = ':daseesaw';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';	
+
+	$b['texts'][] = ':turnevil';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';	
+	
+	$b['texts'][] = ':saint';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';	
 
 	$b['texts'][] = ':graveside';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';	
@@ -278,6 +286,12 @@ function smiley_pack_smilies(&$a,&$b) {
 	$b['texts'][] = ':viking';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
 
+	$b['texts'][] = ':gangs';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
+
+	$b['texts'][] = ':acid';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
+
 	$b['texts'][] = ':alienmonster';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
 
@@ -351,7 +365,47 @@ function smiley_pack_smilies(&$a,&$b) {
 	$b['texts'][] = ':rofl';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
 
+	$b['texts'][] = ':dj';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
+
+	$b['texts'][] = ':drums';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
+
+	$b['texts'][] = ':elvis';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
+
+	$b['texts'][] = ':guitar';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
+
+	$b['texts'][] = ':trumpet';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
+
+	$b['texts'][] = ':violin';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
+
+	$b['texts'][] = ':headbang';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
+
+	$b['texts'][] = ':headdesk';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headdesk.gif' . '" alt="' . ':headdesk' . '" />';
+
+	$b['texts'][] = ':beard';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
+
+	$b['texts'][] = ':whitebeard';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
+
+	$b['texts'][] = ':shaka';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
+
+	$b['texts'][] = ':\\.../';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+
+	$b['texts'][] = ':\\ooo/';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
+	$b['texts'][] = ':headdesk';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headdesk.gif' . '" alt="' . ':headdesk' . '" />';
 
 
 }