Skip to content

Commit 5bafb12

Browse files
committed
1. changed welder emote
2. added requesting seal speech
1 parent 7e4862b commit 5bafb12

4 files changed

Lines changed: 13 additions & 3 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
UnlitGeneric
2+
{
3+
$basetexture "vgui\swarm\Emotes\EmoteWelder"
4+
$translucent 1
5+
$surfaceprop metal
6+
$vertexcolor 1
7+
$vertexalpha 1
8+
$no_fullbright 1
9+
$ignorez 1
10+
}
256 KB
Binary file not shown.

src/game/client/swarm/vgui/asw_hud_emotes.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class CASWHudEmotes : public CASW_HudElement, public vgui::Panel
7272
CPanelAnimationVarAliasType( int, m_nSentryUpTexture, "SentryUpTexture", "vgui/swarm/ClassIcons/SentryBuild", "textureid" );
7373
CPanelAnimationVarAliasType( int, m_nSentryDnTexture, "SentryDnTexture", "vgui/swarm/ClassIcons/SentryDismantle", "textureid" );
7474
CPanelAnimationVarAliasType( int, m_nHackTexture, "HackTexture", "vgui/swarm/ClassIcons/HackIcon", "textureid" );
75-
CPanelAnimationVarAliasType( int, m_nWeldTexture, "WeldTexture", "vgui/swarm/ClassIcons/WeldIcon", "textureid" );
75+
CPanelAnimationVarAliasType(int, m_nWeldTexture, "WeldTexture", "vgui/swarm/Emotes/EmoteWelder", "textureid");
7676
CPanelAnimationVarAliasType( int, m_nReviveMarineTexture, "ReviveMarineTexture", "vgui/swarm/ClassIcons/revivemarine", "textureid" );
7777

7878
// Traitors emotes
@@ -155,7 +155,7 @@ void CASWHudEmotes::PaintEmotesFor( C_ASW_Marine *pMarine )
155155
if ( pMarine->m_iClientEmote & ( 1 << 14 ) )
156156
PaintEmote( pMarine, pMarine->m_fEmoteThanksTime, m_nThanksTexture );
157157
if (pMarine->m_iClientEmote & (1 << 15) )
158-
PaintEmote(pMarine, pMarine->m_fEmoteWeldTime, m_nWeldTexture, 1.5f);
158+
PaintEmote(pMarine, pMarine->m_fEmoteWeldTime, m_nWeldTexture);
159159

160160
if (_rd_traitors_challenge_enabled.GetBool())
161161
{

src/game/server/swarm/asw_marine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4497,7 +4497,7 @@ void CASW_Marine::DoEmote( int iEmote )
44974497
GetMarineSpeech()->Chatter( CHATTER_THANKS );
44984498
break;
44994499
case 15:
4500-
// just request seal
4500+
GetMarineSpeech()->Chatter( CHATTER_REQUEST_SEAL_DOOR );
45014501
break;
45024502
default:
45034503
iEmote = 6;

0 commit comments

Comments
 (0)