diff --git a/resources/EGRPBearcat/stream/EGRPBearcat.ytd b/resources/EGRPBearcat/stream/EGRPBearcat.ytd index fbcd269f0..4228d8c4a 100644 --- a/resources/EGRPBearcat/stream/EGRPBearcat.ytd +++ b/resources/EGRPBearcat/stream/EGRPBearcat.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ee07b22df9aa1e069dc80eb1ea9667dffca5a79159e13bd80a7c573347a566b -size 7335379 +oid sha256:ee3009f906dd39572e065caede6953a3f74ac4aa1831e1e3bbd9893816a2f499 +size 6963613 diff --git a/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua b/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua index 222748609..5bc7ab843 100644 --- a/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua +++ b/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua @@ -256,6 +256,7 @@ Config.VehicleRestrictions = { "maxfedv", "maxkhellwb", "swat1", + "zr1RB", "Staff-DMLEOF82", "Staff-kgbearcat", diff --git a/resources/bearcat/stream/bearcat.ytd b/resources/bearcat/stream/bearcat.ytd index 6b4876b1b..0d7cb26f2 100644 --- a/resources/bearcat/stream/bearcat.ytd +++ b/resources/bearcat/stream/bearcat.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c98673324a1fa2cc49feebcb660bb774ddefb0b9116d9477942cdbdf37d9a14a -size 7207601 +oid sha256:748d457840152ebdddad0855b176e654280c45980a343ccf7e007ce6837c33af +size 6793459 diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_000_u.ydd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_000_u.ydd index 58c5de812..5b2e22030 100644 Binary files a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_000_u.ydd and b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_000_u.ydd differ diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_001_u.ydd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_001_u.ydd index 52b4ca9cf..34e95964b 100644 Binary files a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_001_u.ydd and b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_001_u.ydd differ diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_002_u.ydd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_002_u.ydd index 455cb71b8..705d3c38d 100644 Binary files a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_002_u.ydd and b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_002_u.ydd differ diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_003_u.ydd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_003_u.ydd index 9d2f1a3bc..da7461514 100644 Binary files a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_003_u.ydd and b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_003_u.ydd differ diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_004_u.ydd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_004_u.ydd index 972f11c6f..895895d0b 100644 Binary files a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_004_u.ydd and b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_004_u.ydd differ diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_005_u.ydd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_005_u.ydd index ed08b050c..3b5f7a863 100644 Binary files a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_005_u.ydd and b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_005_u.ydd differ diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_000_a_uni.ytd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_000_a_uni.ytd index b08698d92..c3c5b221d 100644 --- a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_000_a_uni.ytd +++ b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_000_a_uni.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20395f56e1ac129e4511af167a8e2d212f6069f2c636320cead10873f104b0fa -size 676293 +oid sha256:6dd03db05aa7e5ba153ff0ded1c33ba1c71635b5602c0cbbca1eac26e89be717 +size 7375057 diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_001_a_uni.ytd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_001_a_uni.ytd index 37eb8bc93..c3c5b221d 100644 --- a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_001_a_uni.ytd +++ b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_001_a_uni.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ed295ecd47e95dd146d273b41122e8854201dee6181d90220c35f79552c45a5 -size 734247 +oid sha256:6dd03db05aa7e5ba153ff0ded1c33ba1c71635b5602c0cbbca1eac26e89be717 +size 7375057 diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_002_a_uni.ytd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_002_a_uni.ytd index d74bd47cd..f41e5a2d7 100644 --- a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_002_a_uni.ytd +++ b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_002_a_uni.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a3beb29332234f77668232b1fffb6c0b73d834b3a82447836ba9eb0ffa45cf7 -size 662362 +oid sha256:389248eb6f7b086b1659def9dcde6f6276d3d1c79e9a0c64925120d01cd4c18a +size 7374907 diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_003_a_uni.ytd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_003_a_uni.ytd index 9555c8628..f41e5a2d7 100644 --- a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_003_a_uni.ytd +++ b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_003_a_uni.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d746d175289def8836e59b9df678122c9784c2f57fec19b28d060b0bef440a0f -size 4377261 +oid sha256:389248eb6f7b086b1659def9dcde6f6276d3d1c79e9a0c64925120d01cd4c18a +size 7374907 diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_004_a_uni.ytd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_004_a_uni.ytd index 9555c8628..f41e5a2d7 100644 --- a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_004_a_uni.ytd +++ b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_004_a_uni.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d746d175289def8836e59b9df678122c9784c2f57fec19b28d060b0bef440a0f -size 4377261 +oid sha256:389248eb6f7b086b1659def9dcde6f6276d3d1c79e9a0c64925120d01cd4c18a +size 7374907 diff --git a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_005_a_uni.ytd b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_005_a_uni.ytd index 653e182d4..8cd3c8733 100644 --- a/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_005_a_uni.ytd +++ b/resources/eup-stream/stream/mp_m_freemode_01_male_freemode_hipster^accs_diff_005_a_uni.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00c2431263247bd937fd68d54addbdada28cf0c0dacb68f159a6fc87e889f605 -size 3843762 +oid sha256:8e436f2bf3b84beaa4108b99a2b096af0a0ca1ba4f4cacd76f3258e930d8c803 +size 7572245 diff --git a/resources/tahoe14swat/template/tahoe14 (1).png b/resources/tahoe14swat/template/tahoe14 (1).png new file mode 100644 index 000000000..0950481c7 Binary files /dev/null and b/resources/tahoe14swat/template/tahoe14 (1).png differ diff --git a/resources/tahoe14swat/template/tahoe_sign_1.png b/resources/tahoe14swat/template/tahoe_sign_1.png new file mode 100644 index 000000000..ac46ea00a Binary files /dev/null and b/resources/tahoe14swat/template/tahoe_sign_1.png differ diff --git a/server.cfg b/server.cfg index 2aaee4880..0d3a087a4 100644 --- a/server.cfg +++ b/server.cfg @@ -225,7 +225,7 @@ ensure ***EUPCLOTHING*** ensure eup-stream ensure eup-ui -//ensure PaletoPDEUP +ensure PaletoPDEUP ensure tls_aedutybelt ensure thinline_leprops ensure tls_motorolapack