From c139819575f376aa06430b497410fa4591ba6256 Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Wed, 20 May 2026 14:49:42 -0700 Subject: [PATCH] Fixed skin parsing issues. --- e3/skins/a_smalldoor_02.skin | 4 +++- e3/skins/cpudesk1a.skin | 4 +++- e3/skins/player/machinegun.skin | 14 ++++++++------ e3/skins/player/nowep.skin | 10 ++++++---- e3/skins/player/pistol.skin | 12 +++++++----- e3/skins/player/plasmagun.skin | 24 +++++++++++++----------- e3/skins/security/dface.skin | 22 ++++++++++++---------- e3/skins/security/face1nhelmet.skin | 24 +++++++++++++----------- e3/skins/security/face2.skin | 20 +++++++++++--------- e3/skins/security/face2blood.skin | 24 +++++++++++++----------- e3/skins/skceilingdiscred.skin | 4 +++- e3/skins/skcubered.skin | 6 ++++-- e3/skins/skcubeyellow.skin | 6 ++++-- e3/skins/smalldoorblue.skin | 6 ++++-- e3/skins/techdr1rt_blu.skin | 4 +++- e3/skins/techdr2lft_blu.skin | 4 +++- e3/skins/techdr2rt_blu.skin | 4 +++- e3/skins/teleporter/nobs.skin | 4 +++- e3/skins/teleporter/none.skin | 8 +++++--- e3/skins/uacmarine/machinegun.skin | 12 +++++++----- e3/skins/zcc/muzzle_flash.skin | 6 ++++-- 21 files changed, 132 insertions(+), 90 deletions(-) diff --git a/e3/skins/a_smalldoor_02.skin b/e3/skins/a_smalldoor_02.skin index c8bbb55b..ddf6007c 100644 --- a/e3/skins/a_smalldoor_02.skin +++ b/e3/skins/a_smalldoor_02.skin @@ -1,3 +1,5 @@ -models/mapobjects/doors/smalldoor.lwo models/mapobjects/doors/a_smalldoor_02.lwo +skin skins/a_smalldoor_02.skin { + models/mapobjects/doors/smalldoor.lwo models/mapobjects/doors/a_smalldoor_02.lwo +} diff --git a/e3/skins/cpudesk1a.skin b/e3/skins/cpudesk1a.skin index e8e57ef4..d643ecc2 100644 --- a/e3/skins/cpudesk1a.skin +++ b/e3/skins/cpudesk1a.skin @@ -1 +1,3 @@ -models/mapobjects/cpu/cpudesk1 models/mapobjects/cpu/cpudesk1a \ No newline at end of file +skin skins/cpudesk1a.skin { + models/mapobjects/cpu/cpudesk1 models/mapobjects/cpu/cpudesk1a +} diff --git a/e3/skins/player/machinegun.skin b/e3/skins/player/machinegun.skin index e70b2bbc..79ee32e0 100644 --- a/e3/skins/player/machinegun.skin +++ b/e3/skins/player/machinegun.skin @@ -1,7 +1,9 @@ -models/weapons/mflash/f_machinegun textures/common/nodraw -models/weapons/pistol/pistol textures/common/nodraw -models/characters/scientist/head02/scihead02 textures/common/nodraw -models/characters/scientist/head02/hair textures/common/nodraw -models/characters/sarge2/teeth/teeth textures/common/nodraw -models/monsters/zombie/zombie01/eyes/brown textures/common/nodraw +skin skins/player/machinegun.skin { + models/weapons/mflash/f_machinegun textures/common/nodraw + models/weapons/pistol/pistol textures/common/nodraw + models/characters/scientist/head02/scihead02 textures/common/nodraw + models/characters/scientist/head02/hair textures/common/nodraw + models/characters/sarge2/teeth/teeth textures/common/nodraw + models/monsters/zombie/zombie01/eyes/brown textures/common/nodraw +} diff --git a/e3/skins/player/nowep.skin b/e3/skins/player/nowep.skin index f9824375..35f2d7d8 100644 --- a/e3/skins/player/nowep.skin +++ b/e3/skins/player/nowep.skin @@ -1,5 +1,7 @@ -models/weapons/mflash/f_machinegun textures/common/nodraw -models/weapons/pistol/pistol textures/common/nodraw -models/weapons/machinegun/machinegun textures/common/nodraw -models/weapons/machinegun/m_gui.tga textures/common/nodraw +skin skins/player/nowep.skin { + models/weapons/mflash/f_machinegun textures/common/nodraw + models/weapons/pistol/pistol textures/common/nodraw + models/weapons/machinegun/machinegun textures/common/nodraw + models/weapons/machinegun/m_gui.tga textures/common/nodraw +} diff --git a/e3/skins/player/pistol.skin b/e3/skins/player/pistol.skin index 85f3b422..562b3cc8 100644 --- a/e3/skins/player/pistol.skin +++ b/e3/skins/player/pistol.skin @@ -1,7 +1,9 @@ -models/weapons/machinegun/machinegun textures/common/nodraw -models/weapons/machinegun/m_gui.tga textures/common/nodraw -models/characters/player/playerhead textures/common/nodraw -models/characters/sarge2/teeth/teeth textures/common/nodraw -models/characters/player/eyes textures/common/nodraw +skin skins/player/pistol.skin { + models/weapons/machinegun/machinegun textures/common/nodraw + models/weapons/machinegun/m_gui.tga textures/common/nodraw + models/characters/player/playerhead textures/common/nodraw + models/characters/sarge2/teeth/teeth textures/common/nodraw + models/characters/player/eyes textures/common/nodraw +} diff --git a/e3/skins/player/plasmagun.skin b/e3/skins/player/plasmagun.skin index edcfc633..fa847e71 100644 --- a/e3/skins/player/plasmagun.skin +++ b/e3/skins/player/plasmagun.skin @@ -1,13 +1,15 @@ -models/weapons/machinegun/machinegun textures/common/nodraw -models/weapons/machinegun/m_gui.tga textures/common/nodraw -models/weapons/shotgun/shotgun textures/common/nodraw -models/weapons/shotgun/shotgui textures/common/nodraw -models/weapons/shotgun/gui textures/common/nodraw -models/weapons/mflash/f_shotgun1 textures/common/nodraw -models/weapons/mflash/f_machinegun textures/common/nodraw -models/weapons/mflash/f_pistol1 textures/common/nodraw -models/weapons/shell1/sshell textures/common/nodraw -models/weapons/mflash/f_machinegun textures/common/nodraw -models/weapons/pistol/pistol textures/common/nodraw +skin skins/player/plasmagun.skin { + models/weapons/machinegun/machinegun textures/common/nodraw + models/weapons/machinegun/m_gui.tga textures/common/nodraw + models/weapons/shotgun/shotgun textures/common/nodraw + models/weapons/shotgun/shotgui textures/common/nodraw + models/weapons/shotgun/gui textures/common/nodraw + models/weapons/mflash/f_shotgun1 textures/common/nodraw + models/weapons/mflash/f_machinegun textures/common/nodraw + models/weapons/mflash/f_pistol1 textures/common/nodraw + models/weapons/shell1/sshell textures/common/nodraw + models/weapons/mflash/f_machinegun textures/common/nodraw + models/weapons/pistol/pistol textures/common/nodraw +} diff --git a/e3/skins/security/dface.skin b/e3/skins/security/dface.skin index 448f0259..6ed88892 100644 --- a/e3/skins/security/dface.skin +++ b/e3/skins/security/dface.skin @@ -1,16 +1,18 @@ -models/monsters/zsecurity/zsechead3 models/monsters/zsecurity/dzsechead3 -models/monsters/zsecurity/zsechead2 textures/common/nodraw -models/monsters/zsecurity/zsheild_glass textures/common/nodraw -models/monsters/zsecurity/zsheild textures/common/nodraw -models/characters/scientist/head02/scihead02 textures/common/nodraw -models/characters/scientist/head02/hair textures/common/nodraw +skin skins/security/dface.skin { + models/monsters/zsecurity/zsechead3 models/monsters/zsecurity/dzsechead3 + models/monsters/zsecurity/zsechead2 textures/common/nodraw + models/monsters/zsecurity/zsheild_glass textures/common/nodraw + models/monsters/zsecurity/zsheild textures/common/nodraw + models/characters/scientist/head02/scihead02 textures/common/nodraw + models/characters/scientist/head02/hair textures/common/nodraw -models/characters/common/leftbrown textures/common/nodraw -models/characters/common/righttbrown textures/common/nodraw + models/characters/common/leftbrown textures/common/nodraw + models/characters/common/righttbrown textures/common/nodraw -models/weapons/pistol/w_pistol.tga textures/common/nodraw -models/characters/sarge2/teeth/teeth2.tga textures/common/nodraw + models/weapons/pistol/w_pistol.tga textures/common/nodraw + models/characters/sarge2/teeth/teeth2.tga textures/common/nodraw +} diff --git a/e3/skins/security/face1nhelmet.skin b/e3/skins/security/face1nhelmet.skin index 6f0f2042..13c74a6e 100644 --- a/e3/skins/security/face1nhelmet.skin +++ b/e3/skins/security/face1nhelmet.skin @@ -1,15 +1,17 @@ -models/monsters/zsecurity/zsechead3 textures/common/nodraw -models/monsters/zsecurity/zsheild_glass textures/common/nodraw -models/monsters/zsecurity/zsheild textures/common/nodraw -models/weapons/pistol/w_pistol.tga textures/common/nodraw -models/characters/sarge2/teeth/teeth3.tga textures/common/nodraw -models/monsters/zsecurity/marsec.tga textures/common/nodraw -models/monsters/zsecurity/zsgogs.tga textures/common/nodraw -models/monsters/zsecurity/zsgogs2.tga textures/common/nodraw +skin skins/security/face1nhelmet.skin { + models/monsters/zsecurity/zsechead3 textures/common/nodraw + models/monsters/zsecurity/zsheild_glass textures/common/nodraw + models/monsters/zsecurity/zsheild textures/common/nodraw + models/weapons/pistol/w_pistol.tga textures/common/nodraw + models/characters/sarge2/teeth/teeth3.tga textures/common/nodraw + models/monsters/zsecurity/marsec.tga textures/common/nodraw + models/monsters/zsecurity/zsgogs.tga textures/common/nodraw + models/monsters/zsecurity/zsgogs2.tga textures/common/nodraw -models/characters/common/leftblue.tga textures/common/nodraw -models/characters/common/rightblue.tga textures/common/nodraw + models/characters/common/leftblue.tga textures/common/nodraw + models/characters/common/rightblue.tga textures/common/nodraw -models/monsters/hellknight/tongue.tga textures/common/nodraw + models/monsters/hellknight/tongue.tga textures/common/nodraw +} diff --git a/e3/skins/security/face2.skin b/e3/skins/security/face2.skin index b145aad5..859ca82e 100644 --- a/e3/skins/security/face2.skin +++ b/e3/skins/security/face2.skin @@ -1,16 +1,18 @@ -models/monsters/zsecurity/zsechead2 textures/common/nodraw -models/monsters/zsecurity/zsheild_glass textures/common/nodraw -models/monsters/zsecurity/zsheild textures/common/nodraw -models/characters/scientist/head02/scihead02 textures/common/nodraw -models/characters/scientist/head02/hair textures/common/nodraw +skin skins/security/face2.skin { + models/monsters/zsecurity/zsechead2 textures/common/nodraw + models/monsters/zsecurity/zsheild_glass textures/common/nodraw + models/monsters/zsecurity/zsheild textures/common/nodraw + models/characters/scientist/head02/scihead02 textures/common/nodraw + models/characters/scientist/head02/hair textures/common/nodraw -models/characters/common/leftbrown textures/common/nodraw -models/characters/common/rightbrown textures/common/nodraw + models/characters/common/leftbrown textures/common/nodraw + models/characters/common/rightbrown textures/common/nodraw -models/weapons/pistol/w_pistol.tga textures/common/nodraw -models/characters/sarge2/teeth/teeth2.tga textures/common/nodraw + models/weapons/pistol/w_pistol.tga textures/common/nodraw + models/characters/sarge2/teeth/teeth2.tga textures/common/nodraw +} diff --git a/e3/skins/security/face2blood.skin b/e3/skins/security/face2blood.skin index 78ad9fc1..10775066 100644 --- a/e3/skins/security/face2blood.skin +++ b/e3/skins/security/face2blood.skin @@ -1,18 +1,20 @@ -models/monsters/zsecurity/zsechead3 models/monsters/zsecurity/dzsechead3 -models/monsters/zsecurity/zsechead2 textures/common/nodraw -models/monsters/zsecurity/zsheild_glass textures/common/nodraw -models/monsters/zsecurity/zsheild textures/common/nodraw -models/characters/scientist/head02/scihead02 textures/common/nodraw -models/characters/scientist/head02/hair textures/common/nodraw +skin skins/security/face2blood.skin { + models/monsters/zsecurity/zsechead3 models/monsters/zsecurity/dzsechead3 + models/monsters/zsecurity/zsechead2 textures/common/nodraw + models/monsters/zsecurity/zsheild_glass textures/common/nodraw + models/monsters/zsecurity/zsheild textures/common/nodraw + models/characters/scientist/head02/scihead02 textures/common/nodraw + models/characters/scientist/head02/hair textures/common/nodraw -models/characters/common/leftbrown textures/common/nodraw -models/characters/common/rightbrown textures/common/nodraw + models/characters/common/leftbrown textures/common/nodraw + models/characters/common/rightbrown textures/common/nodraw -models/weapons/pistol/w_pistol.tga textures/common/nodraw -models/characters/sarge2/teeth/teeth2.tga textures/common/nodraw -models/monsters/zsecurity/zsgogs2.tga models/monsters/zsecurity/zsgogs2bloody.tga + models/weapons/pistol/w_pistol.tga textures/common/nodraw + models/characters/sarge2/teeth/teeth2.tga textures/common/nodraw + models/monsters/zsecurity/zsgogs2.tga models/monsters/zsecurity/zsgogs2bloody.tga +} diff --git a/e3/skins/skceilingdiscred.skin b/e3/skins/skceilingdiscred.skin index 391816fe..33608123 100644 --- a/e3/skins/skceilingdiscred.skin +++ b/e3/skins/skceilingdiscred.skin @@ -1,3 +1,5 @@ -models/mapobjects/skmachines/skceilingdisc1 models/mapobjects/skmachines/skceilingdisc1red +skin skins/skceilingdiscred.skin { + models/mapobjects/skmachines/skceilingdisc1 models/mapobjects/skmachines/skceilingdisc1red +} diff --git a/e3/skins/skcubered.skin b/e3/skins/skcubered.skin index d2f3e4ea..79f98d80 100644 --- a/e3/skins/skcubered.skin +++ b/e3/skins/skcubered.skin @@ -1,4 +1,6 @@ -models/mapobjects/skmachines/skcube models/mapobjects/skmachines/skcubered -models/mapobjects/skmachines/skcube2 models/mapobjects/skmachines/skcube2 +skin skins/skcubered.skin { + models/mapobjects/skmachines/skcube models/mapobjects/skmachines/skcubered + models/mapobjects/skmachines/skcube2 models/mapobjects/skmachines/skcube2 +} diff --git a/e3/skins/skcubeyellow.skin b/e3/skins/skcubeyellow.skin index 71735553..7bbdb8f0 100644 --- a/e3/skins/skcubeyellow.skin +++ b/e3/skins/skcubeyellow.skin @@ -1,4 +1,6 @@ -models/mapobjects/skmachines/skcube models/mapobjects/skmachines/skcubeyellow -models/mapobjects/skmachines/skcube2 models/mapobjects/skmachines/skcube2 +skin skins/skcubeyellow.skin { + models/mapobjects/skmachines/skcube models/mapobjects/skmachines/skcubeyellow + models/mapobjects/skmachines/skcube2 models/mapobjects/skmachines/skcube2 +} diff --git a/e3/skins/smalldoorblue.skin b/e3/skins/smalldoorblue.skin index 48b23ae5..72a404b8 100644 --- a/e3/skins/smalldoorblue.skin +++ b/e3/skins/smalldoorblue.skin @@ -1,2 +1,4 @@ -models/mapobjects/doors/smalldoor_light models/mapobjects/doors/smalldoorblue_light -models/mapobjects/doors/smalldoor_sign models/mapobjects/doors/smalldoorblue_sign +skin skins/smalldoorblue.skin { + models/mapobjects/doors/smalldoor_light models/mapobjects/doors/smalldoorblue_light + models/mapobjects/doors/smalldoor_sign models/mapobjects/doors/smalldoorblue_sign +} diff --git a/e3/skins/techdr1rt_blu.skin b/e3/skins/techdr1rt_blu.skin index 7ec8cf33..647450f7 100644 --- a/e3/skins/techdr1rt_blu.skin +++ b/e3/skins/techdr1rt_blu.skin @@ -1 +1,3 @@ -models/mapobjects/doors/techdoor1/techdr1rt models/mapobjects/doors/techdoor1/techdr1rt_blu \ No newline at end of file +skin skins/techdr1rt_blu.skin { + models/mapobjects/doors/techdoor1/techdr1rt models/mapobjects/doors/techdoor1/techdr1rt_blu +} diff --git a/e3/skins/techdr2lft_blu.skin b/e3/skins/techdr2lft_blu.skin index 03a6fa2f..4c02c570 100644 --- a/e3/skins/techdr2lft_blu.skin +++ b/e3/skins/techdr2lft_blu.skin @@ -1 +1,3 @@ -models/mapobjects/doors/techdoor2/techdr2lft models/mapobjects/doors/techdoor2/techdr2lft_blu \ No newline at end of file +skin skins/techdr2lft_blu.skin { + models/mapobjects/doors/techdoor2/techdr2lft models/mapobjects/doors/techdoor2/techdr2lft_blu +} diff --git a/e3/skins/techdr2rt_blu.skin b/e3/skins/techdr2rt_blu.skin index abc69f62..c335157a 100644 --- a/e3/skins/techdr2rt_blu.skin +++ b/e3/skins/techdr2rt_blu.skin @@ -1 +1,3 @@ -models/mapobjects/doors/techdoor2/techdr2rt models/mapobjects/doors/techdoor2/techdr2rt_blu \ No newline at end of file +skin skins/techdr2rt_blu.skin { + models/mapobjects/doors/techdoor2/techdr2rt models/mapobjects/doors/techdoor2/techdr2rt_blu +} diff --git a/e3/skins/teleporter/nobs.skin b/e3/skins/teleporter/nobs.skin index ebaa3d38..f754e3cb 100644 --- a/e3/skins/teleporter/nobs.skin +++ b/e3/skins/teleporter/nobs.skin @@ -1 +1,3 @@ -models/mapobjects/teleporter/zot1 textures/common/nodraw +skin skins/teleporter/nobs.skin { + models/mapobjects/teleporter/zot1 textures/common/nodraw +} diff --git a/e3/skins/teleporter/none.skin b/e3/skins/teleporter/none.skin index 83f11060..040d38b9 100644 --- a/e3/skins/teleporter/none.skin +++ b/e3/skins/teleporter/none.skin @@ -1,3 +1,5 @@ -models/mapobjects/teleporter/nob1 textures/common/nodraw -models/mapobjects/teleporter/zot1 textures/common/nodraw -models/mapobjects/teleporter/redflare textures/common/nodraw +skin skins/teleporter/none.skin { + models/mapobjects/teleporter/nob1 textures/common/nodraw + models/mapobjects/teleporter/zot1 textures/common/nodraw + models/mapobjects/teleporter/redflare textures/common/nodraw +} diff --git a/e3/skins/uacmarine/machinegun.skin b/e3/skins/uacmarine/machinegun.skin index 7c0a8e7b..c97a57ac 100644 --- a/e3/skins/uacmarine/machinegun.skin +++ b/e3/skins/uacmarine/machinegun.skin @@ -1,8 +1,9 @@ -models/weapons/pistol/pistol textures/common/nodraw -models/characters/scientist/head02/scihead02 textures/common/nodraw -models/characters/scientist/head02/hair textures/common/nodraw -models/characters/sarge2/teeth/teeth textures/common/nodraw -models/monsters/zombie/zombie01/eyes/brown textures/common/nodraw +skin skins/uacmarine/machinegun.skin { + models/weapons/pistol/pistol textures/common/nodraw + models/characters/scientist/head02/scihead02 textures/common/nodraw + models/characters/scientist/head02/hair textures/common/nodraw + models/characters/sarge2/teeth/teeth textures/common/nodraw + models/monsters/zombie/zombie01/eyes/brown textures/common/nodraw @@ -10,3 +11,4 @@ models/monsters/zombie/zombie01/eyes/brown textures/common/nodraw +} diff --git a/e3/skins/zcc/muzzle_flash.skin b/e3/skins/zcc/muzzle_flash.skin index 458beadb..211399a7 100644 --- a/e3/skins/zcc/muzzle_flash.skin +++ b/e3/skins/zcc/muzzle_flash.skin @@ -1,6 +1,8 @@ -monsters/zombie/commando/cgun_mflash1 textures/common/nodraw -monsters/zombie/commando/cgun_mflash2 textures/common/nodraw +skin skins/zcc/muzzle_flash.skin { + monsters/zombie/commando/cgun_mflash1 textures/common/nodraw + monsters/zombie/commando/cgun_mflash2 textures/common/nodraw +}