From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 18 May 2014 11:22:27 +0000 (+0300)
Subject: Use the same file naming scheme as for Terminus
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09ced204742daefd9d8f36cad681932e4d590b7a;p=xonotic%2Fxonotic-data.pk3dir.git

Use the same file naming scheme as for Terminus
---

diff --git a/models/player/draconi-f.blend b/models/player/draconi-f.blend
deleted file mode 100644
index 1eb7862751..0000000000
Binary files a/models/player/draconi-f.blend and /dev/null differ
diff --git a/models/player/draconi-f.iqm b/models/player/draconi-f.iqm
deleted file mode 100644
index 04a9bc43d5..0000000000
Binary files a/models/player/draconi-f.iqm and /dev/null differ
diff --git a/models/player/draconi-f.iqm.framegroups b/models/player/draconi-f.iqm.framegroups
deleted file mode 100644
index 98eabd70b5..0000000000
--- a/models/player/draconi-f.iqm.framegroups
+++ /dev/null
@@ -1,31 +0,0 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 20 15.000000 1 // duck
-91 21 30.000000 1 // duckwalk
-112 16 15.000000 0 // duckjump
-128 15 5.000000 1 // duckidle
-143 41 5.000000 1 // idle
-184 160 25.000000 0 // jump
-344 15 15.000000 0 // painone
-359 17 15.000000 0 // paintwo
-376 3 15.000000 0 // shoot
-379 21 15.000000 1 // taunt
-400 21 35.000000 1 // run
-421 21 35.000000 1 // runbackwards
-442 21 35.000000 1 // strafeleft
-463 21 35.000000 1 // straferight
-484 2 15.000000 0 // deadone
-486 2 15.000000 0 // deadtwo
-488 21 35.000000 1 // forwardright
-509 21 35.000000 1 // forwardleft
-530 21 35.000000 1 // backright
-551 21 30.000000 1 // backleft
-572 21 20.000000 0 // melee
-593 21 30.000000 1 // duckwalkbackwards
-91 21 30.000000 1 // duckwalkstrafeleft
-91 21 30.000000 1 // duckwalkstraferight
-91 21 30.000000 1 // duckwalkforwardright
-91 21 30.000000 1 // duckwalkforwardleft
-593 21 30.000000 1 // duckwalkbackright
-593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconi-f.iqm_0.sounds b/models/player/draconi-f.iqm_0.sounds
deleted file mode 100644
index 4438d2615a..0000000000
--- a/models/player/draconi-f.iqm_0.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/carni-lycan/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/carni-lycan/coms/attackinfive 0
-coverme sound/player/carni-lycan/coms/coverme 0
-defend sound/player/carni-lycan/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
-freelance sound/player/carni-lycan/coms/freelance 2
-//getflag sound/player/soldier/player/getflag 0
-incoming sound/player/carni-lycan/coms/incoming 0
-meet sound/player/carni-lycan/coms/meet 0
-needhelp sound/player/carni-lycan/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/carni-lycan/coms/seenflag 0
-taunt sound/player/carni-lycan/coms/taunt 3
-teamshoot sound/player/carni-lycan/coms/teamshoot 3
-death sound/player/carni-lycan/player/death 3
-drown sound/player/carni-lycan/player/drown 0
-fall sound/player/carni-lycan/player/fall 0
-falling sound/player/carni-lycan/player/falling 0
-gasp sound/player/carni-lycan/player/gasp 0
-jump sound/player/carni-lycan/player/jump 0
-pain25 sound/player/carni-lycan/player/pain25 0
-pain50 sound/player/carni-lycan/player/pain50 0
-pain75 sound/player/carni-lycan/player/pain75 0
-pain100 sound/player/carni-lycan/player/pain100 0
diff --git a/models/player/draconi-f.iqm_0.tga b/models/player/draconi-f.iqm_0.tga
deleted file mode 100644
index 9a4b06d96c..0000000000
Binary files a/models/player/draconi-f.iqm_0.tga and /dev/null differ
diff --git a/models/player/draconi-f.iqm_0.txt b/models/player/draconi-f.iqm_0.txt
deleted file mode 100644
index 762f411ca7..0000000000
--- a/models/player/draconi-f.iqm_0.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-name Draconi F
-species alien
-sex Female
-weight 216
-age 27
-
-Heavyweight Xonotic Solider
diff --git a/models/player/draconi-f_lod1.iqm b/models/player/draconi-f_lod1.iqm
deleted file mode 100644
index bece18d9fa..0000000000
Binary files a/models/player/draconi-f_lod1.iqm and /dev/null differ
diff --git a/models/player/draconi-f_lod1.iqm.framegroups b/models/player/draconi-f_lod1.iqm.framegroups
deleted file mode 100644
index 98eabd70b5..0000000000
--- a/models/player/draconi-f_lod1.iqm.framegroups
+++ /dev/null
@@ -1,31 +0,0 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 20 15.000000 1 // duck
-91 21 30.000000 1 // duckwalk
-112 16 15.000000 0 // duckjump
-128 15 5.000000 1 // duckidle
-143 41 5.000000 1 // idle
-184 160 25.000000 0 // jump
-344 15 15.000000 0 // painone
-359 17 15.000000 0 // paintwo
-376 3 15.000000 0 // shoot
-379 21 15.000000 1 // taunt
-400 21 35.000000 1 // run
-421 21 35.000000 1 // runbackwards
-442 21 35.000000 1 // strafeleft
-463 21 35.000000 1 // straferight
-484 2 15.000000 0 // deadone
-486 2 15.000000 0 // deadtwo
-488 21 35.000000 1 // forwardright
-509 21 35.000000 1 // forwardleft
-530 21 35.000000 1 // backright
-551 21 30.000000 1 // backleft
-572 21 20.000000 0 // melee
-593 21 30.000000 1 // duckwalkbackwards
-91 21 30.000000 1 // duckwalkstrafeleft
-91 21 30.000000 1 // duckwalkstraferight
-91 21 30.000000 1 // duckwalkforwardright
-91 21 30.000000 1 // duckwalkforwardleft
-593 21 30.000000 1 // duckwalkbackright
-593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconi-f_lod2.iqm b/models/player/draconi-f_lod2.iqm
deleted file mode 100644
index bf6f2cfda8..0000000000
Binary files a/models/player/draconi-f_lod2.iqm and /dev/null differ
diff --git a/models/player/draconi-f_lod2.iqm.framegroups b/models/player/draconi-f_lod2.iqm.framegroups
deleted file mode 100644
index 98eabd70b5..0000000000
--- a/models/player/draconi-f_lod2.iqm.framegroups
+++ /dev/null
@@ -1,31 +0,0 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 20 15.000000 1 // duck
-91 21 30.000000 1 // duckwalk
-112 16 15.000000 0 // duckjump
-128 15 5.000000 1 // duckidle
-143 41 5.000000 1 // idle
-184 160 25.000000 0 // jump
-344 15 15.000000 0 // painone
-359 17 15.000000 0 // paintwo
-376 3 15.000000 0 // shoot
-379 21 15.000000 1 // taunt
-400 21 35.000000 1 // run
-421 21 35.000000 1 // runbackwards
-442 21 35.000000 1 // strafeleft
-463 21 35.000000 1 // straferight
-484 2 15.000000 0 // deadone
-486 2 15.000000 0 // deadtwo
-488 21 35.000000 1 // forwardright
-509 21 35.000000 1 // forwardleft
-530 21 35.000000 1 // backright
-551 21 30.000000 1 // backleft
-572 21 20.000000 0 // melee
-593 21 30.000000 1 // duckwalkbackwards
-91 21 30.000000 1 // duckwalkstrafeleft
-91 21 30.000000 1 // duckwalkstraferight
-91 21 30.000000 1 // duckwalkforwardright
-91 21 30.000000 1 // duckwalkforwardleft
-593 21 30.000000 1 // duckwalkbackright
-593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconi-m.blend b/models/player/draconi-m.blend
deleted file mode 100644
index 25a7efa42d..0000000000
Binary files a/models/player/draconi-m.blend and /dev/null differ
diff --git a/models/player/draconi-m.iqm b/models/player/draconi-m.iqm
deleted file mode 100644
index f6217d976b..0000000000
Binary files a/models/player/draconi-m.iqm and /dev/null differ
diff --git a/models/player/draconi-m.iqm.framegroups b/models/player/draconi-m.iqm.framegroups
deleted file mode 100644
index 98eabd70b5..0000000000
--- a/models/player/draconi-m.iqm.framegroups
+++ /dev/null
@@ -1,31 +0,0 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 20 15.000000 1 // duck
-91 21 30.000000 1 // duckwalk
-112 16 15.000000 0 // duckjump
-128 15 5.000000 1 // duckidle
-143 41 5.000000 1 // idle
-184 160 25.000000 0 // jump
-344 15 15.000000 0 // painone
-359 17 15.000000 0 // paintwo
-376 3 15.000000 0 // shoot
-379 21 15.000000 1 // taunt
-400 21 35.000000 1 // run
-421 21 35.000000 1 // runbackwards
-442 21 35.000000 1 // strafeleft
-463 21 35.000000 1 // straferight
-484 2 15.000000 0 // deadone
-486 2 15.000000 0 // deadtwo
-488 21 35.000000 1 // forwardright
-509 21 35.000000 1 // forwardleft
-530 21 35.000000 1 // backright
-551 21 30.000000 1 // backleft
-572 21 20.000000 0 // melee
-593 21 30.000000 1 // duckwalkbackwards
-91 21 30.000000 1 // duckwalkstrafeleft
-91 21 30.000000 1 // duckwalkstraferight
-91 21 30.000000 1 // duckwalkforwardright
-91 21 30.000000 1 // duckwalkforwardleft
-593 21 30.000000 1 // duckwalkbackright
-593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconi-m.iqm_0.sounds b/models/player/draconi-m.iqm_0.sounds
deleted file mode 100644
index 4438d2615a..0000000000
--- a/models/player/draconi-m.iqm_0.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/carni-lycan/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/carni-lycan/coms/attackinfive 0
-coverme sound/player/carni-lycan/coms/coverme 0
-defend sound/player/carni-lycan/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
-freelance sound/player/carni-lycan/coms/freelance 2
-//getflag sound/player/soldier/player/getflag 0
-incoming sound/player/carni-lycan/coms/incoming 0
-meet sound/player/carni-lycan/coms/meet 0
-needhelp sound/player/carni-lycan/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/carni-lycan/coms/seenflag 0
-taunt sound/player/carni-lycan/coms/taunt 3
-teamshoot sound/player/carni-lycan/coms/teamshoot 3
-death sound/player/carni-lycan/player/death 3
-drown sound/player/carni-lycan/player/drown 0
-fall sound/player/carni-lycan/player/fall 0
-falling sound/player/carni-lycan/player/falling 0
-gasp sound/player/carni-lycan/player/gasp 0
-jump sound/player/carni-lycan/player/jump 0
-pain25 sound/player/carni-lycan/player/pain25 0
-pain50 sound/player/carni-lycan/player/pain50 0
-pain75 sound/player/carni-lycan/player/pain75 0
-pain100 sound/player/carni-lycan/player/pain100 0
diff --git a/models/player/draconi-m.iqm_0.tga b/models/player/draconi-m.iqm_0.tga
deleted file mode 100644
index c318dff7a7..0000000000
Binary files a/models/player/draconi-m.iqm_0.tga and /dev/null differ
diff --git a/models/player/draconi-m.iqm_0.txt b/models/player/draconi-m.iqm_0.txt
deleted file mode 100644
index 368fda4222..0000000000
--- a/models/player/draconi-m.iqm_0.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-name Draconi M
-species alien
-sex Male
-weight 243
-age 31
-
-Heavyweight Xonotic Solider
diff --git a/models/player/draconi-m_lod1.iqm b/models/player/draconi-m_lod1.iqm
deleted file mode 100644
index 1f090c043d..0000000000
Binary files a/models/player/draconi-m_lod1.iqm and /dev/null differ
diff --git a/models/player/draconi-m_lod1.iqm.framegroups b/models/player/draconi-m_lod1.iqm.framegroups
deleted file mode 100644
index 98eabd70b5..0000000000
--- a/models/player/draconi-m_lod1.iqm.framegroups
+++ /dev/null
@@ -1,31 +0,0 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 20 15.000000 1 // duck
-91 21 30.000000 1 // duckwalk
-112 16 15.000000 0 // duckjump
-128 15 5.000000 1 // duckidle
-143 41 5.000000 1 // idle
-184 160 25.000000 0 // jump
-344 15 15.000000 0 // painone
-359 17 15.000000 0 // paintwo
-376 3 15.000000 0 // shoot
-379 21 15.000000 1 // taunt
-400 21 35.000000 1 // run
-421 21 35.000000 1 // runbackwards
-442 21 35.000000 1 // strafeleft
-463 21 35.000000 1 // straferight
-484 2 15.000000 0 // deadone
-486 2 15.000000 0 // deadtwo
-488 21 35.000000 1 // forwardright
-509 21 35.000000 1 // forwardleft
-530 21 35.000000 1 // backright
-551 21 30.000000 1 // backleft
-572 21 20.000000 0 // melee
-593 21 30.000000 1 // duckwalkbackwards
-91 21 30.000000 1 // duckwalkstrafeleft
-91 21 30.000000 1 // duckwalkstraferight
-91 21 30.000000 1 // duckwalkforwardright
-91 21 30.000000 1 // duckwalkforwardleft
-593 21 30.000000 1 // duckwalkbackright
-593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconi-m_lod2.iqm b/models/player/draconi-m_lod2.iqm
deleted file mode 100644
index e5c36b66fc..0000000000
Binary files a/models/player/draconi-m_lod2.iqm and /dev/null differ
diff --git a/models/player/draconi-m_lod2.iqm.framegroups b/models/player/draconi-m_lod2.iqm.framegroups
deleted file mode 100644
index 98eabd70b5..0000000000
--- a/models/player/draconi-m_lod2.iqm.framegroups
+++ /dev/null
@@ -1,31 +0,0 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
-71 20 15.000000 1 // duck
-91 21 30.000000 1 // duckwalk
-112 16 15.000000 0 // duckjump
-128 15 5.000000 1 // duckidle
-143 41 5.000000 1 // idle
-184 160 25.000000 0 // jump
-344 15 15.000000 0 // painone
-359 17 15.000000 0 // paintwo
-376 3 15.000000 0 // shoot
-379 21 15.000000 1 // taunt
-400 21 35.000000 1 // run
-421 21 35.000000 1 // runbackwards
-442 21 35.000000 1 // strafeleft
-463 21 35.000000 1 // straferight
-484 2 15.000000 0 // deadone
-486 2 15.000000 0 // deadtwo
-488 21 35.000000 1 // forwardright
-509 21 35.000000 1 // forwardleft
-530 21 35.000000 1 // backright
-551 21 30.000000 1 // backleft
-572 21 20.000000 0 // melee
-593 21 30.000000 1 // duckwalkbackwards
-91 21 30.000000 1 // duckwalkstrafeleft
-91 21 30.000000 1 // duckwalkstraferight
-91 21 30.000000 1 // duckwalkforwardright
-91 21 30.000000 1 // duckwalkforwardleft
-593 21 30.000000 1 // duckwalkbackright
-593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconifemale.blend b/models/player/draconifemale.blend
new file mode 100644
index 0000000000..b169942c8f
Binary files /dev/null and b/models/player/draconifemale.blend differ
diff --git a/models/player/draconifemale.iqm b/models/player/draconifemale.iqm
new file mode 100644
index 0000000000..395efddbf8
Binary files /dev/null and b/models/player/draconifemale.iqm differ
diff --git a/models/player/draconifemale.iqm.framegroups b/models/player/draconifemale.iqm.framegroups
new file mode 100644
index 0000000000..98eabd70b5
--- /dev/null
+++ b/models/player/draconifemale.iqm.framegroups
@@ -0,0 +1,31 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+509 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
+593 21 30.000000 1 // duckwalkbackwards
+91 21 30.000000 1 // duckwalkstrafeleft
+91 21 30.000000 1 // duckwalkstraferight
+91 21 30.000000 1 // duckwalkforwardright
+91 21 30.000000 1 // duckwalkforwardleft
+593 21 30.000000 1 // duckwalkbackright
+593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconifemale.iqm_0.skin b/models/player/draconifemale.iqm_0.skin
new file mode 100644
index 0000000000..c1012c7b65
--- /dev/null
+++ b/models/player/draconifemale.iqm_0.skin
@@ -0,0 +1 @@
+draconi,draconi_female
diff --git a/models/player/draconifemale.iqm_0.sounds b/models/player/draconifemale.iqm_0.sounds
new file mode 100644
index 0000000000..4438d2615a
--- /dev/null
+++ b/models/player/draconifemale.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: carni-lycan
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/carni-lycan/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/carni-lycan/coms/attackinfive 0
+coverme sound/player/carni-lycan/coms/coverme 0
+defend sound/player/carni-lycan/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/carni-lycan/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/carni-lycan/coms/incoming 0
+meet sound/player/carni-lycan/coms/meet 0
+needhelp sound/player/carni-lycan/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/carni-lycan/coms/seenflag 0
+taunt sound/player/carni-lycan/coms/taunt 3
+teamshoot sound/player/carni-lycan/coms/teamshoot 3
+death sound/player/carni-lycan/player/death 3
+drown sound/player/carni-lycan/player/drown 0
+fall sound/player/carni-lycan/player/fall 0
+falling sound/player/carni-lycan/player/falling 0
+gasp sound/player/carni-lycan/player/gasp 0
+jump sound/player/carni-lycan/player/jump 0
+pain25 sound/player/carni-lycan/player/pain25 0
+pain50 sound/player/carni-lycan/player/pain50 0
+pain75 sound/player/carni-lycan/player/pain75 0
+pain100 sound/player/carni-lycan/player/pain100 0
diff --git a/models/player/draconifemale.iqm_0.tga b/models/player/draconifemale.iqm_0.tga
new file mode 100644
index 0000000000..9a4b06d96c
Binary files /dev/null and b/models/player/draconifemale.iqm_0.tga differ
diff --git a/models/player/draconifemale.iqm_0.txt b/models/player/draconifemale.iqm_0.txt
new file mode 100644
index 0000000000..500875f021
--- /dev/null
+++ b/models/player/draconifemale.iqm_0.txt
@@ -0,0 +1,7 @@
+name Draconi - Female
+species alien
+sex Female
+weight 216
+age 27
+
+Heavyweight Xonotic Solider
diff --git a/models/player/draconifemale_lod1.iqm b/models/player/draconifemale_lod1.iqm
new file mode 100644
index 0000000000..5d0e11ccf7
Binary files /dev/null and b/models/player/draconifemale_lod1.iqm differ
diff --git a/models/player/draconifemale_lod1.iqm.framegroups b/models/player/draconifemale_lod1.iqm.framegroups
new file mode 100644
index 0000000000..98eabd70b5
--- /dev/null
+++ b/models/player/draconifemale_lod1.iqm.framegroups
@@ -0,0 +1,31 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+509 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
+593 21 30.000000 1 // duckwalkbackwards
+91 21 30.000000 1 // duckwalkstrafeleft
+91 21 30.000000 1 // duckwalkstraferight
+91 21 30.000000 1 // duckwalkforwardright
+91 21 30.000000 1 // duckwalkforwardleft
+593 21 30.000000 1 // duckwalkbackright
+593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconifemale_lod1.iqm_0.skin b/models/player/draconifemale_lod1.iqm_0.skin
new file mode 100644
index 0000000000..c1012c7b65
--- /dev/null
+++ b/models/player/draconifemale_lod1.iqm_0.skin
@@ -0,0 +1 @@
+draconi,draconi_female
diff --git a/models/player/draconifemale_lod2.iqm b/models/player/draconifemale_lod2.iqm
new file mode 100644
index 0000000000..eb9ac84c8d
Binary files /dev/null and b/models/player/draconifemale_lod2.iqm differ
diff --git a/models/player/draconifemale_lod2.iqm.framegroups b/models/player/draconifemale_lod2.iqm.framegroups
new file mode 100644
index 0000000000..98eabd70b5
--- /dev/null
+++ b/models/player/draconifemale_lod2.iqm.framegroups
@@ -0,0 +1,31 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+509 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
+593 21 30.000000 1 // duckwalkbackwards
+91 21 30.000000 1 // duckwalkstrafeleft
+91 21 30.000000 1 // duckwalkstraferight
+91 21 30.000000 1 // duckwalkforwardright
+91 21 30.000000 1 // duckwalkforwardleft
+593 21 30.000000 1 // duckwalkbackright
+593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconifemale_lod2.iqm_0.skin b/models/player/draconifemale_lod2.iqm_0.skin
new file mode 100644
index 0000000000..c1012c7b65
--- /dev/null
+++ b/models/player/draconifemale_lod2.iqm_0.skin
@@ -0,0 +1 @@
+draconi,draconi_female
diff --git a/models/player/draconimale.blend b/models/player/draconimale.blend
new file mode 100644
index 0000000000..75e1a1c37f
Binary files /dev/null and b/models/player/draconimale.blend differ
diff --git a/models/player/draconimale.iqm b/models/player/draconimale.iqm
new file mode 100644
index 0000000000..055051bd1e
Binary files /dev/null and b/models/player/draconimale.iqm differ
diff --git a/models/player/draconimale.iqm.framegroups b/models/player/draconimale.iqm.framegroups
new file mode 100644
index 0000000000..98eabd70b5
--- /dev/null
+++ b/models/player/draconimale.iqm.framegroups
@@ -0,0 +1,31 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+509 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
+593 21 30.000000 1 // duckwalkbackwards
+91 21 30.000000 1 // duckwalkstrafeleft
+91 21 30.000000 1 // duckwalkstraferight
+91 21 30.000000 1 // duckwalkforwardright
+91 21 30.000000 1 // duckwalkforwardleft
+593 21 30.000000 1 // duckwalkbackright
+593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconimale.iqm_0.skin b/models/player/draconimale.iqm_0.skin
new file mode 100644
index 0000000000..0e79b4b7f2
--- /dev/null
+++ b/models/player/draconimale.iqm_0.skin
@@ -0,0 +1 @@
+draconi,draconi_male
diff --git a/models/player/draconimale.iqm_0.sounds b/models/player/draconimale.iqm_0.sounds
new file mode 100644
index 0000000000..4438d2615a
--- /dev/null
+++ b/models/player/draconimale.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: carni-lycan
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/carni-lycan/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/carni-lycan/coms/attackinfive 0
+coverme sound/player/carni-lycan/coms/coverme 0
+defend sound/player/carni-lycan/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/carni-lycan/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/carni-lycan/coms/incoming 0
+meet sound/player/carni-lycan/coms/meet 0
+needhelp sound/player/carni-lycan/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/carni-lycan/coms/seenflag 0
+taunt sound/player/carni-lycan/coms/taunt 3
+teamshoot sound/player/carni-lycan/coms/teamshoot 3
+death sound/player/carni-lycan/player/death 3
+drown sound/player/carni-lycan/player/drown 0
+fall sound/player/carni-lycan/player/fall 0
+falling sound/player/carni-lycan/player/falling 0
+gasp sound/player/carni-lycan/player/gasp 0
+jump sound/player/carni-lycan/player/jump 0
+pain25 sound/player/carni-lycan/player/pain25 0
+pain50 sound/player/carni-lycan/player/pain50 0
+pain75 sound/player/carni-lycan/player/pain75 0
+pain100 sound/player/carni-lycan/player/pain100 0
diff --git a/models/player/draconimale.iqm_0.tga b/models/player/draconimale.iqm_0.tga
new file mode 100644
index 0000000000..c318dff7a7
Binary files /dev/null and b/models/player/draconimale.iqm_0.tga differ
diff --git a/models/player/draconimale.iqm_0.txt b/models/player/draconimale.iqm_0.txt
new file mode 100644
index 0000000000..984ba3975f
--- /dev/null
+++ b/models/player/draconimale.iqm_0.txt
@@ -0,0 +1,7 @@
+name Draconi - Male
+species alien
+sex Male
+weight 243
+age 31
+
+Heavyweight Xonotic Solider
diff --git a/models/player/draconimale_lod1.iqm b/models/player/draconimale_lod1.iqm
new file mode 100644
index 0000000000..863bd772b1
Binary files /dev/null and b/models/player/draconimale_lod1.iqm differ
diff --git a/models/player/draconimale_lod1.iqm.framegroups b/models/player/draconimale_lod1.iqm.framegroups
new file mode 100644
index 0000000000..98eabd70b5
--- /dev/null
+++ b/models/player/draconimale_lod1.iqm.framegroups
@@ -0,0 +1,31 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+509 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
+593 21 30.000000 1 // duckwalkbackwards
+91 21 30.000000 1 // duckwalkstrafeleft
+91 21 30.000000 1 // duckwalkstraferight
+91 21 30.000000 1 // duckwalkforwardright
+91 21 30.000000 1 // duckwalkforwardleft
+593 21 30.000000 1 // duckwalkbackright
+593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconimale_lod1.iqm_0.skin b/models/player/draconimale_lod1.iqm_0.skin
new file mode 100644
index 0000000000..0e79b4b7f2
--- /dev/null
+++ b/models/player/draconimale_lod1.iqm_0.skin
@@ -0,0 +1 @@
+draconi,draconi_male
diff --git a/models/player/draconimale_lod2.iqm b/models/player/draconimale_lod2.iqm
new file mode 100644
index 0000000000..c2a6bef2ec
Binary files /dev/null and b/models/player/draconimale_lod2.iqm differ
diff --git a/models/player/draconimale_lod2.iqm.framegroups b/models/player/draconimale_lod2.iqm.framegroups
new file mode 100644
index 0000000000..98eabd70b5
--- /dev/null
+++ b/models/player/draconimale_lod2.iqm.framegroups
@@ -0,0 +1,31 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+509 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
+593 21 30.000000 1 // duckwalkbackwards
+91 21 30.000000 1 // duckwalkstrafeleft
+91 21 30.000000 1 // duckwalkstraferight
+91 21 30.000000 1 // duckwalkforwardright
+91 21 30.000000 1 // duckwalkforwardleft
+593 21 30.000000 1 // duckwalkbackright
+593 21 30.000000 1 // duckwalkbackleft
\ No newline at end of file
diff --git a/models/player/draconimale_lod2.iqm_0.skin b/models/player/draconimale_lod2.iqm_0.skin
new file mode 100644
index 0000000000..0e79b4b7f2
--- /dev/null
+++ b/models/player/draconimale_lod2.iqm_0.skin
@@ -0,0 +1 @@
+draconi,draconi_male
diff --git a/scripts/player_draconi.shader b/scripts/player_draconi.shader
index 3e3b17519c..8d109217fa 100644
--- a/scripts/player_draconi.shader
+++ b/scripts/player_draconi.shader
@@ -1,17 +1,17 @@
-draconi-m
+draconi_male
 {
 	dpreflectcube cubemaps/default/sky
  	{
-		map textures/draconi-m.tga
+		map textures/draconi_male.tga
 		rgbgen lightingDiffuse
 	}
 }
 
-draconi-f
+draconi_female
 {
 	dpreflectcube cubemaps/default/sky
  	{
-		map textures/draconi-f.tga
+		map textures/draconi_female.tga
 		rgbgen lightingDiffuse
 	}
 }
diff --git a/textures/draconi-f.tga b/textures/draconi-f.tga
deleted file mode 100644
index 1ffe6a2bfb..0000000000
Binary files a/textures/draconi-f.tga and /dev/null differ
diff --git a/textures/draconi-f_gloss.tga b/textures/draconi-f_gloss.tga
deleted file mode 100644
index 7cf70ddb62..0000000000
Binary files a/textures/draconi-f_gloss.tga and /dev/null differ
diff --git a/textures/draconi-f_glow.tga b/textures/draconi-f_glow.tga
deleted file mode 100644
index 8d3a6ae632..0000000000
Binary files a/textures/draconi-f_glow.tga and /dev/null differ
diff --git a/textures/draconi-f_norm.tga b/textures/draconi-f_norm.tga
deleted file mode 100644
index f4f43fba11..0000000000
Binary files a/textures/draconi-f_norm.tga and /dev/null differ
diff --git a/textures/draconi-f_reflect.tga b/textures/draconi-f_reflect.tga
deleted file mode 100644
index a9d501a83b..0000000000
Binary files a/textures/draconi-f_reflect.tga and /dev/null differ
diff --git a/textures/draconi-f_shirt.tga b/textures/draconi-f_shirt.tga
deleted file mode 100644
index f2d6e9f3b1..0000000000
Binary files a/textures/draconi-f_shirt.tga and /dev/null differ
diff --git a/textures/draconi-m.tga b/textures/draconi-m.tga
deleted file mode 100644
index abe0cd1c8d..0000000000
Binary files a/textures/draconi-m.tga and /dev/null differ
diff --git a/textures/draconi-m_gloss.tga b/textures/draconi-m_gloss.tga
deleted file mode 100644
index 7cf70ddb62..0000000000
Binary files a/textures/draconi-m_gloss.tga and /dev/null differ
diff --git a/textures/draconi-m_glow.tga b/textures/draconi-m_glow.tga
deleted file mode 100644
index 8d3a6ae632..0000000000
Binary files a/textures/draconi-m_glow.tga and /dev/null differ
diff --git a/textures/draconi-m_norm.tga b/textures/draconi-m_norm.tga
deleted file mode 100644
index f4f43fba11..0000000000
Binary files a/textures/draconi-m_norm.tga and /dev/null differ
diff --git a/textures/draconi-m_reflect.tga b/textures/draconi-m_reflect.tga
deleted file mode 100644
index a9d501a83b..0000000000
Binary files a/textures/draconi-m_reflect.tga and /dev/null differ
diff --git a/textures/draconi-m_shirt.tga b/textures/draconi-m_shirt.tga
deleted file mode 100644
index f2d6e9f3b1..0000000000
Binary files a/textures/draconi-m_shirt.tga and /dev/null differ
diff --git a/textures/draconi_female.tga b/textures/draconi_female.tga
new file mode 100644
index 0000000000..1ffe6a2bfb
Binary files /dev/null and b/textures/draconi_female.tga differ
diff --git a/textures/draconi_female_gloss.tga b/textures/draconi_female_gloss.tga
new file mode 100644
index 0000000000..7cf70ddb62
Binary files /dev/null and b/textures/draconi_female_gloss.tga differ
diff --git a/textures/draconi_female_glow.tga b/textures/draconi_female_glow.tga
new file mode 100644
index 0000000000..8d3a6ae632
Binary files /dev/null and b/textures/draconi_female_glow.tga differ
diff --git a/textures/draconi_female_norm.tga b/textures/draconi_female_norm.tga
new file mode 100644
index 0000000000..f4f43fba11
Binary files /dev/null and b/textures/draconi_female_norm.tga differ
diff --git a/textures/draconi_female_reflect.tga b/textures/draconi_female_reflect.tga
new file mode 100644
index 0000000000..a9d501a83b
Binary files /dev/null and b/textures/draconi_female_reflect.tga differ
diff --git a/textures/draconi_female_shirt.tga b/textures/draconi_female_shirt.tga
new file mode 100644
index 0000000000..f2d6e9f3b1
Binary files /dev/null and b/textures/draconi_female_shirt.tga differ
diff --git a/textures/draconi_male.tga b/textures/draconi_male.tga
new file mode 100644
index 0000000000..abe0cd1c8d
Binary files /dev/null and b/textures/draconi_male.tga differ
diff --git a/textures/draconi_male_gloss.tga b/textures/draconi_male_gloss.tga
new file mode 100644
index 0000000000..7cf70ddb62
Binary files /dev/null and b/textures/draconi_male_gloss.tga differ
diff --git a/textures/draconi_male_glow.tga b/textures/draconi_male_glow.tga
new file mode 100644
index 0000000000..8d3a6ae632
Binary files /dev/null and b/textures/draconi_male_glow.tga differ
diff --git a/textures/draconi_male_norm.tga b/textures/draconi_male_norm.tga
new file mode 100644
index 0000000000..f4f43fba11
Binary files /dev/null and b/textures/draconi_male_norm.tga differ
diff --git a/textures/draconi_male_reflect.tga b/textures/draconi_male_reflect.tga
new file mode 100644
index 0000000000..a9d501a83b
Binary files /dev/null and b/textures/draconi_male_reflect.tga differ
diff --git a/textures/draconi_male_shirt.tga b/textures/draconi_male_shirt.tga
new file mode 100644
index 0000000000..f2d6e9f3b1
Binary files /dev/null and b/textures/draconi_male_shirt.tga differ