From: Thomas <rat@rlyeh-military-affairs>
Date: Mon, 19 Mar 2012 03:14:02 +0000 (+0000)
Subject: Fantasy smileys.  Alas, not the fantasty where nobody uses smileys.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bad9d035fe57fc4faa5641cf92dd38222e88d95e;p=friendica-addons.git

Fantasy smileys.  Alas, not the fantasty where nobody uses smileys.
---

diff --git a/smiley_pack/icons/fantasy/alienmonster.gif b/smiley_pack/icons/fantasy/alienmonster.gif
new file mode 100644
index 00000000..e0ca7f65
Binary files /dev/null and b/smiley_pack/icons/fantasy/alienmonster.gif differ
diff --git a/smiley_pack/icons/fantasy/barbarian.gif b/smiley_pack/icons/fantasy/barbarian.gif
new file mode 100644
index 00000000..de8a0686
Binary files /dev/null and b/smiley_pack/icons/fantasy/barbarian.gif differ
diff --git a/smiley_pack/icons/fantasy/dinosaur.gif b/smiley_pack/icons/fantasy/dinosaur.gif
new file mode 100644
index 00000000..e8c625c3
Binary files /dev/null and b/smiley_pack/icons/fantasy/dinosaur.gif differ
diff --git a/smiley_pack/icons/fantasy/dragon.gif b/smiley_pack/icons/fantasy/dragon.gif
new file mode 100644
index 00000000..fd28fbf1
Binary files /dev/null and b/smiley_pack/icons/fantasy/dragon.gif differ
diff --git a/smiley_pack/icons/fantasy/dragonwhelp.gif b/smiley_pack/icons/fantasy/dragonwhelp.gif
new file mode 100644
index 00000000..dbc45559
Binary files /dev/null and b/smiley_pack/icons/fantasy/dragonwhelp.gif differ
diff --git a/smiley_pack/icons/fantasy/ghost.gif b/smiley_pack/icons/fantasy/ghost.gif
new file mode 100644
index 00000000..4c5d85d8
Binary files /dev/null and b/smiley_pack/icons/fantasy/ghost.gif differ
diff --git a/smiley_pack/icons/fantasy/mummy.gif b/smiley_pack/icons/fantasy/mummy.gif
new file mode 100644
index 00000000..50e1dfb9
Binary files /dev/null and b/smiley_pack/icons/fantasy/mummy.gif differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index d4eadb50..d333b34c 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -259,4 +259,25 @@ 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'][] = ':alienmonster';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
+
+	$b['texts'][] = ':barbarian';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
+
+	$b['texts'][] = ':dinosaur';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
+
+	$b['texts'][] = ':dragon';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
+
+	$b['texts'][] = ':dragonwhelp';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':dragonwhelp' . '" />';
+
+	$b['texts'][] = ':ghost';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
+
+	$b['texts'][] = ':mummy';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
+
 }
diff --git a/smiley_pack/smiley_pack.php~ b/smiley_pack/smiley_pack.php~
index 5f535901..d4eadb50 100644
--- a/smiley_pack/smiley_pack.php~
+++ b/smiley_pack/smiley_pack.php~
@@ -207,4 +207,56 @@ function smiley_pack_smilies(&$a,&$b) {
 
 	$b['texts'][] = ':pillow';
 	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
+
+	$b['texts'][] = ':2guns';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
+
+	$b['texts'][] = ':alienfight';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
+
+	$b['texts'][] = ':army';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
+
+	$b['texts'][] = ':arrowhead';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
+
+	$b['texts'][] = ':bfg';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+
+	$b['texts'][] = ':bowman';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
+
+	$b['texts'][] = ':chainsaw';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
+
+	$b['texts'][] = ':crossbow';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
+
+	$b['texts'][] = ':crusader';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
+
+	$b['texts'][] = ':dead';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
+
+	$b['texts'][] = ':hammersplat';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
+
+	$b['texts'][] = ':lasergun';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
+
+	$b['texts'][] = ':machinegun';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
+
+	$b['texts'][] = ':marine';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
+
+	$b['texts'][] = ':sabre';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
+
+	$b['texts'][] = ':tank';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
+
+	$b['texts'][] = ':viking';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
+
 }