0.1.5

4 files changed, 6 insertions, 22 deletions

diff --git a/assets/credits.txt b/assets/credits.txt
index e4a63c5..2bcff96 100644
--- a/assets/credits.txt
+++ b/assets/credits.txt
@@ -6,6 +6,11 @@ Cuboid - a Tremulous 1.2 mod focused on cuboids and fixing balance issues.
 
 Version  Release date
 ______________________________________________________________________________________________
+0.1.5    Sep 12 2013
+- Reverted both Lucifer Cannon and Advanced Marauder zap back to the GPP state.
+- Increased Jetpack jump fuel usage from 85 to 300 (up to 20 jumps instead of 70).
+- Health cross changes icon and color when implanted with an egg.
+
 0.1.4    Sep 12 2013
 NON-GAMEPLAY:
 - Announcer now announces things like "Aliens win" or "1 minute remaining", not just votes.
@@ -114,9 +119,6 @@ models/players/human_base/h_helmet... theinvsblman
 models/players/human_base/head_lig... Darklegion Development, theinvsblman       cc-by-sa
 models/weapons/flamer/fireloop_qui... Darklegion Development, theinvsblman       cc-by-sa
 models/weapons/flamer/weapon.cfg      Darklegion Development, theinvsblman       cc-by-sa
-models/weapons/level2upg/zap1.wav     Halleck @ freesound.org                    cc-by
-models/weapons/level2upg/zap_conti... DJ Chronos @ freesound.org                 cc-by
-models/weapons/level2upg/weapon.cfg   Darklegion Development, theinvsblman       cc-by-sa
 models/weapons/level4/weapon.cfg      Darklegion Development, theinvsblman       cc-by-sa
 scripts/cuboid.shader                 theinvsblman                               cc-by
 scripts/cuboid.particle               Darklegion Development, theinvsblman       cc-by-sa
@@ -162,6 +164,7 @@ sound/upgrades/jetpack/lowfuel.wav    Pikachu
 sound/upgrades/jetpack/nojumpfuel.wav Pikachu                                    cc0 
 sound/upgrades/jetpack/refuel.wav     joeseshon @ freesound.org, 
                                       alexmol @ freesound.org, Pikachu           cc-by
+ui/assets/neutral/cross_implanted.tga Darklegion Development, theinvsblman       cc-by-sa
 ui/help.txt                           theinvsblman                               cc-by
 ui/ingame_options.menu                Darklegion Development, theinvsblman       cc-by-sa
 ui/teamscore.menu                     Darklegion Development, theinvsblman       cc-by-sa
diff --git a/assets/models/weapons/level2upg/weapon.cfg b/assets/models/weapons/level2upg/weapon.cfg
deleted file mode 100644
index 5a7d6d4..0000000
--- a/assets/models/weapons/level2upg/weapon.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-disableIn3rdPerson
-
-icon              icons/icona_lev2
-crosshair         15 gfx/2d/crosshair-alien_s
-
-primary
-{
-  flashSound        0 models/weapons/level2/flash0.wav
-  impactFleshSound  0 models/weapons/level2/impactflesh0.wav
-  alwaysImpact
-}
-
-secondary
-{
-  flashSound        0 models/weapons/level2upg/zap1.wav
-  firingSound       models/weapons/level2upg/zap_continuous.wav
-
-  impactMark        24 gfx/marks/plasma_mrk
-}
diff --git a/assets/models/weapons/level2upg/zap1.wav b/assets/models/weapons/level2upg/zap1.wav
deleted file mode 100644
index 0284f1d..0000000
--- a/assets/models/weapons/level2upg/zap1.wav
+++ /dev/null
diff --git a/assets/models/weapons/level2upg/zap_continuous.wav b/assets/models/weapons/level2upg/zap_continuous.wav
deleted file mode 100644
index ab08b8c..0000000
--- a/assets/models/weapons/level2upg/zap_continuous.wav
+++ /dev/null