From 00458b669b31339bb790ca91c8149bd3c4740c47 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Thu, 5 Dec 2019 13:34:00 +0100
Subject: [PATCH] 1.0.6 release: - Revert the attempt at compensating for 1.2
 pixel stretch. It's impossible to do it consistently.

---
 Readme.md          |   2 +-
 modeldef.boss      |   2 +-
 modeldef.chainsaw  |   4 +-
 modeldef.commando  |   2 +-
 modeldef.eightball |  20 +++---
 modeldef.enforcer  |  16 ++---
 modeldef.fcommando |   4 +-
 modeldef.flak      |  20 +++---
 modeldef.ges       |  16 ++---
 modeldef.gore      |  38 +++++------
 modeldef.impact    |   6 +-
 modeldef.minigun   |  12 ++--
 modeldef.misc      | 160 ++++++++++++++++++++++-----------------------
 modeldef.pulse     |  16 ++---
 modeldef.rifle     |  14 ++--
 modeldef.ripper    |  16 ++---
 modeldef.sgirl     |   4 +-
 modeldef.shock     |  52 ++++++---------
 modeldef.soldier   |   2 +-
 modeldef.transloc  |   6 +-
 modeldef.warhead   |  21 +++---
 21 files changed, 211 insertions(+), 222 deletions(-)

diff --git a/Readme.md b/Readme.md
index f7ffc1c..0c3f385 100644
--- a/Readme.md
+++ b/Readme.md
@@ -61,7 +61,7 @@ This mod requires GZDoom 4.2.4 or later.
 
 ## In progress
 
- - N/A, this is the 1.0.5 release.
+ - N/A, this is the 1.0.6 release.
 
 ## Planned
 
diff --git a/modeldef.boss b/modeldef.boss
index d16ba98..4f91bd2 100644
--- a/modeldef.boss
+++ b/modeldef.boss
@@ -7,7 +7,7 @@ Model "UTPlayerTBoss"
 	SurfaceSkin 0 2 "boss3.png"
 	SurfaceSkin 0 3 "boss4.png"
 	SurfaceSkin 0 5 "GunPick1.png"
-	Scale 0.256 0.23 0.23
+	Scale 0.23 0.23 0.23
 	Offset 0 -5 29
 	RollOffset -90
 	AngleOffset -90
diff --git a/modeldef.chainsaw b/modeldef.chainsaw
index a4a0e59..1594976 100644
--- a/modeldef.chainsaw
+++ b/modeldef.chainsaw
@@ -14,8 +14,8 @@ Model "UTChainsaw"
 	Path "models"
 	Model 1 "ChainSawPick_d.3d"
 	Skin 1 "JChainSawPick1.png"
-	Offset -10.5 -0.84 6
-	Scale 0.14 0.168 0.14
+	Offset -10.5 -0.7 6
+	Scale 0.14 0.14 0.14
 	RollOffset -90
 
 	FrameIndex CSWP B 1 0
diff --git a/modeldef.commando b/modeldef.commando
index 13f5f29..1420dc5 100644
--- a/modeldef.commando
+++ b/modeldef.commando
@@ -7,7 +7,7 @@ Model "UTPlayerTMale1"
 	SurfaceSkin 0 2 "cmdo3.png"
 	SurfaceSkin 0 3 "cmdo4.png"
 	SurfaceSkin 0 5 "GunPick1.png"
-	Scale 0.256 0.23 0.23
+	Scale 0.23 0.23 0.23
 	Offset 0 -5 29
 	RollOffset -90
 	AngleOffset -90
diff --git a/modeldef.eightball b/modeldef.eightball
index 234385a..d83a268 100644
--- a/modeldef.eightball
+++ b/modeldef.eightball
@@ -3,7 +3,7 @@ Model "UTRocketAmmo"
 	Path "models"
 	Model 0 "RocketPackMesh_d.3d"
 	Skin 0 "JRocketPack1.png"
-	Scale 0.072 0.0864 0.072
+	Scale 0.072 0.072 0.072
 	RollOffset -90
 	ZOffset 7
 
@@ -15,8 +15,8 @@ Model "UTRocketAmmo2"
 	Path "models"
 	Model 0 "UTRocket_d.3d"
 	Skin 0 "JuRocket1_.png"
-	Offset 0 1.4796 6
-	Scale 0.0822 0.09864 0.07
+	Offset 0 1.233 6
+	Scale 0.0822 0.0822 0.07
 	RollOffset -90
 
 	FrameIndex RCKT A 0 0
@@ -27,8 +27,8 @@ Model "UTGrenade"
 	Path "models"
 	Model 0 "UTRocket_d.3d"
 	Skin 0 "JuRocket1.png"
-	Offset 0 0 1.4796
-	Scale 0.0822 0.0822 0.09864
+	Offset 0 0 1.233
+	Scale 0.0822 0.0822 0.0822
 	USEACTORPITCH
 	USEACTORROLL
 	AngleOffset 90
@@ -40,8 +40,8 @@ Model "UTRocket"
 	Path "models"
 	Model 0 "UTRocket_d.3d"
 	Skin 0 "JuRocket1.png"
-	Offset 10.175 0 1.4796
-	Scale 0.0822 0.0822 0.09864
+	Offset 10.175 0 1.233
+	Scale 0.0822 0.0822 0.0822
 	USEACTORPITCH
 	USEACTORROLL
 	AngleOffset 90
@@ -54,13 +54,13 @@ Model "UTRocketLauncher"
 	Path "models"
 	Model 1 "Eight2Pick_d.3d"
 	Skin 1 "Eight_t.png"
-	Scale 0.24 0.24 0.288
+	Scale 0.24 0.24 0.24
 	AngleOffset 90
-	ZOffset 6
+	ZOffset 5
 
 	FrameIndex EBLP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex EBLP A 1 0
 }
diff --git a/modeldef.enforcer b/modeldef.enforcer
index ef988a5..87c6891 100644
--- a/modeldef.enforcer
+++ b/modeldef.enforcer
@@ -3,8 +3,8 @@ Model "EClip"
 	Path "models"
 	Model 0 "EClipM_d.3d"
 	Skin 0 "JEClip.png"
-	Scale 0.072 0.072 0.0864
-	ZOffset 2.5
+	Scale 0.072 0.072 0.072
+	ZOffset 2
 
 	FrameIndex ECLP A 0 0
 }
@@ -14,7 +14,7 @@ Model "EnforcerMag"
 	Path "models"
 	Model 0 "UsedMag_d.3d"
 	Skin 0 "jautot1_.png"
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 	ZOffset 1
 	USEACTORPITCH
 	USEACTORROLL
@@ -29,7 +29,7 @@ Model "UTCasing"
 	Path "models"
 	Model 0 "Shellc_d.3d"
 	Skin 0 "Shellcase1.png"
-	Scale 0.0168 0.014 0.014
+	Scale 0.014 0.014 0.014
 	AngleOffset 270
 	RollOffset 90
 	ZOffset 1
@@ -45,7 +45,7 @@ Model "BulletImpact"
 {
 	Path "models"
 	Model 0 "BulletImpact_d.3d"
-	Scale 0.32 0.268 0.24
+	Scale 0.32 0.24 0.24
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -67,13 +67,13 @@ Model "Enforcer"
 	Path "models"
 	Model 1 "MagPick_d.3d"
 	Skin 1 "Jautot1.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	AngleOffset 90
-	ZOffset 6
+	ZOffset 5
 
 	FrameIndex ENFP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex ENFP A 1 0
 }
diff --git a/modeldef.fcommando b/modeldef.fcommando
index e49f599..0486dcf 100644
--- a/modeldef.fcommando
+++ b/modeldef.fcommando
@@ -6,8 +6,8 @@ Model "UTPlayerTFemale1"
 	SurfaceSkin 0 1 "fcmd2.png"
 	SurfaceSkin 0 2 "fcmd4.png"
 	SurfaceSkin 0 4 "GunPick1.png"
-	Scale 0.256 0.23 0.23
-	Offset -3 3 36
+	Scale 0.23 0.23 0.23
+	Offset -2.5 3 36
 	RollOffset -90
 	AngleOffset -90
 	IGNORETRANSLATION	// I'll figure out eventually how to make color changes work, but for now this is it
diff --git a/modeldef.flak b/modeldef.flak
index 3670c4b..59a999e 100644
--- a/modeldef.flak
+++ b/modeldef.flak
@@ -3,7 +3,7 @@ Model "FlakAmmo"
 	Path "models"
 	Model 0 "FlakAmmoM_d.3d"
 	Skin 0 "jfa1.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	ZOffset 4.5
 
 	FrameIndex FAMO A 0 0
@@ -14,7 +14,7 @@ Model "FlakAmmo2"
 	Path "models"
 	Model 0 "flakslugm_d.3d"
 	Skin 0 "jflakslugel1_.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	AngleOffset 180
 	ZOffset 2
 
@@ -26,7 +26,7 @@ Model "FlakSlug"
 	Path "models"
 	Model 0 "flakslugm_d.3d"
 	Skin 0 "jflakslugel1.png"
-	Scale 0.048 0.04 0.04
+	Scale 0.04 0.04 0.04
 	AngleOffset 180
 	PitchOffset 90
 	USEACTORPITCH
@@ -38,7 +38,7 @@ Model "FlakChunk"
 {
 	Path "models"
 	Model 0 "chunkm_d.3d"
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -75,7 +75,7 @@ Model "FlakChunk"
 {
 	Path "models"
 	Model 1 "chunk2m_d.3d"
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -112,7 +112,7 @@ Model "FlakChunk"
 {
 	Path "models"
 	Model 2 "chunk3m_d.3d"
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -149,7 +149,7 @@ Model "FlakChunk"
 {
 	Path "models"
 	Model 3 "chunk4m_d.3d"
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -187,7 +187,7 @@ Model "FlakMag"
 	Path "models"
 	Model 0 "UsedFlak_d.3d"
 	Skin 0 "flak_t_.png"
-	Scale 0.15 0.3 0.36
+	Scale 0.15 0.3 0.3
 	AngleOffset 90
 	ZOffset 1
 	USEACTORPITCH
@@ -204,8 +204,8 @@ Model "FlakCannon"
 	Model 1 "flak2pick_d.3d"
 	Skin 1 "flak_t.png"
 	AngleOffset 90
-	Scale 0.14 0.14 0.168
-	Offset 18.9 0 12
+	Scale 0.14 0.14 0.14
+	Offset 18.9 0 10
 
 	FrameIndex FPCK B 1 0
 
diff --git a/modeldef.ges b/modeldef.ges
index 878ce21..958be9a 100644
--- a/modeldef.ges
+++ b/modeldef.ges
@@ -3,7 +3,7 @@ Model "BioAmmo"
 	Path "models"
 	Model 0 "BioAmmoM_d.3d"
 	Skin 0 "Jbammo1.png"
-	Scale 0.08 0.096 0.08
+	Scale 0.08 0.08 0.08
 	PitchOffset 180
 	RollOffset 90
 	ZOffset 4
@@ -15,7 +15,7 @@ Model "BioAmmo2"
 	Path "models"
 	Model 0 "BioAmmoM_d.3d"
 	Skin 0 "Jbammo1.png"
-	Scale 0.08 0.096 0.08
+	Scale 0.08 0.08 0.08
 	PitchOffset 180
 	RollOffset 90
 	ZOffset 4
@@ -28,7 +28,7 @@ Model "BioGel"
 	Path "models"
 	Model 0 "BioGelm_d.3d"
 	Skin 0 "Jgreen.png"
-	Scale 0.096 0.08 0.08
+	Scale 0.08 0.08 0.08
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -100,7 +100,7 @@ Model "BioSplash"
 	Path "models"
 	Model 0 "BioGelm_d.3d"
 	Skin 0 "Jgreen.png"
-	Scale 0.096 0.08 0.08
+	Scale 0.08 0.08 0.08
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -172,7 +172,7 @@ Model "BioGlob"
 	Path "models"
 	Model 0 "BioGelm_d.3d"
 	Skin 0 "Jgreen.png"
-	Scale 0.096 0.08 0.08
+	Scale 0.08 0.08 0.08
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -244,13 +244,13 @@ Model "BioRifle"
 	Path "models"
 	Model 1 "BRifle2Pick_d.3d"
 	Skin 1 "JBRifle2.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	AngleOffset 90
-	ZOffset 10
+	ZOffset 9
 
 	FrameIndex BIOP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex BIOP A 1 0
 }
diff --git a/modeldef.gore b/modeldef.gore
index 37444b8..4d22238 100644
--- a/modeldef.gore
+++ b/modeldef.gore
@@ -3,7 +3,7 @@ Model "UTGenericGib1"
 	Path "models"
 	Model 0 "chunkM_d.3d"
 	Skin 0 "JGCow1.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	Offset 0 0 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -18,7 +18,7 @@ Model "UTGenericGib2"
 	Path "models"
 	Model 0 "chunk2M_d.3d"
 	Skin 0 "JGCow1.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	Offset 0 0 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -33,7 +33,7 @@ Model "UTGenericGib3"
 	Path "models"
 	Model 0 "chunk3M_d.3d"
 	Skin 0 "JGCow1.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	Offset 0 0 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -48,7 +48,7 @@ Model "UTGenericGib4"
 	Path "models"
 	Model 0 "chunk4M_d.3d"
 	Skin 0 "JGCow1.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	Offset 0 0 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -63,7 +63,7 @@ Model "UTThigh"
 	Path "models"
 	Model 0 "ThighUTM_d.3d"
 	Skin 0 "ThighT.png"
-	Scale 0.1 0.12 0.1
+	Scale 0.1 0.1 0.1
 	Offset 0 3.5 0
 	PitchOffset 90
 	AngleOffset -90
@@ -80,7 +80,7 @@ Model "UTLiver"
 	Path "models"
 	Model 0 "LiverM_d.3d"
 	Skin 0 "Jparts1.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	Offset 0 0 1
 	USEACTORPITCH
 	USEACTORROLL
@@ -95,7 +95,7 @@ Model "UTStomach"
 	Path "models"
 	Model 0 "stomachM_d.3d"
 	Skin 0 "Jparts1.png"
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 	Offset 0 0 1
 	USEACTORPITCH
 	USEACTORROLL
@@ -110,7 +110,7 @@ Model "UTHeart"
 	Path "models"
 	Model 0 "PHeartM_d.3d"
 	Skin 0 "Jmisc1.png"
-	Scale 0.03 0.03 0.036
+	Scale 0.03 0.03 0.03
 	Offset 0 0 0.5
 	USEACTORPITCH
 	USEACTORROLL
@@ -130,7 +130,7 @@ Model "UTFemaleArm"
 	Path "models"
 	Model 0 "femalearmm_d.3d"
 	Skin 0 "femalearmT.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	Offset 0 0 1.5
 	USEACTORPITCH
 	USEACTORROLL
@@ -145,7 +145,7 @@ Model "UTFemaleFoot"
 	Path "models"
 	Model 0 "femalefootm_d.3d"
 	Skin 0 "femalefootT.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	Offset 0 0 1.5
 	USEACTORPITCH
 	USEACTORROLL
@@ -160,7 +160,7 @@ Model "UTFemaleTorso"
 	Path "models"
 	Model 0 "femaletorsom_d.3d"
 	Skin 0 "femaletorsoT.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	Offset 0 0 4
 	USEACTORPITCH
 	USEACTORROLL
@@ -175,7 +175,7 @@ Model "UTMaleArm"
 	Path "models"
 	Model 0 "malearmm_d.3d"
 	Skin 0 "malearmT.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	Offset 0 0 1.5
 	USEACTORPITCH
 	USEACTORROLL
@@ -190,7 +190,7 @@ Model "UTMaleFoot"
 	Path "models"
 	Model 0 "malefootm_d.3d"
 	Skin 0 "malefootT.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	Offset 0 0 1.5
 	USEACTORPITCH
 	USEACTORROLL
@@ -205,7 +205,7 @@ Model "UTMaleTorso"
 	Path "models"
 	Model 0 "maletorsom_d.3d"
 	Skin 0 "maletorsoT.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	Offset 0 0 4
 	USEACTORPITCH
 	USEACTORROLL
@@ -220,7 +220,7 @@ Model "UTBossArm"
 	Path "models"
 	Model 0 "bossarmm_d.3d"
 	Skin 0 "bossgibT.png"
-	Scale 0.12 0.12 0.144
+	Scale 0.12 0.12 0.12
 	Offset 0 0 1.5
 	USEACTORPITCH
 	USEACTORROLL
@@ -235,7 +235,7 @@ Model "UTBossFoot"
 	Path "models"
 	Model 0 "bossthighm_d.3d"
 	Skin 0 "bossgibT.png"
-	Scale 0.12 0.12 0.144
+	Scale 0.12 0.12 0.12
 	Offset 0 0 1.5
 	USEACTORPITCH
 	USEACTORROLL
@@ -250,7 +250,7 @@ Model "UTHeadFemale"
 	Path "models"
 	Model 0 "HeadFemaleM_d.3d"
 	Skin 0 "FMT1.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	Offset 0 0 3
 	AngleOffset -90
 	USEACTORPITCH
@@ -266,7 +266,7 @@ Model "UTHeadMale"
 	Path "models"
 	Model 0 "headmalem_d.3d"
 	Skin 0 "MMT1.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	Offset 0 0 3
 	AngleOffset -90
 	USEACTORPITCH
@@ -282,7 +282,7 @@ Model "UTHeadBoss"
 	Path "models"
 	Model 0 "bossheadm_d.3d"
 	Skin 0 "bossgibT.png"
-	Scale 0.07 0.07 0.084
+	Scale 0.07 0.07 0.07
 	Offset 0 0 3
 	AngleOffset -90
 	USEACTORPITCH
diff --git a/modeldef.impact b/modeldef.impact
index 8832db6..1a7507b 100644
--- a/modeldef.impact
+++ b/modeldef.impact
@@ -3,13 +3,13 @@ Model "ImpactHammer"
 	Path "models"
 	Model 1 "ImpPick_d.3d"
 	Skin 1 "JImpPick1.png"
-	Scale 0.2 0.24 0.2
+	Scale 0.2 0.2 0.2
 	RollOffset -90
-	ZOffset 9
+	ZOffset 7.5
 
 	FrameIndex IMPP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex IMPP A 1 0
 }
diff --git a/modeldef.minigun b/modeldef.minigun
index 17fa83c..59cb3f8 100644
--- a/modeldef.minigun
+++ b/modeldef.minigun
@@ -4,8 +4,8 @@ Model "MiniAmmo"
 	Path "models"
 	Model 0 "MiniAmmom_d.3d"
 	Skin 0 "JM21.png"
-	Offset 2 0 8
-	Scale 0.12 0.12 0.134
+	Offset 2 0 7
+	Scale 0.12 0.12 0.12
 
 	FrameIndex MAMO A 0 0
 }
@@ -15,7 +15,7 @@ Model "MinigunTracer"
 	Path "models"
 	Model 0 "MiniTrace_d.3d"
 	Skin 0 "JUT_Tracer_01.png"
-	Scale 0.6 0.2 0.24
+	Scale 0.6 0.2 0.2
 	Offset 60 0 0
 	USEACTORPITCH
 	USEACTORROLL
@@ -29,13 +29,13 @@ Model "Minigun"
 	Path "models"
 	Model 1 "MinigunPick_d.3d"
 	Skin 1 "Mini_t.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	AngleOffset 90
-	ZOffset 6
+	ZOffset 5
 
 	FrameIndex MGNP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex MGNP A 1 0
 }
diff --git a/modeldef.misc b/modeldef.misc
index 34d16e2..7b0bc89 100644
--- a/modeldef.misc
+++ b/modeldef.misc
@@ -3,8 +3,8 @@ Model "UTTeleportFog"
 	Path "models"
 	Model 0 "Tele2_d.3d"
 	Skin 0 "JTele2_01.png"
-	Scale 0.2 0.2 0.24
-	ZOffset 16
+	Scale 0.2 0.2 0.2
+	ZOffset 14
 	DONTCULLBACKFACES
 
 	FrameIndex TELE A 0 0
@@ -51,7 +51,7 @@ Model "UTHealthPack"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 1 "jhbox1.png"
 	SurfaceSkin 0 2 "fizzfull"
-	Scale 0.2 0.24 0.2
+	Scale 0.2 0.2 0.2
 	RollOffset -90
 	ZOffset 16
 
@@ -65,7 +65,7 @@ Model "ActHealthPack"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 1 "jhbox1.png"
 	SurfaceSkin 0 2 "fizzfull"
-	Scale 0.2 0.24 0.2
+	Scale 0.2 0.2 0.2
 	RollOffset -90
 	ZOffset 16
 
@@ -80,8 +80,8 @@ Model "UTHealthBox"
 	SurfaceSkin 0 1 "jhboxbeta1.png"
 	SurfaceSkin 0 2 "fizzside"
 	SurfaceSkin 0 3 "fizzfull"
-	Scale 0.08 0.08 0.096
-	ZOffset 4
+	Scale 0.08 0.08 0.08
+	ZOffset 3.5
 
 	FrameIndex HBOX B 0 0
 }
@@ -94,8 +94,8 @@ Model "ActHealthBox"
 	SurfaceSkin 0 1 "jhboxbeta1.png"
 	SurfaceSkin 0 2 "fizzside"
 	SurfaceSkin 0 3 "fizzfull"
-	Scale 0.08 0.08 0.096
-	ZOffset 4
+	Scale 0.08 0.08 0.08
+	ZOffset 3.5
 
 	FrameIndex HBOX B 0 0
 }
@@ -107,8 +107,8 @@ Model "UTMedBox"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 1 "JMedBox1.png"
 	SurfaceSkin 0 2 "fizzfull"
-	Scale 0.06 0.06 0.072
-	ZOffset 5
+	Scale 0.06 0.06 0.06
+	ZOffset 4
 
 	FrameIndex HBOX C 0 0
 }
@@ -120,8 +120,8 @@ Model "ActMedBox"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 1 "JMedBox1.png"
 	SurfaceSkin 0 2 "fizzfull"
-	Scale 0.06 0.06 0.072
-	ZOffset 5
+	Scale 0.06 0.06 0.06
+	ZOffset 4
 
 	FrameIndex HBOX C 0 0
 }
@@ -133,8 +133,8 @@ Model "UTHealthBonus"
 	SurfaceSkin 0 0 "JVial0.png"
 	SurfaceSkin 0 1 "fizzside"
 	SurfaceSkin 0 2 "fizztop"
-	Scale 0.04 0.04 0.048
-	ZOffset 8
+	Scale 0.04 0.04 0.04
+	ZOffset 7
 	DONTCULLBACKFACES
 
 	FrameIndex VIAL A 0 0
@@ -145,7 +145,7 @@ Model "UTArmorBonus"
 	Path "models"
 	Model 0 "ubonus_d.3d"
 	Skin 0 "shield.png"
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 	AngleOffset 90
 
 	FrameIndex XANH A 0 0
@@ -156,7 +156,7 @@ Model "UTThighPads"
 	Path "models"
 	Model 0 "ThighPads_d.3d"
 	Skin 0 "JThighPads_01.png"
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 	ZOffset 12
 	ROTATING
 
@@ -168,8 +168,8 @@ Model "UTBodyArmor"
 	Path "models"
 	Model 0 "Armor2M_d.3d"
 	Skin 0 "Jarmor2.png"
-	Scale 0.12 0.12 0.134
-	ZOffset 12
+	Scale 0.12 0.12 0.12
+	ZOffset 10
 
 	FrameIndex UARM A 0 0
 }
@@ -179,9 +179,9 @@ Model "UTShieldBelt"
 	Path "models"
 	Model 0 "ShieldBeltMeshM_d.3d"
 	Skin 0 "AUbelt1.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	AngleOffset -90
-	ZOffset 4
+	ZOffset 3.5
 
 	FrameIndex BELT A 0 0
 }
@@ -191,8 +191,8 @@ Model "UDamage"
 	Path "models"
 	Model 0 "UDamage_d.3d"
 	Skin 0 "GoldSkin2.png"
-	Scale 0.16 0.16 0.192
-	ZOffset 24
+	Scale 0.16 0.16 0.16
+	ZOffset 20
 	ROTATING
 
 	FrameIndex UDAM A 0 0
@@ -203,8 +203,8 @@ Model "ActUDamage"
 	Path "models"
 	Model 0 "UDamage_d.3d"
 	Skin 0 "GoldSkin2.png"
-	Scale 0.16 0.16 0.192
-	ZOffset 24
+	Scale 0.16 0.16 0.16
+	ZOffset 20
 	ROTATING
 
 	FrameIndex UDAM A 0 0
@@ -215,9 +215,9 @@ Model "UTRedSkull"
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
 	Skin 0 "JRelicSkull_01r.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	AngleOffset -90	// relic of death faces to the side originally
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 
 	FrameIndex USKL A 0 15
@@ -227,9 +227,9 @@ Model "UTGoldSkull"
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
 	Skin 0 "JRelicSkull_01g.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	AngleOffset -90	// relic of death faces to the side originally
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 
 	FrameIndex USKL B 0 15
@@ -239,9 +239,9 @@ Model "UTBlueSkull"
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
 	Skin 0 "JRelicSkull_01b.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	AngleOffset -90	// relic of death faces to the side originally
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 
 	FrameIndex USKL C 0 15
@@ -251,8 +251,8 @@ Model "UTRedKey"
 	Path "models"
 	Model 0 "DomR_d.3d"
 	Skin 0 "RedSkin2.png"
-	Scale 0.04 0.04 0.048
-	ZOffset 16
+	Scale 0.04 0.04 0.04
+	ZOffset 14
 	ROTATING
 
 	FrameIndex UKEY A 0 0
@@ -262,8 +262,8 @@ Model "UTGoldKey"
 	Path "models"
 	Model 0 "MercSymbol_d.3d"
 	Skin 0 "GoldSkin2.png"
-	Scale 0.08 0.08 0.096
-	ZOffset 16
+	Scale 0.08 0.08 0.08
+	ZOffset 14
 	ROTATING
 
 	FrameIndex UKEY B 0 0
@@ -273,8 +273,8 @@ Model "UTBlueKey"
 	Path "models"
 	Model 0 "DomB_d.3d"
 	Skin 0 "BlueSkin2.png"
-	Scale 0.04 0.04 0.048
-	ZOffset 16
+	Scale 0.04 0.04 0.04
+	ZOffset 14
 	ROTATING
 
 	FrameIndex UKEY C 0 0
@@ -284,8 +284,8 @@ Model "UTHereticYellowKey"
 	Path "models"
 	Model 0 "MercSymbol_d.3d"
 	Skin 0 "GoldSkin2.png"
-	Scale 0.08 0.08 0.096
-	ZOffset 16
+	Scale 0.08 0.08 0.08
+	ZOffset 14
 	ROTATING
 
 	FrameIndex UKEY B 0 0
@@ -295,8 +295,8 @@ Model "UTHereticGreenKey"
 	Path "models"
 	Model 0 "UDamage_d.3d"
 	Skin 0 "NewGreen.png"
-	Scale 0.08 0.08 0.096
-	ZOffset 16
+	Scale 0.08 0.08 0.08
+	ZOffset 14
 	ROTATING
 
 	FrameIndex UKEY D 0 0
@@ -306,8 +306,8 @@ Model "UTHereticBlueKey"
 	Path "models"
 	Model 0 "DomB_d.3d"
 	Skin 0 "BlueSkin2.png"
-	Scale 0.04 0.04 0.048
-	ZOffset 16
+	Scale 0.04 0.04 0.04
+	ZOffset 14
 	ROTATING
 
 	FrameIndex UKEY C 0 0
@@ -317,8 +317,8 @@ Model "UTHereticRedKey"
 	Path "models"
 	Model 0 "DomR_d.3d"
 	Skin 0 "RedSkin2.png"
-	Scale 0.04 0.04 0.048
-	ZOffset 16
+	Scale 0.04 0.04 0.04
+	ZOffset 14
 	ROTATING
 
 	FrameIndex UKEY A 0 0
@@ -329,8 +329,8 @@ Model "UTBackpack"
 	Path "models"
 	Model 0 "Backpack2_d.3d"	// edited out of SelectionMale1
 	Skin 0 "bpak.png"
-	ZOffset 16
-	Scale 0.3 0.3 0.36
+	ZOffset 14
+	Scale 0.3 0.3 0.3
 	AngleOffset -90
 	ROTATING
 
@@ -343,8 +343,8 @@ Model "UTInvisibility"
 	Model 0 "invis2M_d.3d"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 1 "jinvis.png"
-	Scale 0.1 0.1 0.12
-	ZOffset 9
+	Scale 0.1 0.1 0.1
+	ZOffset 7.5
 
 	FrameIndex INVS A 0 0
 }
@@ -355,8 +355,8 @@ Model "UTInvisibilityX"
 	// gzdoom doesn't handle the environment mapped flag, so I had to edit
 	// it into a separate texnum
 	SurfaceSkin 0 2 "invis00"
-	Scale 0.1 0.1 0.12
-	ZOffset 9
+	Scale 0.1 0.1 0.1
+	ZOffset 7.5
 
 	FrameIndex INVS A 0 0
 }
@@ -367,8 +367,8 @@ Model "ActUTInvisibility"
 	Model 0 "invis2M_d.3d"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 1 "jinvis.png"
-	Scale 0.1 0.1 0.12
-	ZOffset 9
+	Scale 0.1 0.1 0.1
+	ZOffset 7.5
 
 	FrameIndex INVS A 0 0
 }
@@ -379,8 +379,8 @@ Model "UTMapRevealer"
 	Model 0 "cheapcomp_d.3d"
 	SurfaceSkin 0 1 "JAllMap2.png"
 	SurfaceSkin 0 2 "JAllMap3.png"
-	Scale 0.04 0.04 0.048
-	ZOffset 3
+	Scale 0.04 0.04 0.04
+	ZOffset 2.5
 	AngleOffset 90
 
 	SurfaceSkin 0 0 "JAllMap1_a00.png"
@@ -398,8 +398,8 @@ Model "UTJumpBoots"
 	Path "models"
 	Model 0 "jboot_d.3d"
 	Skin 0 "Jlboot2.png"
-	Scale 0.09 0.09 0.108
-	ZOffset 7
+	Scale 0.09 0.09 0.09
+	ZOffset 6
 
 	FrameIndex JBUT A 0 0
 }
@@ -409,8 +409,8 @@ Model "ActJumpBoots"
 	Path "models"
 	Model 0 "jboot_d.3d"
 	Skin 0 "Jlboot2.png"
-	Scale 0.09 0.09 0.108
-	ZOffset 7
+	Scale 0.09 0.09 0.09
+	ZOffset 6
 
 	FrameIndex JBUT A 0 0
 }
@@ -420,7 +420,7 @@ Model "UTChip"
 	Path "models"
 	Model 0 "ChipM_d.3d"
 	Skin 0 "Chip1.png"
-	Scale 0.12 0.12 0.134
+	Scale 0.12 0.12 0.12
 	USEACTORPITCH
 	USEACTORROLL
 	USEROTATIONCENTER
@@ -438,8 +438,8 @@ Model "UTInvulnerability"
 	Path "models"
 	Model 0 "U_d.3d"
 	Skin 0 "GOLD.png"
-	Scale 0.15 0.15 0.18
-	ZOffset 24
+	Scale 0.15 0.15 0.15
+	ZOffset 20
 	ROTATING
 
 	FrameIndex UKEY A 0 0
@@ -450,8 +450,8 @@ Model "ActUTInvulnerability"
 	Path "models"
 	Model 0 "U_d.3d"
 	Skin 0 "GOLD.png"
-	Scale 0.15 0.15 0.18
-	ZOffset 24
+	Scale 0.15 0.15 0.15
+	ZOffset 20
 	ROTATING
 
 	FrameIndex UKEY A 0 0
@@ -462,8 +462,8 @@ Model "UTNightVision"
 	Path "models"
 	Model 0 "VisionM_d.3d"
 	SurfaceSkin 0 0 "s_camera.png"
-	Scale 0.15 0.15 0.18
-	ZOffset 24
+	Scale 0.15 0.15 0.15
+	ZOffset 20
 	ROTATING
 
 	FrameIndex UKEY A 0 0
@@ -474,8 +474,8 @@ Model "ActUTNightVision"
 	Path "models"
 	Model 0 "VisionM_d.3d"
 	SurfaceSkin 0 0 "s_camera.png"
-	Scale 0.15 0.15 0.18
-	ZOffset 24
+	Scale 0.15 0.15 0.15
+	ZOffset 20
 	ROTATING
 
 	FrameIndex UKEY A 0 0
@@ -486,8 +486,8 @@ Model "UTNightVisionX"
 	Path "models"
 	Model 0 "VisionM_d.3d"
 	SurfaceSkin 0 1 "Effect1.png"
-	Scale 0.15 0.15 0.18
-	ZOffset 24
+	Scale 0.15 0.15 0.15
+	ZOffset 20
 	ROTATING
 	DONTCULLBACKFACES
 
@@ -499,7 +499,7 @@ Model "WaterRing"
 	Path "models"
 	Model 0 "RingEx_d.3d"
 	Skin 0 "WetRing.png"
-	Scale 1.0 1.0 1.2
+	Scale 1.0 1.0 1.0
 	ZOffset 1
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -517,7 +517,7 @@ Model "UTWaterSplash"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_water.png"
-	Scale 0.16 0.16 0.192
+	Scale 0.16 0.16 0.16
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -554,7 +554,7 @@ Model "UTWaterSplish"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_water.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -592,7 +592,7 @@ Model "UTBloodSplash"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_blood.png"
-	Scale 0.16 0.16 0.192
+	Scale 0.16 0.16 0.16
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -629,7 +629,7 @@ Model "UTBloodSplish"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_blood.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -667,7 +667,7 @@ Model "UTSlimeSplash"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_sludge.png"
-	Scale 0.16 0.16 0.192
+	Scale 0.16 0.16 0.16
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -704,7 +704,7 @@ Model "UTSlimeSplish"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_sludge.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -742,7 +742,7 @@ Model "UTNukageSplash"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_nukage.png"
-	Scale 0.16 0.16 0.192
+	Scale 0.16 0.16 0.16
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -779,7 +779,7 @@ Model "UTNukageSplish"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_nukage.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -817,7 +817,7 @@ Model "UTLavaSplash"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_lava.png"
-	Scale 0.16 0.16 0.192
+	Scale 0.16 0.16 0.16
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -854,7 +854,7 @@ Model "UTLavaSplish"
 	Path "models"
 	Model 0 "WaterImpactM_d.3d"
 	Skin 0 "splash_lava.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
diff --git a/modeldef.pulse b/modeldef.pulse
index 9ccc8db..73e2ccc 100644
--- a/modeldef.pulse
+++ b/modeldef.pulse
@@ -3,8 +3,8 @@ Model "PulseAmmo"
 	Path "models"
 	Model 0 "PAmmo_d.3d"
 	Skin 0 "JPammo_01.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 6
+	Scale 0.06 0.06 0.06
+	ZOffset 5
 
 	FrameIndex PAMO A 0 0
 }
@@ -14,7 +14,7 @@ Model "PulseBolt"
 	Path "models"
 	Model 0 "PBolt_d.3d"
 	Offset 40.5 0 0
-	Scale 0.405 0.2025 0.243
+	Scale 0.405 0.2025 0.2025
 	AngleOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -37,7 +37,7 @@ Model "StarterBolt"
 	Path "models"
 	Model 0 "SBolt_d.3d"
 	Offset 40.5 0 0
-	Scale 0.405 0.2025 0.243
+	Scale 0.405 0.2025 0.2025
 	AngleOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -60,7 +60,7 @@ Model "PulseMag"
 	Path "models"
 	Model 0 "UsedPulse_d.3d"
 	Skin 0 "JPulseGun_02.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -75,12 +75,12 @@ Model "PulseGun"
 	Path "models"
 	Model 1 "PulsePickup_d.3d"
 	Skin 1 "JPulsePickup_01.png"
-	Scale 0.16 0.16 0.192
-	ZOffset 8
+	Scale 0.16 0.16 0.16
+	ZOffset 7
 
 	FrameIndex PGNP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex PGNP A 1 0
 }
diff --git a/modeldef.rifle b/modeldef.rifle
index 1eb964d..cd44b10 100644
--- a/modeldef.rifle
+++ b/modeldef.rifle
@@ -3,8 +3,8 @@ Model "RifleAmmo"
 	Path "models"
 	Model 0 "BulletBoxM_d.3d"
 	Skin 0 "BulletBoxT.png"
-	Scale 0.07 0.07 0.084
-	ZOffset 3
+	Scale 0.07 0.07 0.07
+	ZOffset 2.5
 
 	FrameIndex SBOX A 0 0
 }
@@ -14,8 +14,8 @@ Model "RifleAmmo2"
 	Path "models"
 	Model 0 "RifleRoundM_d.3d"
 	Skin 0 "RifleR1.png"
-	Scale 0.02 0.02 0.024
-	ZOffset 4
+	Scale 0.02 0.02 0.02
+	ZOffset 3.5
 
 	FrameIndex SRND A 0 0
 }
@@ -25,13 +25,13 @@ Model "SniperRifle"
 	Path "models"
 	Model 1 "RiflePick_d.3d"
 	Skin 1 "JRifle2.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	AngleOffset 90
-	ZOffset 6
+	ZOffset 5
 
 	FrameIndex SRFP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex SRFP A 1 0
 }
diff --git a/modeldef.ripper b/modeldef.ripper
index 3694b3d..ea0922c 100644
--- a/modeldef.ripper
+++ b/modeldef.ripper
@@ -3,8 +3,8 @@ Model "RipperAmmo"
 	Path "models"
 	Model 0 "BladeHopperM_d.3d"
 	Skin 0 "BladeHopperT.png"
-	Scale 0.1 0.1 0.12
-	ZOffset 10
+	Scale 0.1 0.1 0.1
+	ZOffset 8
 
 	FrameIndex BHOP A 0 0
 }
@@ -14,13 +14,13 @@ Model "Ripper2"
 	Path "models"
 	Model 1 "RazPick2_d.3d"
 	Skin 1 "JRazorw.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	AngleOffset 90
-	ZOffset 10
+	ZOffset 9
 
 	FrameIndex RZRP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex RZRP A 1 0
 }
@@ -32,7 +32,7 @@ Model "Razor2"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 1 "RazSkin.png"
 	Offset -9.5 0 0
-	Scale 0.18 0.18 0.216
+	Scale 0.18 0.18 0.18
 	AngleOffset 90
 	USEACTORPITCH
 
@@ -46,7 +46,7 @@ Model "Razor2Trail"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 2 "RazTrail.png"
 	Offset -19 0 0
-	Scale 0.36 0.18 0.216
+	Scale 0.36 0.18 0.18
 	AngleOffset 90
 	USEACTORPITCH
 	DONTCULLBACKFACES
@@ -61,7 +61,7 @@ Model "Razor2Alt"
 	// indices start at 1 for this mesh
 	SurfaceSkin 0 1 "RazSkin.png"
 	Offset -9.5 0 0
-	Scale 0.18 0.18 0.216
+	Scale 0.18 0.18 0.18
 	AngleOffset 90
 	USEACTORPITCH
 	USEACTORROLL
diff --git a/modeldef.sgirl b/modeldef.sgirl
index fbbeb11..35b8861 100644
--- a/modeldef.sgirl
+++ b/modeldef.sgirl
@@ -7,8 +7,8 @@ Model "UTPlayerTFemale2"
 	SurfaceSkin 0 2 "army3.png"
 	SurfaceSkin 0 3 "army4.png"
 	SurfaceSkin 0 5 "GunPick1.png"
-	Scale 0.256 0.23 0.23
-	Offset -3 3 36
+	Scale 0.23 0.23 0.23
+	Offset -2.5 3 36
 	RollOffset -90
 	AngleOffset -90
 	IGNORETRANSLATION	// I'll figure out eventually how to make color changes work, but for now this is it
diff --git a/modeldef.shock b/modeldef.shock
index 9c0f3d4..0e2126f 100644
--- a/modeldef.shock
+++ b/modeldef.shock
@@ -3,8 +3,8 @@ Model "ShockAmmo"
 	Path "models"
 	Model 0 "ShockCoreM_d.3d"
 	Skin 0 "JShockCore.png"
-	Scale 0.11 0.11 0.132
-	ZOffset 12
+	Scale 0.11 0.11 0.11
+	ZOffset 10
 
 	FrameIndex SHOA A 0 0
 }
@@ -13,8 +13,8 @@ Model "ShockAmmo2"
 	Path "models"
 	Model 0 "ShockCoreM_d.3d"
 	Skin 0 "JShockCore_2.png"
-	Scale 0.11 0.11 0.132
-	ZOffset 12
+	Scale 0.11 0.11 0.11
+	ZOffset 10
 
 	FrameIndex SHOA A 0 0
 }
@@ -24,8 +24,8 @@ Model "EnhancedShockAmmo"
 	Path "models"
 	Model 0 "ShockCoreM_d.3d"
 	Skin 0 "JSShockCore.png"
-	Scale 0.11 0.11 0.132
-	ZOffset 12
+	Scale 0.11 0.11 0.11
+	ZOffset 10
 
 	FrameIndex SHOA A 0 0
 }
@@ -35,8 +35,7 @@ Model "ShockRifleWave"
 	Path "models"
 	Model 0 "shockrwm_d.3d"
 	Skin 0 "shocktt1.png"
-	Scale 0.6 0.5 0.5
-	PitchOffset 90
+	Scale 0.5 0.5 0.5
 
 	FrameIndex SWAV A 0 0
 	FrameIndex SWAV B 0 1
@@ -47,8 +46,7 @@ Model "SuperShockRifleWave"
 	Path "models"
 	Model 0 "shockrwm_d.3d"
 	Skin 0 "sshocktt1.png"
-	Scale 0.6 0.5 0.5
-	PitchOffset 90
+	Scale 0.5 0.5 0.5
 
 	FrameIndex SWAV A 0 0
 	FrameIndex SWAV B 0 1
@@ -59,7 +57,7 @@ Model "ShockBeamRing"
 	Path "models"
 	Model 0 "utringex_d.3d"
 	Skin 0 "asaring.png"
-	Scale 1.2 1.0 1.0
+	Scale 1.0 1.0 1.0
 	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -81,7 +79,7 @@ Model "SuperShockBeamRing"
 	Path "models"
 	Model 0 "utringex_d.3d"
 	Skin 0 "ASasRing.png"
-	Scale 1.2 1.0 1.0
+	Scale 1.0 1.0 1.0
 	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -103,7 +101,7 @@ Model "ShockBlastRing"
 	Path "models"
 	Model 0 "utringex_d.3d"
 	Skin 0 "ppurplering.png"
-	Scale 1.2 1.0 1.0
+	Scale 1.0 1.0 1.0
 	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -125,7 +123,7 @@ Model "SuperShockBlastRing"
 	Path "models"
 	Model 0 "utringex_d.3d"
 	Skin 0 "ASasRing.png"
-	Scale 1.2 1.0 1.0
+	Scale 1.0 1.0 1.0
 	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -148,12 +146,12 @@ Model "ShockRifle"
 	Model 1 "asmd2pick_d.3d"
 	Skin 1 "asmd_t.png"
 	AngleOffset 90
-	Scale 0.14 0.14 0.18
-	ZOffset 4
+	Scale 0.14 0.14 0.14
+	ZOffset 3
 
 	FrameIndex ASMP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex ASMP A 1 0
 }
@@ -227,22 +225,14 @@ Model "EnhancedShockRifle"
 	Model 1 "asmd2pick_d.3d"
 	Skin 1 "sasmd_t.png"
 	AngleOffset 90
-	Scale 0.14 0.14 0.18
-	ZOffset 12
-	ROTATING
-
-	FrameIndex ASMP A 1 0
-}
-Model "EnhancedShockRifle"
-{
-	Path "models"
-	Model 1 "asmd2pick_d.3d"
-	Skin 1 "sasmd_t.png"
-	AngleOffset 90
-	Scale 0.14 0.14 0.18
-	ZOffset 4
+	Scale 0.14 0.14 0.14
+	ZOffset 3
 
 	FrameIndex ASMP B 1 0
+
+	ZOffset 10
+	ROTATING
+	FrameIndex ASMP A 1 0
 }
 
 Model "EnhancedShockRifle"
diff --git a/modeldef.soldier b/modeldef.soldier
index 3db89dc..7270166 100644
--- a/modeldef.soldier
+++ b/modeldef.soldier
@@ -7,7 +7,7 @@ Model "UTPlayerTMale2"
 	SurfaceSkin 0 2 "sldr3.png"
 	SurfaceSkin 0 3 "sldr4.png"
 	SurfaceSkin 0 5 "GunPick1.png"
-	Scale 0.256 0.23 0.23
+	Scale 0.23 0.23 0.23
 	Offset 0 -5 29
 	RollOffset -90
 	AngleOffset -90
diff --git a/modeldef.transloc b/modeldef.transloc
index 7200af8..4821b5c 100644
--- a/modeldef.transloc
+++ b/modeldef.transloc
@@ -3,8 +3,8 @@ Model "TranslocatorModule"
 	Path "models"
 	Model 0 "Module_d.3d"
 	Skin 0 "tloc2_.png"
-	Scale 0.056 0.056 0.0672
-	ZOffset 6
+	Scale 0.056 0.056 0.056
+	ZOffset 5
 	USEACTORPITCH
 
 	FrameIndex TMOD A 0 0
@@ -18,7 +18,7 @@ Model "Translocator"
 	Model 1 "Trans3loc_d.3d"
 	SurfaceSkin 1 0 "tloc1_.png"
 	SurfaceSkin 1 1 "tloc2_.png"
-	Scale 0.046 0.046 0.0552
+	Scale 0.046 0.046 0.046
 	AngleOffset -90
 	ZOffset 1
 
diff --git a/modeldef.warhead b/modeldef.warhead
index 903226a..ee050b6 100644
--- a/modeldef.warhead
+++ b/modeldef.warhead
@@ -3,8 +3,8 @@ Model "WarheadAmmo"
 	Path "models"
 	Model 0 "missile_d.3d"
 	Skin 0 "jmissile_01_.png"
-	Scale 0.2 0.2 0.24
-	ZOffset 21
+	Scale 0.2 0.2 0.2
+	ZOffset 17.5
 
 	FrameIndex WMIS A 0 0
 }
@@ -14,8 +14,7 @@ Model "ShockWave"
 	Path "models"
 	Model 0 "shockwavem_d.3d"
 	Skin 0 "shockt1.png"
-	Scale 1.2 1.0 1.0
-	PitchOffset 90
+	Scale 1.0 1.0 1.0
 
 	FrameIndex RWAV A 0 0
 	FrameIndex RWAV B 0 1
@@ -26,8 +25,8 @@ Model "WarShell"
 	Path "models"
 	Model 0 "missile_d.3d"
 	Skin 0 "jmissile_01.png"
-	Scale 0.24 0.2 0.2
-	Offset -13 0 0
+	Scale 0.2 0.2 0.2
+	Offset -11 0 0
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -39,8 +38,8 @@ Model "GuidedWarShell"
 	Path "models"
 	Model 0 "missile_d.3d"
 	Skin 0 "jmissile_01.png"
-	Scale 0.24 0.2 0.2
-	Offset -13 0 0
+	Scale 0.2 0.2 0.2
+	Offset -11 0 0
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -53,13 +52,13 @@ Model "WarheadLauncher"
 	Path "models"
 	Model 1 "whpick_d.3d"
 	Skin 1 "jwhpick1.png"
-	Scale 0.2 0.24 0.2
+	Scale 0.2 0.2 0.2
 	RollOffset -90
-	ZOffset 11
+	ZOffset 9
 
 	FrameIndex RDMP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex RDMP A 1 0
 }