Skip to content

Commit

Permalink
Merge branch 'release/v1.4.1'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	addons/sourcemod/scripting/weapons/database.sp
  • Loading branch information
@kgns
kgns committed Oct 19, 2019
2 parents cec8874 + 55d035d commit 54a2d14
Show file tree
Hide file tree
Showing 36 changed files with 4,069 additions and 1,336 deletions.
150 changes: 120 additions & 30 deletions addons/sourcemod/configs/weapons/weapons_brazilian.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,90 @@
"Skins"
{
"Commemoration"
{
"index" "919"
"classes" "weapon_famas;"
}
"Sacrifice"
{
"index" "918"
"classes" "weapon_glock;"
}
"Wildfire"
{
"index" "917"
"classes" "weapon_awp;"
}
"Plastique"
{
"index" "916"
"classes" "weapon_ump45;"
}
"Agent"
{
"index" "915"
"classes" "weapon_mp5sd;"
}
"Assault"
{
"index" "914"
"classes" "weapon_scar20;"
}
"Death by Puppy"
{
"index" "913"
"classes" "weapon_aug;"
}
"Nostalgia"
{
"index" "911"
"classes" "weapon_p90;"
}
"Hydra"
{
"index" "910"
"classes" "weapon_mp9;"
}
"Popdog"
{
"index" "909"
"classes" "weapon_mag7;"
}
"Classic Crate"
{
"index" "908"
"classes" "weapon_mac10;"
}
"Inferno"
{
"index" "907"
"classes" "weapon_p250;"
}
"Buddy"
{
"index" "906"
"classes" "weapon_fiveseven;"
}
"Flash Out"
{
"index" "905"
"classes" "weapon_tec9;"
}
"Decommissioned"
{
"index" "904"
"classes" "weapon_famas;"
}
"Elite 1.6"
{
"index" "903"
"classes" "weapon_elite;"
}
"Aztec"
{
"index" "902"
"classes" "weapon_m249;"
}
"Aço de Damasco"
{
"index" "858"
Expand Down Expand Up @@ -35,27 +120,27 @@
"index" "852"
"classes" "weapon_knife_widowmaker;"
}
"Moonrise"
"Nascer da Lua"
{
"index" "851"
"classes" "weapon_ump45;"
}
"Incinegator"
"Flamejacaré"
{
"index" "850"
"classes" "weapon_xm1014;"
}
"Off World"
"Surreal"
{
"index" "849"
"classes" "weapon_p90;"
}
"Verdigris"
"Azinhavre"
{
"index" "848"
"classes" "weapon_p250;"
}
"Mischief"
"Pestinha"
{
"index" "847"
"classes" "weapon_mp7;"
Expand All @@ -65,17 +150,17 @@
"index" "846"
"classes" "weapon_mp5sd;"
}
"Momentum"
"Momento"
{
"index" "845"
"classes" "weapon_aug;"
}
"Emperor"
"O Imperador"
{
"index" "844"
"classes" "weapon_m4a1;"
}
"Skull Crusher"
"Esmagadora de Crânios"
{
"index" "843"
"classes" "weapon_revolver;"
Expand All @@ -85,17 +170,17 @@
"index" "842"
"classes" "weapon_galilar;"
}
"Light Rail"
"VLT"
{
"index" "841"
"classes" "weapon_deagle;"
}
"Whitefish"
"Escamada"
{
"index" "840"
"classes" "weapon_mac10;"
}
"Bamboozle"
"Bamburlar"
{
"index" "839"
"classes" "weapon_tec9;"
Expand All @@ -105,17 +190,17 @@
"index" "838"
"classes" "weapon_awp;"
}
"Angry Mob"
"Multidão Enfurecida"
{
"index" "837"
"classes" "weapon_fiveseven;"
}
"Uncharted"
"Inexplorada"
{
"index" "836"
"classes" "weapon_ak47;"
}
"Crypsis"
"Mimetismo"
{
"index" "835"
"classes" "weapon_famas;"
Expand Down Expand Up @@ -145,7 +230,7 @@
"index" "813"
"classes" "weapon_p250;"
}
"Pipe Down"
"Cano Abaixo"
{
"index" "812"
"classes" "weapon_mac10;"
Expand Down Expand Up @@ -208,7 +293,7 @@
"Listra Noturna"
{
"index" "735"
"classes" "weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_knife_css;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Olho de Atena"
{
Expand Down Expand Up @@ -1105,6 +1190,11 @@
"index" "541"
"classes" "weapon_aug;"
}
"X-Ray"
{
"index" "125"
"classes" "weapon_p250;"
}
"Farol Alto"
{
"index" "799"
Expand All @@ -1120,7 +1210,7 @@
"index" "797"
"classes" "weapon_sawedoff;"
}
"Check Engine"
"Motor Pifado"
{
"index" "796"
"classes" "weapon_usp_silencer;"
Expand Down Expand Up @@ -1210,7 +1300,7 @@
"index" "788"
"classes" "weapon_awp;"
}
"Core Breach"
"Vazamento Nuclear"
{
"index" "787"
"classes" "weapon_mag7;"
Expand Down Expand Up @@ -1270,7 +1360,7 @@
"index" "776"
"classes" "weapon_p90;"
}
"Facility Sketch"
"Esboço de Fábrica"
{
"index" "775"
"classes" "weapon_bizon;"
Expand Down Expand Up @@ -3083,7 +3173,7 @@
"Brasas"
{
"index" "175"
"classes" "weapon_p90;weapon_ump45;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_p90;weapon_ump45;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"BUM"
{
Expand Down Expand Up @@ -3198,7 +3288,7 @@
"Máscara Urbana"
{
"index" "143"
"classes" "weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Casca de Laranja"
{
Expand Down Expand Up @@ -3323,7 +3413,7 @@
"Floresta Boreal"
{
"index" "77"
"classes" "weapon_p250;weapon_m4a1_silencer;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_p250;weapon_m4a1_silencer;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Floresta no Inverno"
{
Expand All @@ -3348,7 +3438,7 @@
"Grade de Safári"
{
"index" "72"
"classes" "weapon_ak47;weapon_awp;weapon_g3sg1;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_ak47;weapon_awp;weapon_g3sg1;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Escorpião"
{
Expand Down Expand Up @@ -3383,7 +3473,7 @@
"Massacre"
{
"index" "59"
"classes" "weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Descarga Elétrica"
{
Expand All @@ -3408,17 +3498,17 @@
"Aquecimento de Aço"
{
"index" "44"
"classes" "weapon_fiveseven;weapon_ak47;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_fiveseven;weapon_ak47;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Manchado"
{
"index" "43"
"classes" "weapon_elite;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_elite;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Aço Azul"
{
"index" "42"
"classes" "weapon_xm1014;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_xm1014;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Cobre"
{
Expand All @@ -3438,7 +3528,7 @@
"Degradê"
{
"index" "38"
"classes" "weapon_glock;weapon_mac10;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_glock;weapon_mac10;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Chamas"
{
Expand Down Expand Up @@ -3533,7 +3623,7 @@
"Teia Rubra"
{
"index" "12"
"classes" "weapon_cz75a;weapon_revolver;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_cz75a;weapon_revolver;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Crânios"
{
Expand Down Expand Up @@ -3563,7 +3653,7 @@
"Camuflagem Digital — Floresta"
{
"index" "5"
"classes" "weapon_sawedoff;weapon_mp7;weapon_bayonet;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
"classes" "weapon_sawedoff;weapon_mp7;weapon_bayonet;weapon_knife_css;weapon_knife_flip;weapon_knife_gut;weapon_knife_karambit;weapon_knife_m9_bayonet;weapon_knife_tactical;weapon_knife_falchion;weapon_knife_survival_bowie;weapon_knife_butterfly;weapon_knife_push;weapon_knife_ursus;weapon_knife_gypsy_jackknife;weapon_knife_stiletto;weapon_knife_widowmaker;"
}
"Maçã do Amor"
{
Expand Down
Loading

0 comments on commit 54a2d14

Please sign in to comment.