Commit Graph

4297 Commits

Author SHA1 Message Date
Christopher Gjelten 5b5a612f25 Merge pull request #135 from itschip/unfuck
fix(drugs/server): removing check for health, becuause why the fuck
2020-12-06 15:40:07 +01:00
Christopher 06c5102564 fix(drugs/server): removing check for health, becuause why the fuck 2020-12-06 15:38:33 +01:00
Christopher Gjelten 83613371ea Merge pull request #25 from HypeLevels/patch-1
Update config.lua
2020-12-05 12:07:01 +01:00
ArkSeyonet aa11285d5c Merge pull request #92 from HypeLevels/patch-1
Update main.lua
2020-12-04 22:32:11 -06:00
HypeLevels 9402071f7d Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:45:38 +00:00
HypeLevels 2e1b14ac3e Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:45:21 +00:00
HypeLevels 8e8e189972 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:44:57 +00:00
HypeLevels 87c48964f9 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:44:40 +00:00
HypeLevels a36be2deb4 Update config.lua 2020-12-01 21:43:58 +00:00
HypeLevels ee86d1ac94 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:43:30 +00:00
HypeLevels 71ae1225e7 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:42:54 +00:00
HypeLevels 9655fb6ab7 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:42:28 +00:00
HypeLevels 85d898ce75 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:41:21 +00:00
HypeLevels 1c7b98ae41 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:40:59 +00:00
HypeLevels 7b36c43af3 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:40:27 +00:00
HypeLevels 59bb6e93e3 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:40:00 +00:00
HypeLevels 9580e319b3 Update config.lua
Changed default language to english as its the universal language
2020-12-01 21:39:27 +00:00
HypeLevels 0655c98393 Update main.lua
Made the blip smaller, was way to big
2020-12-01 18:01:34 +00:00
Christopher Gjelten 9a35c8f53f Merge pull request #49 from tabarra/patch-1
Update esx_basicneeds.sql
2020-12-01 18:00:35 +01:00
Christopher Gjelten bbce9722a2 Merge pull request #29 from tabarra/patch-1
Update config.lua
2020-12-01 17:59:59 +01:00
Christopher Gjelten ae8e700443 Merge pull request #134 from tabarra/patch-1
Update config.lua
2020-12-01 17:59:46 +01:00
tabarra e208c3ac88 Update config.lua 2020-12-01 12:56:05 -03:00
tabarra d4ef2b67da Update config.lua 2020-12-01 12:12:38 -03:00
Christopher Gjelten e567948b9c Merge pull request #286 from ItsManueh/patch-1
Language to Spanish fully translated to full
2020-12-01 14:58:12 +01:00
Christopher Gjelten 76eebbe369 Merge pull request #265 from lofwenberg/spelling_fix
Spelling fixes sv.lua
2020-12-01 14:55:45 +01:00
tabarra e485868bc8 Update esx_basicneeds.sql 2020-12-01 10:54:20 -03:00
Christopher Gjelten 9ceb66a591 Merge pull request #506 from seoalexramon/patch-1
fix: Spanish translation
2020-12-01 14:53:48 +01:00
Christopher Gjelten a5fb0ece29 Merge pull request #48 from HypeLevels/patch-1
Update config.lua
2020-12-01 14:47:54 +01:00
Christopher Gjelten eb06fd169d Merge pull request #47 from HypeLevels/patch-1
Update config.lua
2020-12-01 14:47:27 +01:00
Christopher Gjelten af56efc19c Merge pull request #92 from HypeLevels/patch-1
Update config.lua
2020-12-01 14:46:49 +01:00
Christopher Gjelten 0c84e7c237 Merge pull request #91 from seoalexramon/patch-1
fix: Spanish translation
2020-12-01 14:46:38 +01:00
Christopher Gjelten 79e10361bb Merge pull request #325 from HypeLevels/patch-1
Update config.lua
2020-12-01 14:45:57 +01:00
Christopher Gjelten b42afd53e3 Merge pull request #74 from HypeLevels/patch-1
Update config.lua
2020-12-01 14:39:52 +01:00
Christopher Gjelten c5dfc0497d Merge pull request #73 from seoalexramon/patch-1
fixed: Spanish translation
2020-12-01 14:39:43 +01:00
Christopher Gjelten 04183ae7c0 Merge pull request #45 from HypeLevels/patch-1
Update config.lua
2020-12-01 14:37:41 +01:00
Christopher Gjelten 6af9c7820e Merge pull request #44 from Tinky124/patch-3
Added to buy bags :
2020-12-01 14:37:31 +01:00
Christopher Gjelten 423cf1cecb Merge pull request #17 from HypeLevels/patch-1
Update config.lua | Merging this as it is the most used langauge.
2020-12-01 14:36:44 +01:00
Jeffrey Stendert bad3c6770a Update
keep it clean as ```async.lua``` is been shared so it should be a shared script and not server/client
2020-11-30 14:13:21 +01:00
HypeLevels d336bf2527 Update config.lua
Changed the default language to be English as it is the universal language.
2020-11-28 22:30:18 +00:00
HypeLevels 5318bb8a05 Update config.lua
Changed the default language to be English as it is the universal language.
2020-11-28 22:29:24 +00:00
HypeLevels 69e13ecbf0 Update config.lua 2020-11-28 22:28:59 +00:00
HypeLevels 3266d0f69c Update config.lua
Changed the default language to be English as it is the universal language.
2020-11-28 22:28:21 +00:00
HypeLevels 81aa4728e2 Update config.lua
Changed the default language to be English as it is the universal language.
2020-11-28 22:27:05 +00:00
HypeLevels 23027ee95a Update config.lua
Changed the default language to be English it is the universal language.
2020-11-28 22:26:18 +00:00
HypeLevels 4f7653abe7 Update config.lua
Changed the default language to be English it is the universal language.
2020-11-28 22:25:52 +00:00
Pained_Psyche 193708edb6 widened the range for face blending weight values, fixed an incorrect value when updating makeup color 2020-11-18 14:00:37 +01:00
P0Xyio 1367f5ebaa even better way to fix bug with duplicating money and weapons
In my solution, I check if player has weapon/money that officers might want to take server-side. Previous solutions were vulnerable e.g. if two or more officers were searching one player and all took weapon or money at the same time, they would all get that items.
2020-11-17 11:42:04 +00:00
João Pedro Correia 472e74c087 Update sv.lua 2020-11-16 19:29:14 +00:00
João Pedro Correia e6b46a25c7 Update pl.lua 2020-11-16 19:28:43 +00:00
João Pedro Correia 3b9328bfc4 Update fr.lua 2020-11-16 19:28:23 +00:00