Skip to content

added seal icon to radial menu "request seal" item #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 6 commits into from
Nov 4, 2025
Merged

added seal icon to radial menu "request seal" item #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e4862b
added seal icon to radial menu "request seal" item
hpdodger Sep 1, 2025
5bafb12
1. changed welder emote
hpdodger Sep 1, 2025
f4681a1
new welder icon by AstroCatNip
hpdodger Sep 2, 2025
e138a2e
fixed original weld texture variable
hpdodger Sep 2, 2025
4dea5f0
Merge branch 'reactivedrop_beta' into welder_icon
hpdodger Sep 4, 2025
cbc6efc
Merge branch 'reactivedrop_beta' into welder_icon
hpdodger Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions reactivedrop/materials/vgui/swarm/emotes/EmoteWelder.vmt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
UnlitGeneric
{
$basetexture "vgui\swarm\Emotes\EmoteWelder"
$translucent 1
$surfaceprop metal
$vertexcolor 1
$vertexalpha 1
$no_fullbright 1
$ignorez 1
}
Binary file added reactivedrop/materials/vgui/swarm/emotes/EmoteWelder.vtf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion reactivedrop/scripts/radialmenu.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}
"SouthEast"
{
"command" "cl_chatter 39"
"command" "cl_emote 15"
"text" "#asw_speech_rseal"
}
"South"
Expand Down
1 change: 1 addition & 0 deletions src/game/client/swarm/c_asw_marine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ C_ASW_Marine::C_ASW_Marine() :
m_fEmoteAnimeSmileTime = 0;
m_fEmoteQuestionTime = 0;
m_fEmoteThanksTime = 0;
m_fEmoteWeldTime = 0;
m_flLastMedicCall = 0;
m_flLastAmmoCall = 0;

Expand Down
1 change: 1 addition & 0 deletions src/game/client/swarm/c_asw_marine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ class C_ASW_Marine : public C_ASW_VPhysics_NPC, public IASWPlayerAnimStateHelper
float m_fEmoteAnimeSmileTime;
float m_fEmoteQuestionTime;
float m_fEmoteThanksTime;
float m_fEmoteWeldTime;
CNetworkVar( float, m_flLastMedicCall );
CNetworkVar( float, m_flLastAmmoCall );

Expand Down
4 changes: 3 additions & 1 deletion src/game/client/swarm/vgui/asw_hud_emotes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class CASWHudEmotes : public CASW_HudElement, public vgui::Panel
CPanelAnimationVarAliasType( int, m_nAnimeTexture, "AnimeEmoteTexture", "vgui/swarm/Emotes/EmoteAnime", "textureid" );
CPanelAnimationVarAliasType( int, m_nQuestionTexture, "QuestionTexture", "vgui/swarm/Emotes/EmoteQuestion", "textureid" );
CPanelAnimationVarAliasType( int, m_nThanksTexture, "ThanksTexture", "vgui/swarm/Emotes/EmoteThanks", "textureid" );

CPanelAnimationVarAliasType( int, m_nWeldEmoteTexture, "WeldEmoteTexture", "vgui/swarm/Emotes/EmoteWelder", "textureid" );
CPanelAnimationVarAliasType( int, m_nWrenchTexture, "WrenchTexture", "vgui/swarm/ClassIcons/EngineerIcon", "textureid" );
CPanelAnimationVarAliasType( int, m_nSentryUpTexture, "SentryUpTexture", "vgui/swarm/ClassIcons/SentryBuild", "textureid" );
CPanelAnimationVarAliasType( int, m_nSentryDnTexture, "SentryDnTexture", "vgui/swarm/ClassIcons/SentryDismantle", "textureid" );
Expand Down Expand Up @@ -148,6 +148,8 @@ void CASWHudEmotes::PaintEmotesFor( C_ASW_Marine *pMarine )
PaintEmote( pMarine, pMarine->m_fEmoteQuestionTime, m_nQuestionTexture );
if ( pMarine->m_iClientEmote & ( 1 << 14 ) )
PaintEmote( pMarine, pMarine->m_fEmoteThanksTime, m_nThanksTexture );
if (pMarine->m_iClientEmote & (1 << 15) )
PaintEmote(pMarine, pMarine->m_fEmoteWeldTime, m_nWeldEmoteTexture);

bool bBuildingSentry = false;
bool bWelding = false;
Expand Down
3 changes: 3 additions & 0 deletions src/game/server/swarm/asw_marine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4496,6 +4496,9 @@ void CASW_Marine::DoEmote( int iEmote )
case 14:
GetMarineSpeech()->Chatter( CHATTER_THANKS );
break;
case 15:
GetMarineSpeech()->Chatter( CHATTER_REQUEST_SEAL_DOOR );
break;
default:
iEmote = 6;
break;
Expand Down
1 change: 1 addition & 0 deletions src/game/server/swarm/asw_marine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,7 @@ class CASW_Marine : public CASW_VPhysics_NPC, public IASWPlayerAnimStateHelpers,
float m_fEmoteAnimeSmileTime;
float m_fEmoteQuestionTime;
float m_fEmoteThanksTime;
float m_fEmoteWeldTime;
CNetworkVar( float, m_flLastMedicCall );
CNetworkVar( float, m_flLastAmmoCall );

Expand Down
1 change: 1 addition & 0 deletions src/game/shared/swarm/asw_marine_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ void CASW_Marine::TickEmotes( float d )
TickEmote( d, 1 << 6, m_fEmoteAnimeSmileTime );
TickEmote( d, 1 << 7, m_fEmoteQuestionTime );
TickEmote( d, 1 << 14, m_fEmoteThanksTime );
TickEmote( d, 1 << 15, m_fEmoteWeldTime );
}

bool CASW_Marine::TickEmote( float d, int bit, float &fEmoteTime )
Expand Down