diff --git a/hypnonema.db b/hypnonema.db index 5ec3d588c..a7e8796f7 100644 Binary files a/hypnonema.db and b/hypnonema.db differ diff --git a/resources/LegacyFuel/config.lua b/resources/LegacyFuel/config.lua index c4810f865..dfda1cb30 100644 --- a/resources/LegacyFuel/config.lua +++ b/resources/LegacyFuel/config.lua @@ -51,7 +51,7 @@ Config.Blacklist = { --"Adder", --276773164 "teslax", - + "foxlight", } -- Do you want the HUD removed from showing in blacklisted vehicles? diff --git a/resources/Postal-Map/stream/minimap_0_1.ytd b/resources/Postal-Map/stream/minimap_0_1.ytd index 96aafdf54..567dc3436 100644 --- a/resources/Postal-Map/stream/minimap_0_1.ytd +++ b/resources/Postal-Map/stream/minimap_0_1.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1aff809a6d43b7cde32fd423eaaa4d6c1fdf0e9f7213b05d0102eac2c426128 -size 3956029 +oid sha256:49450bfd0dca4dfa318792c60f7c87603c0ec182bee196b78170b88ae92db2dd +size 3957239 diff --git a/resources/Safe-Zones/config.lua b/resources/Safe-Zones/config.lua index a28e51cf9..81a9363dc 100644 --- a/resources/Safe-Zones/config.lua +++ b/resources/Safe-Zones/config.lua @@ -253,6 +253,15 @@ Config.Zones = { {-421.00, 6005.39, 31.32}, {-423.56, 6015.37, 31.32}, {-429.02, 6029.49, 31.49}, + }, + { + {1773.15, 4588.77, 38.22}, -- Grapeseed Firestation + {1770.74, 4616.88, 38.22}, + {1809.17, 4620.23, 38.22}, + {1811.27, 4594.05, 38.22}, + {1807.69, 4593.61, 38.22}, + {1803.21, 4590.64, 38.22}, + {1779.13, 4588.57, 38.22}, } } diff --git a/resources/Timetrials/scores.txt b/resources/Timetrials/scores.txt index 97b72c336..6e9987fd3 100644 --- a/resources/Timetrials/scores.txt +++ b/resources/Timetrials/scores.txt @@ -1 +1 @@ -{"North GP":{"Baller":{"time":410118,"car":"Baller","player":"dcapone00"},"NULL":{"time":191650,"car":"NULL","player":"vJack"},"Neon":{"time":354856,"car":"Neon","player":"ThunderBird"}},"North Rallycross ":{"Neon":{"time":351612,"car":"Neon","player":"ThunderBird"}},"Race | Airport Drag Race":{"NULL":{"time":9270,"car":"NULL","player":"DR-KingRodriguez"}},"Hollywood Hills":{"NULL":{"time":120053,"car":"NULL","player":"Kryplos125"}},"Race | Hollywood Hills":{"Audi R8 V10":{"time":100677,"car":"Audi R8 V10","player":"ThatGuyJacobee"},"Mercedes AMG GTS":{"time":85823,"car":"Mercedes AMG GTS","player":"vJack"}},"Sandy Airfield":{"RE-7B":{"time":28456,"car":"RE-7B","player":"*ZbyniU*"},"Neon":{"time":30312,"car":"Neon","player":"ThunderBird"},"Maverick":{"time":29165,"car":"Maverick","player":"vJack"},"Jester":{"time":47982,"car":"Jester","player":"michael82"},"FH-1 Hunter":{"time":36289,"car":"FH-1 Hunter","player":"*ZbyniU*"},"BMX":{"time":21014,"car":"BMX","player":"vJack"},"NULL":{"time":5607,"car":"NULL","player":"ThatGuyJacobee"},"Oppressor":{"time":21360,"car":"Oppressor","player":"michael82"},"Vigilante":{"time":6172,"car":"Vigilante","player":"*ZbyniU*"}},"Lakeside Loop":{"NULL":{"time":206147,"car":"NULL","player":"DR*KINGPORNHUB"}},"Race | Airport Drag":{"NULL":{"time":12630,"car":"NULL","player":"B. LAO"},"2010 Chevy Tahoe":{"time":12821,"car":"2010 Chevy Tahoe","player":"King Rodriguez"},"Nissan Skyline GTR":{"time":9693,"car":"Nissan Skyline GTR","player":"ThatGuyJacobee"},"Police Corvette 2019":{"time":14484,"car":"Police Corvette 2019","player":"Woltage.2"},"Formula 1":{"time":7629,"car":"Formula 1","player":"King Rodriguez"},"BMW M5 Plus":{"time":8652,"car":"BMW M5 Plus","player":"King Rodriguez"}},"Race | Airport Circuit":{"Ferrari 458":{"time":69880,"car":"Ferrari 458","player":"ThatGuyJacobee"},"Formula 1":{"time":42751,"car":"Formula 1","player":"vJack"},"Nissan Skyline GTR":{"time":83978,"car":"Nissan Skyline GTR","player":"ThatGuyJacobee"}},"Race | Sandy Airfield":{"Chevy Camaro20":{"time":32202,"car":"Chevy Camaro20","player":"Max Rodriguez"},"2014 Dodge Charger":{"time":29132,"car":"2014 Dodge Charger","player":"King Rodriguez"},"Toyota Sienna 2021":{"time":34685,"car":"Toyota Sienna 2021","player":"Max Rodriguez"},"Yamaha R6":{"time":28188,"car":"Yamaha R6","player":"ThatGuyJacobee"},"BMW M5 Plus":{"time":18019,"car":"BMW M5 Plus","player":"King Rodriguez"},"Mini JCW 2020":{"time":29879,"car":"Mini JCW 2020","player":"King Rodriguez"},"Bugatti Chiron 2017":{"time":22371,"car":"Bugatti Chiron 2017","player":"King Rodriguez"},"BMW i8":{"time":24743,"car":"BMW i8","player":"King Rodriguez"},"2016 Ford Explorer":{"time":26526,"car":"2016 Ford Explorer","player":"King Rodriguez"},"Formula 1":{"time":15914,"car":"Formula 1","player":"vJack"},"Audi S3 2015":{"time":25742,"car":"Audi S3 2015","player":"King Rodriguez"},"Ferrari 458":{"time":25352,"car":"Ferrari 458","player":"Woltage.2"},"Ford Raptor F-150":{"time":28515,"car":"Ford Raptor F-150","player":"King Rodriguez"},"Space Docker":{"time":29122,"car":"Space Docker","player":"DyslexicStoner240."},"Mercedes AMG GTS":{"time":19029,"car":"Mercedes AMG GTS","player":"vJack"},"F-22A":{"time":90697,"car":"F-22A","player":"Yalaina-DDR8"},"Kawasaki Ninja ZX10R":{"time":28422,"car":"Kawasaki Ninja ZX10R","player":"King Rodriguez"},"Jeep TrackHawk 2018":{"time":22887,"car":"Jeep TrackHawk 2018","player":"King Rodriguez"},"Nissan Skyline GTR":{"time":29921,"car":"Nissan Skyline GTR","player":"ThatGuyJacobee"}},"Race | Cannonball Run":{"2013 Dodge Charger":{"time":263368,"car":"2013 Dodge Charger","player":"vJack"}},"Highway Sprint":{"NULL":{"time":93300,"car":"NULL","player":"vJack"}},"Race | North GP":{"SNOWMOBILE 2020":{"time":387242,"car":"SNOWMOBILE 2020","player":"ThatGuyJacobee"},"Mercedes AMG GTS":{"time":217283,"car":"Mercedes AMG GTS","player":"vJack"},"NULL":{"time":42917,"car":"NULL","player":"SOGGYBEAN"},"Windsor Drop":{"time":66673,"car":"Windsor Drop","player":"[C-81][GCF-145] R. Freeman"},"BMW M5":{"time":115460,"car":"BMW M5","player":"Stormzy"}},"Airport Drag Race":{"NULL":{"time":7030,"car":"NULL","player":"iwan.ralphs"}},"Observatory Loop":{"NULL":{"time":34126,"car":"NULL","player":"ThatGuyJacobee"}},"BCSO Training Course":{"NULL":{"time":26915,"car":"NULL","player":"ThatGuyJacobee"},"Jester":{"time":37835,"car":"Jester","player":"michael82"}},"Cannonball Run":{"NULL":{"time":81298,"car":"NULL","player":"ThatGuyJacobee"}},"Race | Lakeside Loop":{"Ferrari 458":{"time":177461,"car":"Ferrari 458","player":"ThatGuyJacobee"},"SNOWMOBILE 2020":{"time":107015,"car":"SNOWMOBILE 2020","player":"[C-146] E. Cartman"},"Ford Crown Vic 2011":{"time":231931,"car":"Ford Crown Vic 2011","player":"AnySpiderBat"},"NULL":{"time":196803,"car":"NULL","player":"ThatGuyJacobee"},"EGRP Staff Buggy":{"time":43710,"car":"EGRP Staff Buggy","player":"[EGRP-02]King Rodriguez"}},"Race | Highway Sprint":{"NULL":{"time":98074,"car":"NULL","player":"DR-KingRodriguez"},"Ferrari 458":{"time":138033,"car":"Ferrari 458","player":"ThatGuyJacobee"}},"Race | Timetrial Event - 04/04/21":{"Gauntlet Classic Custom":{"time":191695,"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee"},"Chevrolet Silverado 1980":{"time":156244,"car":"Chevrolet Silverado 1980","player":"King Rodriguez"},"Ford Velociraptor 6x6":{"time":132814,"car":"Ford Velociraptor 6x6","player":"ThatGuyJacobee"}},"Race | Hillside Loop":{"Gauntlet Classic Custom":{"time":230432,"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee"},"Bronco Wildtrak 2021":{"time":210714,"car":"Bronco Wildtrak 2021","player":"ThatGuyJacobee"},"BMW M8 Widebody":{"time":195442,"car":"BMW M8 Widebody","player":"[C-291][GCF-34][MS-13] K. Lee"}},"Race | Observatory Loop":{"Gauntlet Classic Custom":{"time":76765,"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee"},"Porsche 911 GT3RS":{"time":106410,"car":"Porsche 911 GT3RS","player":"[YJ-18] Sinapsey"},"BMW M5":{"time":81837,"car":"BMW M5","player":"[C-291][GCF-34][MS-13] K. Lee"},"Formula 1":{"time":54744,"car":"Formula 1","player":"ThatGuyJacobee"},"NULL":{"time":55388,"car":"NULL","player":"[YJ-18] Sinapsey"},"Mercedes AMG GTS":{"time":56747,"car":"Mercedes AMG GTS","player":"vJack"},"2013 Dodge Charger":{"time":64004,"car":"2013 Dodge Charger","player":"vJack"},"Nissan Skyline GTR":{"time":67881,"car":"Nissan Skyline GTR","player":"[C-291][GCF-34][MS-13] K. Lee"},"Mazda Miata":{"time":79814,"car":"Mazda Miata","player":"[C-291][GCF-34][MS-13] K. Lee"},"BMW M5 Plus":{"time":70752,"car":"BMW M5 Plus","player":"[EGRP-02]King Rodriguez"}},"Airport Circuit":{"P-996 LAZER":{"time":59216,"car":"P-996 LAZER","player":"ThatGuyJacobee"},"NULL":{"time":22916,"car":"NULL","player":"ThatGuyJacobee"},"Neon":{"time":92652,"car":"Neon","player":"ThunderBird"}},"Race | BCSO Training Course":{"2013 Dodge Charger":{"time":94246,"car":"2013 Dodge Charger","player":"vJack"},"Mercedes AMG GTS":{"time":78151,"car":"Mercedes AMG GTS","player":"vJack"},"Nissan Skyline GTR":{"time":105983,"car":"Nissan Skyline GTR","player":"ThatGuyJacobee"},"2016 Dodge Ram":{"time":119099,"car":"2016 Dodge Ram","player":"vJack"}}} \ No newline at end of file +{"Race | BCSO Training Course":{"Mercedes AMG GTS":{"player":"vJack","car":"Mercedes AMG GTS","time":78151},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","car":"Nissan Skyline GTR","time":105983},"2013 Dodge Charger":{"player":"vJack","car":"2013 Dodge Charger","time":94246},"2016 Dodge Ram":{"player":"vJack","car":"2016 Dodge Ram","time":119099}},"Cannonball Run":{"NULL":{"player":"ThatGuyJacobee","car":"NULL","time":81298}},"Race | Airport Drag Race":{"NULL":{"player":"DR-KingRodriguez","car":"NULL","time":9270}},"Race | North GP":{"BMW M5":{"player":"Stormzy","car":"BMW M5","time":115460},"NULL":{"player":"SOGGYBEAN","car":"NULL","time":42917},"Mercedes AMG GTS":{"player":"vJack","car":"Mercedes AMG GTS","time":217283},"Windsor Drop":{"player":"[C-81][GCF-145] R. Freeman","car":"Windsor Drop","time":66673},"SNOWMOBILE 2020":{"player":"ThatGuyJacobee","car":"SNOWMOBILE 2020","time":387242}},"Race | Hollywood Hills":{"Mercedes AMG GTS":{"player":"vJack","car":"Mercedes AMG GTS","time":85823},"Audi R8 V10":{"player":"ThatGuyJacobee","car":"Audi R8 V10","time":100677},"NULL":{"time":102048,"car":"NULL","player":"ThatGuyJacobee"}},"Highway Sprint":{"NULL":{"player":"vJack","car":"NULL","time":93300}},"Lakeside Loop":{"NULL":{"player":"DR*KINGPORNHUB","car":"NULL","time":206147}},"Sandy Airfield":{"BMX":{"player":"vJack","car":"BMX","time":21014},"Maverick":{"player":"vJack","car":"Maverick","time":29165},"Vigilante":{"player":"*ZbyniU*","car":"Vigilante","time":6172},"Neon":{"player":"ThunderBird","car":"Neon","time":30312},"NULL":{"player":"ThatGuyJacobee","car":"NULL","time":5607},"RE-7B":{"player":"*ZbyniU*","car":"RE-7B","time":28456},"FH-1 Hunter":{"player":"*ZbyniU*","car":"FH-1 Hunter","time":36289},"Jester":{"player":"michael82","car":"Jester","time":47982},"Oppressor":{"player":"michael82","car":"Oppressor","time":21360}},"Race | Lakeside Loop":{"EGRP Staff Buggy":{"player":"[EGRP-02]King Rodriguez","car":"EGRP Staff Buggy","time":43710},"Ferrari 458":{"player":"ThatGuyJacobee","car":"Ferrari 458","time":177461},"Ford Crown Vic 2011":{"player":"AnySpiderBat","car":"Ford Crown Vic 2011","time":231931},"NULL":{"player":"ThatGuyJacobee","car":"NULL","time":196803},"SNOWMOBILE 2020":{"player":"[C-146] E. Cartman","car":"SNOWMOBILE 2020","time":107015}},"Observatory Loop":{"NULL":{"player":"ThatGuyJacobee","car":"NULL","time":34126}},"Airport Circuit":{"P-996 LAZER":{"player":"ThatGuyJacobee","car":"P-996 LAZER","time":59216},"Neon":{"player":"ThunderBird","car":"Neon","time":92652},"NULL":{"player":"ThatGuyJacobee","car":"NULL","time":22916}},"Race | Hillside Loop":{"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Gauntlet Classic Custom","time":230432},"Bronco Wildtrak 2021":{"player":"ThatGuyJacobee","car":"Bronco Wildtrak 2021","time":210714},"BMW M8 Widebody":{"player":"[C-291][GCF-34][MS-13] K. Lee","car":"BMW M8 Widebody","time":195442}},"Race | Cannonball Run":{"2013 Dodge Charger":{"player":"vJack","car":"2013 Dodge Charger","time":263368}},"Race | Observatory Loop":{"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Gauntlet Classic Custom","time":76765},"2013 Dodge Charger":{"player":"vJack","car":"2013 Dodge Charger","time":64004},"Porsche 911 GT3RS":{"player":"[YJ-18] Sinapsey","car":"Porsche 911 GT3RS","time":106410},"BMW M5":{"player":"[C-291][GCF-34][MS-13] K. Lee","car":"BMW M5","time":81837},"BMW M5 Plus":{"player":"[EGRP-02]King Rodriguez","car":"BMW M5 Plus","time":70752},"NULL":{"player":"[YJ-18] Sinapsey","car":"NULL","time":55388},"Mercedes AMG GTS":{"player":"vJack","car":"Mercedes AMG GTS","time":56747},"Nissan Skyline GTR":{"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Nissan Skyline GTR","time":67881},"Mazda Miata":{"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Mazda Miata","time":79814},"Formula 1":{"player":"ThatGuyJacobee","car":"Formula 1","time":54744}},"North GP":{"NULL":{"player":"vJack","car":"NULL","time":191650},"Neon":{"player":"ThunderBird","car":"Neon","time":354856},"Baller":{"player":"dcapone00","car":"Baller","time":410118}},"Race | Timetrial Event - 04/04/21":{"Chevrolet Silverado 1980":{"player":"King Rodriguez","car":"Chevrolet Silverado 1980","time":156244},"Ford Velociraptor 6x6":{"player":"ThatGuyJacobee","car":"Ford Velociraptor 6x6","time":132814},"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","car":"Gauntlet Classic Custom","time":191695}},"Race | Airport Circuit":{"Formula 1":{"player":"vJack","car":"Formula 1","time":42751},"Ferrari 458":{"player":"ThatGuyJacobee","car":"Ferrari 458","time":69880},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","car":"Nissan Skyline GTR","time":83978}},"Race | Sandy Airfield":{"Space Docker":{"player":"DyslexicStoner240.","car":"Space Docker","time":29122},"Ford Raptor F-150":{"player":"King Rodriguez","car":"Ford Raptor F-150","time":28515},"Bugatti Chiron 2017":{"player":"King Rodriguez","car":"Bugatti Chiron 2017","time":22371},"Chevy Camaro20":{"player":"Max Rodriguez","car":"Chevy Camaro20","time":32202},"Kawasaki Ninja ZX10R":{"player":"King Rodriguez","car":"Kawasaki Ninja ZX10R","time":28422},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","car":"Nissan Skyline GTR","time":29921},"2016 Ford Explorer":{"player":"King Rodriguez","car":"2016 Ford Explorer","time":26526},"Audi S3 2015":{"player":"King Rodriguez","car":"Audi S3 2015","time":25742},"Ferrari 458":{"player":"Woltage.2","car":"Ferrari 458","time":25352},"Yamaha R6":{"player":"ThatGuyJacobee","car":"Yamaha R6","time":28188},"Jeep TrackHawk 2018":{"player":"King Rodriguez","car":"Jeep TrackHawk 2018","time":22887},"Toyota Sienna 2021":{"player":"Max Rodriguez","car":"Toyota Sienna 2021","time":34685},"2014 Dodge Charger":{"player":"King Rodriguez","car":"2014 Dodge Charger","time":29132},"F-22A":{"player":"Yalaina-DDR8","car":"F-22A","time":90697},"BMW M5 Plus":{"player":"King Rodriguez","car":"BMW M5 Plus","time":18019},"Mercedes AMG GTS":{"player":"vJack","car":"Mercedes AMG GTS","time":19029},"Mini JCW 2020":{"player":"King Rodriguez","car":"Mini JCW 2020","time":29879},"Formula 1":{"player":"vJack","car":"Formula 1","time":15914},"BMW i8":{"player":"King Rodriguez","car":"BMW i8","time":24743}},"Race | Highway Sprint":{"Ferrari 458":{"player":"ThatGuyJacobee","car":"Ferrari 458","time":138033},"NULL":{"player":"DR-KingRodriguez","car":"NULL","time":98074}},"BCSO Training Course":{"Jester":{"player":"michael82","car":"Jester","time":37835},"NULL":{"player":"ThatGuyJacobee","car":"NULL","time":26915}},"Race | Airport Drag":{"Police Corvette 2019":{"player":"Woltage.2","car":"Police Corvette 2019","time":14484},"Formula 1":{"player":"King Rodriguez","car":"Formula 1","time":7629},"NULL":{"player":"B. LAO","car":"NULL","time":12630},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","car":"Nissan Skyline GTR","time":9693},"BMW M5 Plus":{"player":"King Rodriguez","car":"BMW M5 Plus","time":8652},"2010 Chevy Tahoe":{"player":"King Rodriguez","car":"2010 Chevy Tahoe","time":12821}},"Airport Drag Race":{"NULL":{"player":"iwan.ralphs","car":"NULL","time":7030}},"North Rallycross ":{"Neon":{"player":"ThunderBird","car":"Neon","time":351612}},"Hollywood Hills":{"NULL":{"player":"Kryplos125","car":"NULL","time":120053}}} \ No newline at end of file diff --git a/server.cfg b/server.cfg index f45051407..111be6134 100644 --- a/server.cfg +++ b/server.cfg @@ -167,7 +167,7 @@ start cummins5924v start stretcher start stretcherscript start Seat-Switcher -start Join-Transition +//start Join-Transition start CarWipe start EGRP-Notifications //start AI-Vehiclelock