From a36a7368876b694db81f890bae53be4ac2dbb6d2 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Thu, 5 Dec 2019 13:35:43 +0100
Subject: [PATCH] 1.0.6 release: - Revert 1.2 stretch compensation like in Doom
 Tournament.

---
 Readme.md              |   2 +-
 modeldef.asmd          |  36 +++++------
 modeldef.automag       |  14 ++---
 modeldef.betamag       |  10 +--
 modeldef.biggun        |  20 +++---
 modeldef.bonesaw       |   2 +-
 modeldef.dpistol       |  20 +++---
 modeldef.eightball     |  18 +++---
 modeldef.female1       |   4 +-
 modeldef.female2       |   4 +-
 modeldef.flamegun      |  12 ++--
 modeldef.gatling       |   8 +--
 modeldef.impaler       |  22 +++----
 modeldef.male1         |   4 +-
 modeldef.male2         |   4 +-
 modeldef.male3         |   4 +-
 modeldef.napalm        |  16 ++---
 modeldef.olsmp         |   8 +--
 modeldef.peacemaker    |  10 +--
 modeldef.quadshot      |  16 ++---
 modeldef.razorjack     |  10 +--
 modeldef.rifle         |  14 ++---
 modeldef.stinger       |  14 ++---
 modeldef.stunner       |   2 +-
 modeldef.ubiorifle     |  14 ++---
 modeldef.uflak         |  20 +++---
 modeldef.uminigun      |  10 +--
 modeldef.umisc         | 134 ++++++++++++++++++++---------------------
 modeldef.utranslocator |  10 +--
 zscript/miscitems.zsc  |   6 +-
 30 files changed, 234 insertions(+), 234 deletions(-)

diff --git a/Readme.md b/Readme.md
index 8bc9473..d009864 100644
--- a/Readme.md
+++ b/Readme.md
@@ -73,7 +73,7 @@ This mod requires GZDoom 4.2.4 or later, and runs on top of Doom Tournament.
 
 ## 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.asmd b/modeldef.asmd
index c6ccc47..5d76339 100644
--- a/modeldef.asmd
+++ b/modeldef.asmd
@@ -3,8 +3,8 @@ Model "ASMDAmmo"
 	Path "models"
 	Model 0 "AsmdAmmoM_d.3d"
 	SurfaceSkin 0 1 "JAsmdAmmo1.png"
-	Scale 0.09 -0.09 0.108
-	ZOffset 10
+	Scale 0.09 -0.09 0.09
+	ZOffset 9
 
 	FrameIndex SHOA A 0 0
 }
@@ -14,8 +14,8 @@ Model "ASMDAmmoX"
 	Path "models"
 	Model 0 "AsmdAmmoM_d.3d"
 	SurfaceSkin 0 0 "ShockC.png"
-	Scale 0.09 -0.09 0.108
-	ZOffset 10
+	Scale 0.09 -0.09 0.09
+	ZOffset 9
 	DONTCULLBACKFACES
 
 	FrameIndex SHOA A 0 0
@@ -26,8 +26,8 @@ Model "ASMDAmmoXX"
 	Path "models"
 	Model 0 "AsmdAmmoM_d.3d"
 	SurfaceSkin 0 2 "ShockSm.png"
-	Scale 0.09 -0.09 0.108
-	ZOffset 10
+	Scale 0.09 -0.09 0.09
+	ZOffset 9
 	DONTCULLBACKFACES
 
 	FrameIndex SHOA A 0 0
@@ -38,8 +38,8 @@ Model "ASMDAmmo2"
 	Path "models"
 	Model 0 "AsmdAmmoSmallM_d.3d"
 	SurfaceSkin 0 0 "JAsmdAmmo1.png"
-	Scale 0.03 -0.04 0.06
-	ZOffset 6
+	Scale 0.03 -0.04 0.05
+	ZOffset 5
 
 	FrameIndex SHOA B 0 0
 }
@@ -49,8 +49,8 @@ Model "ASMDAmmo2X"
 	Path "models"
 	Model 0 "AsmdAmmoSmallM_d.3d"
 	SurfaceSkin 0 1 "ShockC.png"
-	Scale 0.03 -0.04 0.06
-	ZOffset 6
+	Scale 0.03 -0.04 0.05
+	ZOffset 5
 	DONTCULLBACKFACES
 
 	FrameIndex SHOA B 0 0
@@ -61,7 +61,7 @@ Model "ASMDBall"
 	Path "models"
 	Model 0 "TazerProja_d.3d"
 	Skin 0 "AsmdBall.png"
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 	DONTCULLBACKFACES
 	USEACTORPITCH
 	USEACTORROLL
@@ -74,7 +74,7 @@ Model "ASMDBeamRing"
 	Path "models"
 	Model 0 "RingEx_d.3d"
 	Skin 0 "AsmdBeam.png"
-	Scale 0.72 0.6 0.6
+	Scale 0.6 0.6 0.6
 	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -91,7 +91,7 @@ Model "ASMDSBeamRing"
 	Path "models"
 	Model 0 "RingEx_d.3d"
 	Skin 0 "AsmdSBeam.png"
-	Scale 0.72 0.6 0.6
+	Scale 0.6 0.6 0.6
 	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -108,7 +108,7 @@ Model "ASMDBlastRing"
 	Path "models"
 	Model 0 "RingEx_d.3d"
 	Skin 0 "AsmdPBeam.png"
-	Scale 1.44 1.2 1.2
+	Scale 1.2 1.2 1.2
 	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -126,7 +126,7 @@ Model "ASMDRingTrail"
 	Path "models"
 	Model 0 "RingEx_d.3d"
 	Skin 0 "AsmdBeam.png"
-	Scale 0.024 0.02 0.02
+	Scale 0.02 0.02 0.02
 	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -144,13 +144,13 @@ Model "ASMD"
 	Path "models"
 	Model 1 "ASMDPick_d.3d"
 	Skin 1 "ASMD1_.png"
-	ZOffset 8
+	ZOffset 7
 	AngleOffset 90
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 
 	FrameIndex ASMP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex ASMP A 1 0
 }
diff --git a/modeldef.automag b/modeldef.automag
index 06074fc..47f82bc 100644
--- a/modeldef.automag
+++ b/modeldef.automag
@@ -3,8 +3,8 @@ Model "UClip"
 	Path "models"
 	Model 0 "ClipM_d.3d"
 	Skin 0 "Jclip1_.png"
-	Scale 0.04 -0.04 0.048
-	ZOffset 1.5
+	Scale 0.04 -0.04 0.04
+	ZOffset 1.2
 
 	FrameIndex UCLP A 0 0
 }
@@ -14,7 +14,7 @@ Model "UCasing"
 	Path "models"
 	Model 0 "Shell_d.3d"
 	Skin 0 "Shell1.png"
-	Scale 0.0264 -0.022 0.022
+	Scale 0.022 -0.022 0.022
 	AngleOffset 90
 	RollOffset 180
 	ZOffset 1
@@ -31,7 +31,7 @@ Model "AutomagMag"
 	Path "models"
 	Model 0 "AutoMagSpentClip_d.3d"
 	Skin 0 "Automa1.png"
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 	ZOffset 1
 	USEACTORPITCH
 	USEACTORROLL
@@ -46,13 +46,13 @@ Model "Automag"
 	Path "models"
 	Model 1 "AutoMagPickup_d.3d"
 	Skin 1 "Automa1_.png"
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 	AngleOffset -90
-	ZOffset 6
+	ZOffset 5
 
 	FrameIndex AUTP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex AUTP A 1 0
 }
diff --git a/modeldef.betamag b/modeldef.betamag
index ec071c9..36c4391 100644
--- a/modeldef.betamag
+++ b/modeldef.betamag
@@ -3,13 +3,13 @@ Model "Betamag"
 	Path "models"
 	Model 1 "OldAutoMagPick_d.3d"
 	Skin 1 "AutoHand1_.png"
-	Scale 0.05 -0.05 0.06
+	Scale 0.05 -0.05 0.05
 	AngleOffset -90
-	ZOffset 9
+	ZOffset 8
 
 	FrameIndex AUTP B 1 0
 
-	ZOffset 13
+	ZOffset 11
 	ROTATING
 	FrameIndex AUTP A 1 0
 }
@@ -19,7 +19,7 @@ Model "BCasing"
 	Path "models"
 	Model 0 "OldShell_d.3d"
 	Skin 0 "AutoHand1.png"
-	Scale 0.0264 -0.022 0.022
+	Scale 0.022 -0.022 0.022
 	AngleOffset 90
 	RollOffset 180
 	ZOffset 1
@@ -36,7 +36,7 @@ Model "BCasing2"
 	Path "models"
 	Model 0 "OldShell_d.3d"
 	Skin 0 "Autom1.png"
-	Scale 0.0264 -0.022 0.022
+	Scale 0.022 -0.022 0.022
 	AngleOffset 90
 	RollOffset 180
 	ZOffset 1
diff --git a/modeldef.biggun b/modeldef.biggun
index e176984..cdbe9bc 100644
--- a/modeldef.biggun
+++ b/modeldef.biggun
@@ -4,7 +4,7 @@ Model "BigAmmo"
 	Model 0 "BigGAmmoBox_d.3d"
 	SurfaceSkin 0 0 "Jclip1_.png"
 	SurfaceSkin 0 1 "RifleBul1.png"
-	Scale 0.15 0.15 0.18
+	Scale 0.15 0.15 0.15
 
 	FrameIndex BIGA A 0 0
 }
@@ -13,7 +13,7 @@ Model "BigAmmo2"
 	Path "models"
 	Model 0 "BigGAmmo_d.3d"
 	Skin 0 "Jclip1_.png"
-	Scale 0.15 0.15 0.18
+	Scale 0.15 0.15 0.15
 
 	FrameIndex BIGA A 0 0
 }
@@ -22,7 +22,7 @@ Model "BigAmmo3"
 	Path "models"
 	Model 0 "BigGAmmoSingle_d.3d"
 	Skin 0 "Jclip1_.png"
-	Scale 0.15 0.15 0.18
+	Scale 0.15 0.15 0.15
 
 	FrameIndex BIGA A 0 0
 }
@@ -33,7 +33,7 @@ Model "FatRing"
 	Model 0 "FatRing_d.3d"
 	Skin 0 "JRingEx1.png"
 	PitchOffset 90
-	Scale 1.2 1.0 1.0
+	Scale 1.0 1.0 1.0
 	DONTCULLBACKFACES
 	USEACTORPITCH
 	USEACTORROLL
@@ -56,13 +56,13 @@ Model "BigGun"
 	Path "models"
 	Model 1 "BigGPick_d.3d"
 	Skin 1 "JBigGun1_.png"
-	ZOffset 15
+	ZOffset 13
 	AngleOffset 90
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 
 	FrameIndex BIGP B 1 0
 
-	ZOffset 16
+	ZOffset 14
 	ROTATING
 	FrameIndex BIGP A 1 0
 }
@@ -72,7 +72,7 @@ Model "BigCasing"
 	Path "models"
 	Model 0 "BigGShellC_d.3d"
 	Skin 0 "Jclip1.png"
-	Scale 0.12 0.1 0.1
+	Scale 0.1 0.1 0.1
 	PitchOffset 90
 	Offset 3 0 2
 	USEACTORPITCH
@@ -88,9 +88,9 @@ Model "BigMag"
 	Path "models"
 	Model 0 "BigGMag_d.3d"
 	Skin 0 "JBigGun1.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	AngleOffset 90
-	ZOffset 2.5
+	ZOffset 2.2
 	USEACTORPITCH
 	USEACTORROLL
 	USEROTATIONCENTER
diff --git a/modeldef.bonesaw b/modeldef.bonesaw
index 350152d..7392e91 100644
--- a/modeldef.bonesaw
+++ b/modeldef.bonesaw
@@ -3,7 +3,7 @@ Model "Bonesaw"
 	Path "models"
 	Model 1 "BonesawPick_d.3d"
 	Skin 1 "JBoneSw1_.png"
-	Scale 0.096 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 	AngleOffset 180
 	Offset 8 0 6
 
diff --git a/modeldef.dpistol b/modeldef.dpistol
index 2a62326..bdc000c 100644
--- a/modeldef.dpistol
+++ b/modeldef.dpistol
@@ -3,7 +3,7 @@ Model "WeaponPowerUp"
 	Path "models"
 	Model 0 "WeaponPowerUpMesh_d.3d"
 	SurfaceSkin 0 1 "aPower1.png"
-	Scale 0.1 -0.1 0.12
+	Scale 0.1 -0.1 0.1
 	ZOffset 20
 
 	FrameIndex WPOW A 0 0
@@ -14,7 +14,7 @@ Model "WeaponPowerUpX"
 	Path "models"
 	Model 0 "WeaponPowerUpMesh_d.3d"
 	SurfaceSkin 0 0 "PowerFX.png"
-	Scale 0.1 -0.1 0.12
+	Scale 0.1 -0.1 0.1
 	ZOffset 20
 	DONTCULLBACKFACES
 
@@ -44,7 +44,7 @@ Model "DispersionAmmo"
 {
 	Path "models"
 	Model 0 "DispM1_d.3d"
-	Scale 0.3 0.18 0.096
+	Scale 0.3 0.18 0.08
 	Offset 8 0 0
 	AngleOffset 90
 
@@ -80,7 +80,7 @@ Model "DAmmo2"
 {
 	Path "models"
 	Model 0 "DispM1_d.3d"
-	Scale 0.3 0.18 0.096
+	Scale 0.3 0.18 0.08
 	Offset 8 0 0
 	AngleOffset 90
 
@@ -116,7 +116,7 @@ Model "DAmmo3"
 {
 	Path "models"
 	Model 0 "DispM1_d.3d"
-	Scale 0.3 0.18 0.096
+	Scale 0.3 0.18 0.08
 	Offset 8 0 0
 	AngleOffset 90
 
@@ -152,7 +152,7 @@ Model "DAmmo4"
 {
 	Path "models"
 	Model 0 "DispM1_d.3d"
-	Scale 0.3 0.18 0.096
+	Scale 0.3 0.18 0.08
 	Offset 8 0 0
 	AngleOffset 90
 
@@ -188,7 +188,7 @@ Model "DAmmo5"
 {
 	Path "models"
 	Model 0 "DispM1_d.3d"
-	Scale 0.3 0.18 0.096
+	Scale 0.3 0.18 0.08
 	Offset 8 0 0
 	AngleOffset 90
 
@@ -226,13 +226,13 @@ Model "DispersionPistol"
 	Path "models"
 	Model 1 "DPistolPick_d.3d"
 	Skin 1 "DPistol1_.png"
-	ZOffset 8
+	ZOffset 7
 	AngleOffset 90
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 
 	FrameIndex DPIP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex DPIP A 1 0
 }
diff --git a/modeldef.eightball b/modeldef.eightball
index f9cc9e8..7095d82 100644
--- a/modeldef.eightball
+++ b/modeldef.eightball
@@ -3,8 +3,8 @@ Model "URocketAmmo"
 	Path "models"
 	Model 0 "RocketCanMesh_d.3d"
 	Skin 0 "JRocketCan1.png"
-	Scale 0.12 0.12 0.144
-	ZOffset 7
+	Scale 0.12 0.12 0.12
+	ZOffset 6
 
 	FrameIndex RPAK A 0 0
 	FrameIndex RPAK B 0 1
@@ -24,8 +24,8 @@ Model "URocketAmmo2"
 	Model 0 "SingleRocketMesh_d.3d"
 	SurfaceSkin 0 0 "JRocketCan1.png"
 	SurfaceSkin 0 1 "JRocket1_.png"
-	Scale 0.05 0.05 0.056
-	ZOffset 4
+	Scale 0.05 0.05 0.05
+	ZOffset 3.5
 
 	FrameIndex RCKT A 0 0
 	FrameIndex RCKT B 0 1
@@ -36,13 +36,13 @@ Model "Eightball"
 	Path "models"
 	Model 1 "EightPick_d.3d"
 	Skin 1 "JEightB1_.png"
-	ZOffset 4
+	ZOffset 3.5
 	AngleOffset 90
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 
 	FrameIndex EBLP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex EBLP A 1 0
 }
@@ -54,7 +54,7 @@ Model "URocket"
 	Skin 0 "JRocket1.png"
 	AngleOffset 90
 	Offset 5 0 0
-	Scale 0.05 0.05 0.06
+	Scale 0.05 0.05 0.05
 	USEACTORPITCH
 
 	FrameIndex RCKT A 0 1
@@ -69,7 +69,7 @@ Model "UGrenade"
 	Skin 0 "JRocket1.png"
 	AngleOffset 90
 	Offset -2 0 0
-	Scale 0.05 0.05 0.06
+	Scale 0.05 0.05 0.05
 	USEACTORPITCH
 
 	FrameIndex RCKT A 0 0
diff --git a/modeldef.female1 b/modeldef.female1
index 9d177c4..4de3071 100644
--- a/modeldef.female1
+++ b/modeldef.female1
@@ -4,8 +4,8 @@ Model "UPlayerFemale1"
 	Model 0 "Female1_d.3d"
 	SurfaceSkin 0 0 "gina.png"
 	SurfaceSkin 0 1 "GunPick1.png"
-	Scale 0.24 0.2 0.2
-	Offset -2 0 32
+	Scale 0.2 0.2 0.2
+	Offset -1.5 0 32
 	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.female2 b/modeldef.female2
index 33b2047..b8d89c8 100644
--- a/modeldef.female2
+++ b/modeldef.female2
@@ -4,8 +4,8 @@ Model "UPlayerFemale2"
 	Model 0 "Female2_d.3d"
 	SurfaceSkin 0 0 "Sonya.png"
 	SurfaceSkin 0 1 "GunPick1.png"
-	Scale 0.24 0.2 0.2
-	Offset -2 0 32
+	Scale 0.2 0.2 0.2
+	Offset -1.5 0 32
 	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.flamegun b/modeldef.flamegun
index 7c263cc..d25931e 100644
--- a/modeldef.flamegun
+++ b/modeldef.flamegun
@@ -4,7 +4,7 @@ Model "UFireball"
 	Model 0 "Flame_d.3d"
 	Skin 0 "JFlame2.png"
 	PitchOffset 90
-	Scale 0.048 0.04 0.04
+	Scale 0.04 0.04 0.04
 	Offset -4 0 0
 	PITCHFROMMOMENTUM
 
@@ -26,7 +26,7 @@ Model "UFireball2"
 	Model 0 "Flame_d.3d"
 	Skin 0 "JFlame3.png"
 	PitchOffset 90
-	Scale 0.06 0.05 0.05
+	Scale 0.05 0.05 0.05
 	Offset -5 0 0
 	PITCHFROMMOMENTUM
 
@@ -48,7 +48,7 @@ Model "UFireballEmber"
 	Model 0 "Flame_d.3d"
 	Skin 0 "JFlame3.png"
 	PitchOffset 90
-	Scale 0.024 0.02 0.02
+	Scale 0.02 0.02 0.02
 	Offset -2 0 0
 	PITCHFROMMOMENTUM
 
@@ -70,12 +70,12 @@ Model "FlameGun"
 	Path "models"
 	Model 1 "FlameGPick_d.3d"
 	Skin 1 "JFlameG1_.png"
-	ZOffset 6
-	Scale 0.04 0.04 0.048
+	ZOffset 5
+	Scale 0.04 0.04 0.04
 
 	FrameIndex FGNP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex FGNP A 1 0
 }
diff --git a/modeldef.gatling b/modeldef.gatling
index 39c42ce..6446a0d 100644
--- a/modeldef.gatling
+++ b/modeldef.gatling
@@ -5,7 +5,7 @@ Model "SMiniShell"
 	Skin 0 "jsshell.png"
 	PitchOffset 90
 	PITCHFROMMOMENTUM
-	Scale -0.048 0.02 0.02
+	Scale -0.04 0.02 0.02
 
 	FrameIndex SMIS A 0 0
 }
@@ -15,12 +15,12 @@ Model "SMiniGun"
 	Path "models"
 	Model 1 "SMiniPick_d.3d"
 	Skin 1 "Minigun_.png"
-	ZOffset 12
-	Scale 0.18 0.18 0.216
+	ZOffset 10
+	Scale 0.18 0.18 0.18
 
 	FrameIndex SMIP B 1 0
 
-	ZOffset 15
+	ZOffset 14
 	ROTATING
 	FrameIndex SMIP A 1 0
 }
diff --git a/modeldef.impaler b/modeldef.impaler
index c5436c2..5d1bb67 100644
--- a/modeldef.impaler
+++ b/modeldef.impaler
@@ -3,9 +3,9 @@ Model "ImpalerAmmo"
 	Path "models"
 	Model 0 "ImpalerAmmo_d.3d"
 	Skin 0 "JImpale1_.png"
-	Scale 0.25 0.25 0.3
+	Scale 0.25 0.25 0.25
 	AngleOffset 90
-	ZOffset 4
+	ZOffset 3.5
 
 	FrameIndex IAMO A 0 0
 }
@@ -14,9 +14,9 @@ Model "ImpalerAmmo2"
 	Path "models"
 	Model 0 "ImpalerProj_d.3d"
 	Skin 0 "JImpale1_.png"
-	Scale 0.25 0.25 0.3
+	Scale 0.25 0.25 0.25
 	AngleOffset 90
-	ZOffset 2
+	ZOffset 1.5
 
 	FrameIndex IAMO A 0 0
 }
@@ -26,7 +26,7 @@ Model "ImpalerBurstBolt"
 	Path "models"
 	Model 0 "PBolt_d.3d"
 	Offset 5.0125 0 0
-	Scale 0.050125 0.1025 0.123
+	Scale 0.050125 0.1025 0.1025
 	AngleOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -49,7 +49,7 @@ Model "ImpalerBolt"
 	Path "models"
 	Model 0 "PBolt_d.3d"
 	Offset 10.125 0 0
-	Scale 0.10125 0.2025 0.243
+	Scale 0.10125 0.2025 0.2025
 	AngleOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -72,7 +72,7 @@ Model "StarterImpalerBolt"
 	Path "models"
 	Model 0 "SBolt_d.3d"
 	Offset 10.125 0 0
-	Scale 0.10125 0.2025 0.243
+	Scale 0.10125 0.2025 0.2025
 	AngleOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
@@ -94,7 +94,7 @@ Model "ImpalerChunk"
 	Path "models"
 	Model 0 "burstx_d.3d"
 	Skin 0 "JIBurst1.png"
-	Scale 0.4 0.4 0.48
+	Scale 0.4 0.4 0.4
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -114,7 +114,7 @@ Model "ImpalerProjectile"
 	Path "models"
 	Model 0 "ImpalerProj_d.3d"
 	Skin 0 "JImpale1.png"
-	Scale 0.15 0.15 0.18
+	Scale 0.15 0.15 0.15
 	PITCHFROMMOMENTUM
 	USEACTORROLL
 
@@ -130,13 +130,13 @@ Model "Impaler"
 	PitchOffset -5
 	RollOffset 45
 	AngleOffset 180
-	Scale 0.15 -0.18 0.18
+	Scale 0.2 -0.2 0.2
 
 	FrameIndex IMPP B 1 0
 
 	PitchOffset 0
 	RollOffset 0
-	Scale 0.2 -0.2 0.24
+	Scale 0.2 -0.2 0.2
 	Offset 6 0 9
 	ROTATING
 	FrameIndex IMPP A 1 0
diff --git a/modeldef.male1 b/modeldef.male1
index fdac7f5..0c6cd05 100644
--- a/modeldef.male1
+++ b/modeldef.male1
@@ -4,8 +4,8 @@ Model "UPlayerMale1"
 	Model 0 "Male1_d.3d"
 	SurfaceSkin 0 0 "Kurgan.png"
 	SurfaceSkin 0 1 "GunPick1.png"
-	Scale 0.24 0.2 0.2
-	Offset 3 7 25
+	Scale 0.2 0.2 0.2
+	Offset 2.5 7 25
 	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.male2 b/modeldef.male2
index 588ca37..32a6fea 100644
--- a/modeldef.male2
+++ b/modeldef.male2
@@ -4,8 +4,8 @@ Model "UPlayerMale2"
 	Model 0 "Male2_d.3d"
 	SurfaceSkin 0 0 "Ash.png"
 	SurfaceSkin 0 1 "GunPick1.png"
-	Scale 0.24 0.2 0.2
-	Offset 3 -7 25
+	Scale 0.2 0.2 0.2
+	Offset 2.5 -7 25
 	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.male3 b/modeldef.male3
index 7563a45..18a65bc 100644
--- a/modeldef.male3
+++ b/modeldef.male3
@@ -4,8 +4,8 @@ Model "UPlayerMale3"
 	Model 0 "Male3_d.3d"
 	SurfaceSkin 0 0 "Dante.png"
 	SurfaceSkin 0 1 "GunPick1.png"
-	Scale 0.24 0.2 0.2
-	Offset 3 -7 25
+	Scale 0.2 0.2 0.2
+	Offset 2.5 -7 25
 	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.napalm b/modeldef.napalm
index 8e15ac5..2d873e0 100644
--- a/modeldef.napalm
+++ b/modeldef.napalm
@@ -3,10 +3,10 @@ Model "FlameAmmo"
 	Path "models"
 	Model 0 "steelbarrelM_d.3d"
 	Skin 0 "JNapalmAm1.png"
-	Scale -0.04 0.04 0.048
+	Scale -0.04 0.04 0.04
 	AngleOffset 90
 	RollOffset 180
-	ZOffset 6
+	ZOffset 5
 
 	FrameIndex FLMA A 0 0
 }
@@ -16,7 +16,7 @@ Model "UNapalm"
 	Path "models"
 	Model 0 "BioRGel_d.3d"
 	Skin 0 "JNapGel1.png"
-	Scale 0.12 0.1 0.1
+	Scale 0.1 0.1 0.1
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -87,7 +87,7 @@ Model "UNapalmGlob"
 	Path "models"
 	Model 0 "BioRGel_d.3d"
 	Skin 0 "JNapGel1.png"
-	Scale 0.12 0.1 0.1
+	Scale 0.1 0.1 0.1
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -158,7 +158,7 @@ Model "UNapalmSplash"
 	Path "models"
 	Model 0 "BioRGel_d.3d"
 	Skin 0 "JNapGel1.png"
-	Scale 0.12 0.1 0.1
+	Scale 0.1 0.1 0.1
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -231,13 +231,13 @@ Model "UFlamethrower"
 	Model 1 "FlameTPick_d.3d"
 	SurfaceSkin 1 0 "JNapalm1_.png"
 	SurfaceSkin 1 1 "Flamet_.png"
-	ZOffset 10
+	ZOffset 9
 	AngleOffset -90
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 
 	FrameIndex FLMP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex FLMP A 1 0
 }
diff --git a/modeldef.olsmp b/modeldef.olsmp
index ef6e70f..369ce42 100644
--- a/modeldef.olsmp
+++ b/modeldef.olsmp
@@ -3,7 +3,7 @@ Model "OLSMPAmmo"
 	Path "models"
 	Model 0 "OLSMPAmmo_d.3d"
 	Skin 0 "OLSMP_.png"
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 	ZOffset 1
 
 	FrameIndex UCLP A 0 0
@@ -14,13 +14,13 @@ Model "OLSMP"
 	Path "models"
 	Model 1 "OLSMPPick_d.3d"
 	Skin 1 "OLSMP_.png"
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 	AngleOffset -90
-	ZOffset 19
+	ZOffset 16
 
 	FrameIndex AUTP B 1 0
 
-	ZOffset 21
+	ZOffset 20
 	ROTATING
 	FrameIndex AUTP A 1 0
 }
diff --git a/modeldef.peacemaker b/modeldef.peacemaker
index cb93ce7..3865ea8 100644
--- a/modeldef.peacemaker
+++ b/modeldef.peacemaker
@@ -4,7 +4,7 @@ Model "Peacerocket"
 	Model 0 "perock_d.3d"
 	SurfaceSkin 0 1 "Jpeace1.png"
 	PitchOffset -90
-	Scale 0.16 0.192 0.16
+	Scale 0.16 0.16 0.16
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -16,7 +16,7 @@ Model "PeaceFragment"
 	Path "models"
 	Model 0 "sfrag_d.3d"
 	Skin 0 "Jpeace1.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -33,9 +33,9 @@ Model "Peacebarrel"
 	Path "models"
 	Model 0 "peace_d.3d"
 	Skin 0 "Jpeace1.png"
-	ZOffset 10
+	ZOffset 9
 	AngleOffset -45
-	Scale 0.16 -0.16 0.192
+	Scale 0.16 -0.16 0.16
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -83,7 +83,7 @@ Model "Peacemaker"
 	Skin 1 "Jpeacehand1_.png"
 	RollOffset 90	// normally upright, but it's easier to tell apart from a deployed one this way
 	ZOffset 5
-	Scale 0.16 -0.192 0.16
+	Scale 0.16 -0.16 0.16
 
 	FrameIndex PEAP B 1 0
 
diff --git a/modeldef.quadshot b/modeldef.quadshot
index 1313546..de54e24 100644
--- a/modeldef.quadshot
+++ b/modeldef.quadshot
@@ -3,9 +3,9 @@ Model "UShells"
 	Path "models"
 	Model 0 "ShellsM_d.3d"
 	Skin 0 "JQuadAm1_.png"
-	Scale 0.03 0.03 0.036
+	Scale 0.03 0.03 0.03
 	AngleOffset 90
-	ZOffset 3
+	ZOffset 2.5
 
 	FrameIndex QAMO A 0 0
 }
@@ -15,9 +15,9 @@ Model "UShells2"
 	Path "models"
 	Model 0 "ShellsSmallM_d.3d"
 	Skin 0 "JQuadAm1_.png"
-	Scale 0.03 0.03 0.036
+	Scale 0.03 0.03 0.03
 	AngleOffset 90
-	ZOffset 1.5
+	ZOffset 1.25
 
 	FrameIndex QAMO A 0 0
 }
@@ -27,7 +27,7 @@ Model "QCasing"
 	Path "models"
 	Model 0 "QShell_d.3d"
 	Skin 0 "JQuadAm2.png"
-	Scale 0.03 -0.03 0.036
+	Scale 0.03 -0.03 0.03
 	AngleOffset 90
 	ZOffset 1
 	USEACTORPITCH
@@ -43,13 +43,13 @@ Model "Quadshot"
 	Path "models"
 	Model 1 "QuadShotPickup_d.3d"
 	Skin 1 "GunPick1_.png"
-	ZOffset 6
+	ZOffset 5
 	AngleOffset -90
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex QSPK B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex QSPK A 1 0
 }
diff --git a/modeldef.razorjack b/modeldef.razorjack
index cb97647..1615874 100644
--- a/modeldef.razorjack
+++ b/modeldef.razorjack
@@ -4,7 +4,7 @@ Model "RazorAmmo"
 	Model 0 "RazorAmmoMesh_d.3d"
 	Skin 0 "JPickup21.png"
 	ZOffset 5
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 
 	FrameIndex BHOP A 0 0
 	FrameIndex BHOP B 0 1
@@ -19,7 +19,7 @@ Model "RazorBlade"
 	USEACTORROLL
 	ROTATING
 	AngleOffset 90
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 
 	Rotation-Speed 15
 	FrameIndex RAZB A 0 0
@@ -40,7 +40,7 @@ Model "RazorBladeTrail"
 	USEACTORPITCH
 	USEACTORROLL
 	AngleOffset 90
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 
 	FrameIndex RAZB A 0 0
 }
@@ -53,11 +53,11 @@ Model "Razorjack"
 	RollOffset -8
 	AngleOffset 90
 	ZOffset 2
-	Scale 0.05 -0.05 0.06
+	Scale 0.05 -0.05 0.05
 
 	FrameIndex RZRP B 1 0
 
-	ZOffset 13
+	ZOffset 11
 	ROTATING
 	FrameIndex RZRP A 1 0
 }
diff --git a/modeldef.rifle b/modeldef.rifle
index 9536c88..a18b64d 100644
--- a/modeldef.rifle
+++ b/modeldef.rifle
@@ -3,8 +3,8 @@ Model "URifleAmmo"
 	Path "models"
 	Model 0 "RifleBullets_d.3d"
 	Skin 0 "RifleBul1.png"
-	Scale 0.05 0.05 0.06
-	ZOffset 9.5
+	Scale 0.05 0.05 0.05
+	ZOffset 8
 
 	FrameIndex SBOX A 0 0
 }
@@ -14,8 +14,8 @@ Model "URifleAmmo2"
 	Path "models"
 	Model 0 "RifleRoundM_d.3d"
 	Skin 0 "RifleR1.png"
-	Scale 0.04 0.04 0.048
-	ZOffset 8
+	Scale 0.04 0.04 0.04
+	ZOffset 7
 
 	FrameIndex SRND A 0 0
 }
@@ -25,13 +25,13 @@ Model "URifle"
 	Path "models"
 	Model 1 "RiPick_d.3d"
 	Skin 1 "JRifle1_.png"
-	Scale 0.12 0.12 0.144
+	Scale 0.12 0.12 0.12
 	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.stinger b/modeldef.stinger
index 6310eac..4fc2f95 100644
--- a/modeldef.stinger
+++ b/modeldef.stinger
@@ -5,7 +5,7 @@ Model "Stinger"
 	Skin 1 "Sting1_.png"
 	Offset -3 3 2
 	AngleOffset -90
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 
 	FrameIndex STNP B 1 0
 
@@ -19,7 +19,7 @@ Model "StingerAmmo"
 	Path "models"
 	Model 0 "TarydiumPickup_d.3d"
 	Skin 0 "JTaryPick1_.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	ZOffset 1
 
 	FrameIndex SAMO A 0 0
@@ -30,8 +30,8 @@ Model "StingerAmmo2"
 	Path "models"
 	Model 0 "TarydiumLarge_d.3d"
 	Skin 0 "JTaryPick1_.png"
-	Scale 0.04 0.04 0.048
-	ZOffset 3
+	Scale 0.04 0.04 0.04
+	ZOffset 2.5
 
 	FrameIndex SAMO B 0 0
 }
@@ -41,7 +41,7 @@ Model "StingerProjectile"
 	Path "models"
 	Model 0 "TarydiumProjectile_d.3d"
 	Skin 0 "JTaryPick1.png"
-	Scale 0.03 0.03 0.036
+	Scale 0.03 0.03 0.03
 	AngleOffset -90
 	PITCHFROMMOMENTUM
 	USEACTORROLL
@@ -54,7 +54,7 @@ Model "StingerChunk"
 	Path "models"
 	Model 0 "burstx_d.3d"
 	Skin 0 "JBurst1.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -73,7 +73,7 @@ Model "ViewStingerChunk"
 	Path "models"
 	Model 0 "burstx_d.3d"
 	Skin 0 "JBurst1.png"
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 	USEACTORPITCH
 	USEACTORROLL
 
diff --git a/modeldef.stunner b/modeldef.stunner
index fa7f4bb..95be022 100644
--- a/modeldef.stunner
+++ b/modeldef.stunner
@@ -3,7 +3,7 @@ Model "Stunner"
 	Path "models"
 	Model 1 "StunnerPickup_d.3d"
 	Skin 1 "Stunner_.png"
-	Scale -0.04 0.04 0.048
+	Scale -0.04 0.04 0.04
 	ZOffset 1.5
 
 	FrameIndex STNP B 1 0
diff --git a/modeldef.ubiorifle b/modeldef.ubiorifle
index fb322fa..3949fda 100644
--- a/modeldef.ubiorifle
+++ b/modeldef.ubiorifle
@@ -3,8 +3,8 @@ Model "UBioAmmo"
 	Path "models"
 	Model 0 "sludgemesh_d.3d"
 	Skin 0 "JPickup1.png"
-	Scale 0.08 -0.08 0.096
-	ZOffset 7
+	Scale 0.08 -0.08 0.08
+	ZOffset 6
 
 	FrameIndex BIOA A 0 0
 	FrameIndex BIOA B 0 1
@@ -42,7 +42,7 @@ Model "UBioAmmo2"
 	Path "models"
 	Model 0 "sludgemeshsmall_d.3d"
 	Skin 0 "JPickup1.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	ZOffset 1
 
 	FrameIndex BIOA A 0 0
@@ -63,7 +63,7 @@ Model "UBioGel"
 	Path "models"
 	Model 0 "BioRGel_d.3d"
 	Skin 0 "Jflare.png"
-	Scale 0.12 0.1 0.1
+	Scale 0.1 0.1 0.1
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -135,7 +135,7 @@ Model "UBioSplash"
 	Path "models"
 	Model 0 "BioRGel_d.3d"
 	Skin 0 "Jflare.png"
-	Scale 0.12 0.1 0.1
+	Scale 0.1 0.1 0.1
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -207,7 +207,7 @@ Model "UBioGlob"
 	Path "models"
 	Model 0 "BioRGel_d.3d"
 	Skin 0 "Jflare.png"
-	Scale 0.12 0.1 0.1
+	Scale 0.1 0.1 0.1
 	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
@@ -279,7 +279,7 @@ Model "UBioRifle"
 	Path "models"
 	Model 1 "BRiflePick_d.3d"
 	Skin 1 "JBRifle1_.png"
-	Scale 0.2 -0.2 0.24
+	Scale 0.2 -0.2 0.2
 	AngleOffset 180
 	ZOffset 0
 
diff --git a/modeldef.uflak b/modeldef.uflak
index b6fddd7..15f86a1 100644
--- a/modeldef.uflak
+++ b/modeldef.uflak
@@ -3,8 +3,8 @@ Model "UFlakBox"
 	Path "models"
 	Model 0 "flakboxMesh_d.3d"
 	Skin 0 "JPickup1.png"
-	Scale 0.09 0.09 0.108
-	ZOffset 6
+	Scale 0.09 0.09 0.09
+	ZOffset 5
 	RollOffset 180
 
 	FrameIndex FAMO A 0 0
@@ -15,8 +15,8 @@ Model "UFlakAmmo"
 	Path "models"
 	Model 0 "FlakSh_d.3d"
 	Skin 0 "Jflakshel1_.png"
-	Scale 0.2 0.24 0.2
-	ZOffset 2.25
+	Scale 0.2 0.2 0.2
+	ZOffset 2
 	RollOffset -90
 
 	FrameIndex FAMO B 0 0
@@ -27,7 +27,7 @@ Model "UFlakChunk"
 	Path "models"
 	Model 0 "ChnkX_d.3d"
 	Skin 0 "Jflakshel1.png"
-	Scale 0.05 0.05 0.06
+	Scale 0.05 0.05 0.05
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -45,7 +45,7 @@ Model "UFlakSlug"
 	Path "models"
 	Model 0 "FlakSh_d.3d"
 	Skin 0 "Jflakshel1.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	AngleOffset 90
 	USEACTORPITCH
 
@@ -57,7 +57,7 @@ Model "UFlakMag"
 	Path "models"
 	Model 0 "FlakShSpent_d.3d"
 	Skin 0 "Jflakshel1.png"
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 	AngleOffset 90
 	ZOffset 1
 	USEACTORPITCH
@@ -73,13 +73,13 @@ Model "UFlakCannon"
 	Path "models"
 	Model 1 "FlakPick_d.3d"
 	Skin 1 "Jflak1_.png"
-	ZOffset 12
+	ZOffset 10
 	AngleOffset 90
-	Scale 0.12 0.12 0.134
+	Scale 0.12 0.12 0.12
 
 	FrameIndex FPCK B 1 0
 
-	ZOffset 13
+	ZOffset 11
 	ROTATING
 	FrameIndex FPCK A 1 0
 }
diff --git a/modeldef.uminigun b/modeldef.uminigun
index fe8699e..14fd9f5 100644
--- a/modeldef.uminigun
+++ b/modeldef.uminigun
@@ -3,9 +3,9 @@ Model "UMiniAmmo"
 	Path "models"
 	Model 0 "ShellBoxMesh_d.3d"
 	Skin 0 "JPickup21.png"
-	ZOffset 6
+	ZOffset 5
 	AngleOffset 180
-	Scale 0.2 0.2 0.24
+	Scale 0.2 0.2 0.2
 
 	FrameIndex MAMO A 0 0
 }
@@ -15,13 +15,13 @@ Model "UMinigun"
 	Path "models"
 	Model 1 "minipick_d.3d"
 	Skin 1 "minigun1_.png"
-	ZOffset 6
+	ZOffset 5
 	AngleOffset -90
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 
 	FrameIndex MGNP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex MGNP A 1 0
 }
diff --git a/modeldef.umisc b/modeldef.umisc
index 7c98c54..2998865 100644
--- a/modeldef.umisc
+++ b/modeldef.umisc
@@ -3,8 +3,8 @@ Model "UnrealBackpack"
 	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
 
@@ -16,7 +16,7 @@ Model "UTranslator"
 	Path "models"
 	Model 0 "TranslatorMesh_d.3d"
 	Skin 0 "JTranslator1.png"
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 	ZOffset 4
 
 	FrameIndex TRNS A 0 0
@@ -27,9 +27,9 @@ Model "UArmor"
 	Path "models"
 	Model 0 "ArmorM_d.3d"
 	Skin 0 "Jarmor1.png"
-	ZOffset 9
+	ZOffset 8
 	AngleOffset -90
-	Scale 0.07 -0.07 0.084
+	Scale 0.07 -0.07 0.07
 
 	FrameIndex UARM A 0 0
 }
@@ -42,7 +42,7 @@ Model "AsbestosSuit"
 	RollOffset 90
 	AngleOffset -90
 	ZOffset 17
-	Scale 0.096 -0.08 0.08
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex ASBS A 0 0
 }
@@ -55,7 +55,7 @@ Model "ToxinSuit"
 	RollOffset 90
 	AngleOffset -90
 	ZOffset 17
-	Scale 0.096 -0.08 0.08
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex TOXS A 0 0
 }
@@ -67,7 +67,7 @@ Model "KevlarSuit"
 	Skin 0 "AkevSuit1.png"
 	AngleOffset -90
 	ZOffset 5
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex KEVS A 0 0
 }
@@ -79,7 +79,7 @@ Model "ShieldBelt"
 	Skin 0 "Abelt1.png"
 	AngleOffset 90
 	ZOffset 2
-	Scale 0.05 -0.05 0.06
+	Scale 0.05 -0.05 0.05
 
 	FrameIndex BELT A 0 0
 }
@@ -91,7 +91,7 @@ Model "PowerShield"
 	Skin 0 "Apbelt1.png"
 	AngleOffset 90
 	ZOffset 2
-	Scale 0.05 -0.05 0.06
+	Scale 0.05 -0.05 0.05
 
 	FrameIndex BELT A 0 0
 }
@@ -101,8 +101,8 @@ Model "VoiceBox"
 	Path "models"
 	Model 0 "VoiceBoxMesh_d.3d"
 	Skin 0 "Ainv1_.png"
-	ZOffset 4
-	Scale 0.08 -0.08 0.096
+	ZOffset 3.5
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex VBOX A 0 0
 }
@@ -111,8 +111,8 @@ Model "VoiceBoxActive"
 	Path "models"
 	Model 0 "VoiceBoxMesh_d.3d"
 	Skin 0 "Ainv1.png"
-	ZOffset 4
-	Scale 0.08 -0.08 0.096
+	ZOffset 3.5
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex VBOX A 0 0
 	FrameIndex VBOX B 0 1
@@ -131,8 +131,8 @@ Model "Dampener"
 	Path "models"
 	Model 0 "DampenerM_d.3d"
 	Skin 0 "Ainv1.png"
-	ZOffset 6
-	Scale 0.06 -0.06 0.072
+	ZOffset 5
+	Scale 0.06 -0.06 0.06
 
 	FrameIndex DAMP A 0 0
 	FrameIndex DAMP B 0 1
@@ -151,8 +151,8 @@ Model "Forcefield"
 	Path "models"
 	Model 0 "ForceFieldPick_d.3d"
 	SurfaceSkin 0 1 "aforce1.png"
-	ZOffset 11
-	Scale 0.14 -0.14 0.168
+	ZOffset 9
+	Scale 0.14 -0.14 0.14
 
 	FrameIndex FFPK A 0 0
 }
@@ -162,8 +162,8 @@ Model "ForcefieldX"
 	Path "models"
 	Model 0 "ForceFieldPick_d.3d"
 	SurfaceSkin 0 0 "ForceF.png"
-	ZOffset 11
-	Scale 0.14 -0.14 0.168
+	ZOffset 9
+	Scale 0.14 -0.14 0.14
 	DONTCULLBACKFACES
 
 	FrameIndex FFPK A 0 0
@@ -195,8 +195,8 @@ Model "UInvisibility"
 	Path "models"
 	Model 0 "InvisibilityMesh_d.3d"
 	SurfaceSkin 0 1 "JInvisibility1.png"
-	ZOffset 8
-	Scale 0.1 -0.1 0.12
+	ZOffset 7
+	Scale 0.1 -0.1 0.1
 
 	FrameIndex INVS A 0 0
 }
@@ -206,8 +206,8 @@ Model "UInvisibilityX"
 	Path "models"
 	Model 0 "InvisibilityMesh_d.3d"
 	SurfaceSkin 0 0 "InvisFX.png"
-	ZOffset 8
-	Scale 0.1 -0.1 0.12
+	ZOffset 7
+	Scale 0.1 -0.1 0.1
 	DONTCULLBACKFACES
 
 	FrameIndex INVS A 0 0
@@ -218,9 +218,9 @@ Model "Amplifier"
 	Path "models"
 	Model 0 "AmplifierM_d.3d"
 	Skin 0 "JAmplifier1.png"
-	ZOffset 3
+	ZOffset 2.5
 	AngleOffset 90
-	Scale 0.16 -0.16 0.192
+	Scale 0.16 -0.16 0.16
 
 	FrameIndex AMPP A 0 0
 }
@@ -230,8 +230,8 @@ Model "UHealth"
 	Path "models"
 	Model 0 "HealthM_d.3d"
 	Skin 0 "Jhealth1.png"
-	ZOffset 3
-	Scale 0.04 -0.04 0.048
+	ZOffset 2.5
+	Scale 0.04 -0.04 0.04
 
 	FrameIndex HLTH A 0 0
 }
@@ -241,8 +241,8 @@ Model "Bandages"
 	Path "models"
 	Model 0 "bandage_d.3d"
 	Skin 0 "Jband1.png"
-	ZOffset 2.2
-	Scale 0.06 -0.06 0.072
+	ZOffset 2
+	Scale 0.06 -0.06 0.06
 
 	FrameIndex BAND A 0 0
 }
@@ -252,9 +252,9 @@ Model "SuperHealth"
 	Path "models"
 	Model 0 "SuperHealthMesh_d.3d"
 	SurfaceSkin 0 1 "Jshealth1.png"
-	ZOffset 10
+	ZOffset 8
 	RollOffset 180
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex SHTH A 0 0
 }
@@ -264,9 +264,9 @@ Model "SuperHealthX"
 	Path "models"
 	Model 0 "SuperHealthMesh_d.3d"
 	SurfaceSkin 0 0 "SHealthFX.png"
-	ZOffset 10
+	ZOffset 8
 	RollOffset 180
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex SHTH A 0 0
 }
@@ -277,7 +277,7 @@ Model "NaliFruit"
 	Model 0 "NaliFruitMesh_d.3d"
 	Skin 0 "JNaliFruit1.png"
 	ZOffset 0
-	Scale 0.3 -0.3 0.36
+	Scale 0.3 -0.3 0.3
 
 	// root
 	FrameIndex FRUT A 0 1
@@ -318,7 +318,7 @@ Model "Seeds"
 	Model 0 "Seed_d.3d"
 	Skin 0 "Jseed1.png"
 	ZOffset 1
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 
 	FrameIndex SEED A 0 0
 }
@@ -329,7 +329,7 @@ Model "SeedProj"
 	Model 0 "Seed_d.3d"
 	Skin 0 "Jseed1.png"
 	ZOffset 1
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 	USEACTORPITCH
 
 	FrameIndex SEED A 0 0
@@ -343,7 +343,7 @@ Model "Flare"
 	Offset 4 0 2
 	PitchOffset 90
 	AngleOffset 180
-	Scale 0.04 -0.048 0.04
+	Scale 0.04 -0.04 0.04
 
 	FrameIndex FLAR A 0 0
 }
@@ -356,7 +356,7 @@ Model "FlareThrown"
 	Offset 4 0 2
 	PitchOffset 90
 	AngleOffset 180
-	Scale 0.04 -0.048 0.04
+	Scale 0.04 -0.04 0.04
 	USEACTORPITCH
 	USEROTATIONCENTER
 	Rotation-Center 0 0 1
@@ -372,7 +372,7 @@ Model "FlareThrownX"
 	Offset 3.5 0 2
 	PitchOffset 90
 	AngleOffset 180
-	Scale 0.08 -0.048 0.04
+	Scale 0.08 -0.04 0.04
 	USEACTORPITCH
 	DONTCULLBACKFACES
 	USEROTATIONCENTER
@@ -388,7 +388,7 @@ Model "LightFlareThrown"
 	SurfaceSkin 0 0 "Jflare.png"
 	AngleOffset -90
 	Offset 4 0 1
-	Scale 0.1 -0.1 0.12
+	Scale 0.1 -0.1 0.1
 	USEACTORPITCH
 	USEROTATIONCENTER
 	Rotation-Center 0 0 1
@@ -402,7 +402,7 @@ Model "DarkFlareThrown"
 	SurfaceSkin 0 0 "Jflare.png"
 	AngleOffset -90
 	Offset 4 0 1
-	Scale 0.1 -0.1 0.12
+	Scale 0.1 -0.1 0.1
 	USEACTORPITCH
 	USEROTATIONCENTER
 	Rotation-Center 0 0 1
@@ -415,9 +415,9 @@ Model "UJumpBoots"
 	Path "models"
 	Model 0 "lboot_d.3d"
 	Skin 0 "Jlboot1.png"
-	Scale 0.06 0.06 0.072
+	Scale 0.06 0.06 0.06
 	AngleOffset 180
-	ZOffset 6
+	ZOffset 5
 
 	FrameIndex JBUT A 0 0
 }
@@ -427,7 +427,7 @@ Model "UFlashlight"
 	Path "models"
 	Model 0 "Flashl_d.3d"
 	Skin 0 "JFlashl1.png"
-	Scale 0.04 0.04 0.048
+	Scale 0.04 0.04 0.04
 	AngleOffset 180
 	ZOffset 2
 
@@ -439,9 +439,9 @@ Model "USearchlight"
 	Path "models"
 	Model 0 "BigFlash_d.3d"
 	Skin 0 "JBigFlash1.png"
-	Scale 0.07 0.07 0.084
+	Scale 0.07 0.07 0.07
 	AngleOffset -90
-	ZOffset 9
+	ZOffset 8
 
 	FrameIndex SLIT A 0 0
 }
@@ -453,8 +453,8 @@ Model "SentryItem"
 	SurfaceSkin 0 0 "Minigun_.png"
 	SurfaceSkin 0 1 "minigun1_.png"
 	SurfaceSkin 0 2 "JRifle1_.png"
-	Scale 0.15 0.15 0.18
-	ZOffset 38
+	Scale 0.15 0.15 0.15
+	ZOffset 32
 
 	FrameIndex SENT A 0 0
 }
@@ -465,7 +465,7 @@ Model "MinigunSentry"
 	Model 0 "SentryGun_d.3d"
 	SurfaceSkin 0 1 "Minigun.png"
 	SurfaceSkin 0 2 "minigun1.png"
-	Scale 0.15 0.15 0.18
+	Scale 0.15 0.15 0.15
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -552,7 +552,7 @@ Model "MinigunSentryX"
 	Path "models"
 	Model 0 "SentryGun_d.3d"
 	SurfaceSkin 0 0 "JRifle1.png"
-	Scale 0.15 0.15 0.18
+	Scale 0.15 0.15 0.15
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -569,7 +569,7 @@ Model "SentryFragment"
 	Path "models"
 	Model 0 "sfrag_d.3d"
 	Skin 0 "Minigun.png"
-	Scale 0.1 0.1 0.12
+	Scale 0.1 0.1 0.1
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -588,8 +588,8 @@ Model "MinigunSentryBase"
 	SurfaceSkin 0 0 "Minigun.png"
 	SurfaceSkin 0 1 "minigun1.png"
 	SurfaceSkin 0 2 "JRifle1.png"
-	Scale 0.15 0.15 0.18
-	ZOffset 38
+	Scale 0.15 0.15 0.15
+	ZOffset 32
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -678,8 +678,8 @@ Model "SentryGunItem"
 	Model 0 "SentryM_d.3d"
 	SurfaceSkin 0 1 "JSentry1_.png"
 	AngleOffset -90
-	Scale 0.12 0.12 0.144
-	ZOffset 16
+	Scale 0.12 0.12 0.12
+	ZOffset 14
 
 	FrameIndex SENT A 0 0
 }
@@ -690,8 +690,8 @@ Model "SentryGunX"
 	Model 0 "SentryM_d.3d"
 	SurfaceSkin 0 0 "JSentry1.png"
 	AngleOffset -90
-	Scale 0.12 0.12 0.144
-	ZOffset 16
+	Scale 0.12 0.12 0.12
+	ZOffset 14
 	DONTCULLBACKFACES
 
 	FrameIndex SENF A 0 20
@@ -704,8 +704,8 @@ Model "SentryGun"
 	Model 0 "SentryM_d.3d"
 	SurfaceSkin 0 1 "JSentry1.png"
 	AngleOffset -90
-	Scale 0.12 0.12 0.144
-	ZOffset 16
+	Scale 0.12 0.12 0.12
+	ZOffset 14
 
 	// Spawn
 	FrameIndex SENT A 0 0
@@ -768,9 +768,9 @@ Model "MotionDetector"
 	Path "models"
 	Model 0 "DetectorMesh_d.3d"
 	Skin 0 "JDetector.png"
-	Scale 0.08 -0.08 0.096
+	Scale 0.08 -0.08 0.08
 	PitchOffset 3
-	ZOffset 4
+	ZOffset 3
 
 	FrameIndex MDET A 0 0
 }
@@ -780,9 +780,9 @@ Model "SCUBAGear"
 	Path "models"
 	Model 0 "Scuba_d.3d"
 	Skin 0 "ASC1.png"
-	Scale 0.08 0.08 0.096
+	Scale 0.08 0.08 0.08
 	AngleOffset -90
-	ZOffset 11
+	ZOffset 9
 
 	FrameIndex SCUB A 0 0
 }
@@ -792,7 +792,7 @@ Model "UArmorBonus"
 	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
@@ -804,8 +804,8 @@ Model "UAllMap"
 	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"
diff --git a/modeldef.utranslocator b/modeldef.utranslocator
index e608893..5890d07 100644
--- a/modeldef.utranslocator
+++ b/modeldef.utranslocator
@@ -3,9 +3,9 @@ Model "UTranslocatorModule"
 	Path "models"
 	Model 0 "TeleportProj_d.3d"
 	Skin 0 "Ahand1.png"
-	Scale 0.03 0.03 0.036
+	Scale 0.03 0.03 0.03
 	AngleOffset 180
-	ZOffset 3
+	ZOffset 2.5
 
 	FrameIndex TMOD A 0 0
 }
@@ -15,13 +15,13 @@ Model "UTranslocator"
 	Path "models"
 	Model 1 "TelePickup_d.3d"
 	Skin 1 "Ahand1_.png"
-	Scale 0.04 -0.04 0.048
+	Scale 0.04 -0.04 0.04
 	AngleOffset 90
-	ZOffset 6
+	ZOffset 5
 
 	FrameIndex TLCP B 1 0
 
-	ZOffset 12
+	ZOffset 10
 	ROTATING
 	FrameIndex TLCP A 1 0
 }
diff --git a/zscript/miscitems.zsc b/zscript/miscitems.zsc
index 488e37e..b6b73b9 100644
--- a/zscript/miscitems.zsc
+++ b/zscript/miscitems.zsc
@@ -1714,7 +1714,7 @@ Class MinigunSentry : Actor
 		}
 		Vector3 x, y, z;
 		[x, y, z] = dt_CoordUtil.GetAxes(master.pitch,master.angle,master.roll);
-		SetOrigin(level.Vec3Offset(master.pos,z*38),true);
+		SetOrigin(level.Vec3Offset(master.pos,z*32),true);
 	}
 	double _PitchTo( Actor other )
 	{
@@ -2111,7 +2111,7 @@ Class MinigunSentryBase : Actor
 		Health sentryhealth;
 		Mass int.max;
 		Radius 8;
-		Height 46;
+		Height 35;
 		+SOLID;
 		+SHOOTABLE;
 		+NOBLOOD;
@@ -2406,7 +2406,7 @@ Class SentryGun : Actor
 		Health 50;
 		Mass int.max;
 		Radius 6;
-		Height 18;
+		Height 15;
 		+SOLID;
 		+SHOOTABLE;
 		+NOBLOOD;