Suitable punishments for anyone who actually uses any of these smilies.

diff --git a/smiley_pack/icons/fight/2guns.gif b/smiley_pack/icons/fight/2guns.gif
new file mode 100644 (file)
index 0000000..9e1b663
Binary files /dev/null and b/smiley_pack/icons/fight/2guns.gif differ

diff --git a/smiley_pack/icons/fight/alienfight.gif b/smiley_pack/icons/fight/alienfight.gif
new file mode 100644 (file)
index 0000000..9d5e879
Binary files /dev/null and b/smiley_pack/icons/fight/alienfight.gif differ

diff --git a/smiley_pack/icons/fight/army.gif b/smiley_pack/icons/fight/army.gif
new file mode 100644 (file)
index 0000000..7506700
Binary files /dev/null and b/smiley_pack/icons/fight/army.gif differ

diff --git a/smiley_pack/icons/fight/arrowhead.gif b/smiley_pack/icons/fight/arrowhead.gif
new file mode 100644 (file)
index 0000000..f4572c4
Binary files /dev/null and b/smiley_pack/icons/fight/arrowhead.gif differ

diff --git a/smiley_pack/icons/fight/bfg.gif b/smiley_pack/icons/fight/bfg.gif
new file mode 100644 (file)
index 0000000..c2ba9d0
Binary files /dev/null and b/smiley_pack/icons/fight/bfg.gif differ

diff --git a/smiley_pack/icons/fight/bowman.gif b/smiley_pack/icons/fight/bowman.gif
new file mode 100644 (file)
index 0000000..2f1f8f0
Binary files /dev/null and b/smiley_pack/icons/fight/bowman.gif differ

diff --git a/smiley_pack/icons/fight/chainsaw.gif b/smiley_pack/icons/fight/chainsaw.gif
new file mode 100644 (file)
index 0000000..71f757c
Binary files /dev/null and b/smiley_pack/icons/fight/chainsaw.gif differ

diff --git a/smiley_pack/icons/fight/crossbow.gif b/smiley_pack/icons/fight/crossbow.gif
new file mode 100644 (file)
index 0000000..20874f3
Binary files /dev/null and b/smiley_pack/icons/fight/crossbow.gif differ

diff --git a/smiley_pack/icons/fight/crusader.gif b/smiley_pack/icons/fight/crusader.gif
new file mode 100644 (file)
index 0000000..95848ae
Binary files /dev/null and b/smiley_pack/icons/fight/crusader.gif differ

diff --git a/smiley_pack/icons/fight/dead.gif b/smiley_pack/icons/fight/dead.gif
new file mode 100644 (file)
index 0000000..31adaba
Binary files /dev/null and b/smiley_pack/icons/fight/dead.gif differ

diff --git a/smiley_pack/icons/fight/hammersplat.gif b/smiley_pack/icons/fight/hammersplat.gif
new file mode 100644 (file)
index 0000000..95bd540
Binary files /dev/null and b/smiley_pack/icons/fight/hammersplat.gif differ

diff --git a/smiley_pack/icons/fight/lasergun.gif b/smiley_pack/icons/fight/lasergun.gif
new file mode 100644 (file)
index 0000000..f3f82cb
Binary files /dev/null and b/smiley_pack/icons/fight/lasergun.gif differ

diff --git a/smiley_pack/icons/fight/machinegun.gif b/smiley_pack/icons/fight/machinegun.gif
new file mode 100644 (file)
index 0000000..1cff5cc
Binary files /dev/null and b/smiley_pack/icons/fight/machinegun.gif differ

diff --git a/smiley_pack/icons/fight/marine.gif b/smiley_pack/icons/fight/marine.gif
new file mode 100644 (file)
index 0000000..88fd2e0
Binary files /dev/null and b/smiley_pack/icons/fight/marine.gif differ

diff --git a/smiley_pack/icons/fight/sabre.gif b/smiley_pack/icons/fight/sabre.gif
new file mode 100644 (file)
index 0000000..e623968
Binary files /dev/null and b/smiley_pack/icons/fight/sabre.gif differ

diff --git a/smiley_pack/icons/fight/samurai.gif b/smiley_pack/icons/fight/samurai.gif
new file mode 100644 (file)
index 0000000..8b24385
Binary files /dev/null and b/smiley_pack/icons/fight/samurai.gif differ

diff --git a/smiley_pack/icons/fight/tank.gif b/smiley_pack/icons/fight/tank.gif
new file mode 100644 (file)
index 0000000..f1d969d
Binary files /dev/null and b/smiley_pack/icons/fight/tank.gif differ

diff --git a/smiley_pack/icons/fight/viking.gif b/smiley_pack/icons/fight/viking.gif
new file mode 100644 (file)
index 0000000..4908edd
Binary files /dev/null and b/smiley_pack/icons/fight/viking.gif differ

diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 5f5359018e2de31a5539fc57ef72f02656d6c8d4..d4eadb50fce77355d8a941c86d4886beed116851 100644 (file)
--- 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' . '" />';
+
 }

diff --git a/smiley_pack/smiley_pack.php~ b/smiley_pack/smiley_pack.php~
index 6df5b38c3e72f8415a2eb29b957d26d4da5e5be8..5f5359018e2de31a5539fc57ef72f02656d6c8d4 100644 (file)
--- a/smiley_pack/smiley_pack.php~
+++ b/smiley_pack/smiley_pack.php~
@@ -199,4 +199,12 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':loveheart';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
 
+       $b['texts'][] = ':countsheep';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
+
+       $b['texts'][] = ':hammock';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
+
+       $b['texts'][] = ':pillow';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
 }