Commit Graph
100 Commits
Author SHA1 Message Date
Jim Shield 4bc2aaa95f Re-add terminal item and info 2025-05-21 10:59:07 +01:00
Jim Shield fdf92fde64 fix custom cash register function 2025-05-21 10:49:14 +01:00
Jim Shield 954b208016 add if statement to prop removal, just incase 2025-05-19 15:20:26 +01:00
Jim Shield 51265681c1 Update README.md 2025-05-19 15:16:53 +01:00
Jim Shield 6ab839e2a3 Unify cashregister and terminal commands
This makes `/cashregister` and `/terminal` the same, since they were already.

(I kept both as not to confuse people if one went missing)

`/terminal` originally was added to make use of the `bzzz_terminal` prop and anim, but now it works with both commands if enabled in the config
2025-05-19 15:04:28 +01:00
Jim Shield 9eb2e987d4 Version Bump
`3.0.01` - `3.0.02`
2025-05-14 20:25:05 +01:00
Jim Shield e73520a10c Tidy up the double check for commPercent
Left in the old code for commission calculation

I don't think it was making a difference but it wasn't needed
2025-05-14 20:24:47 +01:00
Jim Shield f869c682c1 fix missing variable for polcharge
Fixes missing variable when using /polcharge and the confirmation option
2025-05-14 20:23:41 +01:00
Jim Shield ca625c50e2 fix duplicate text entry for charging users
Apparently missed this completely, removed the duplicate text entry when not using the list option

this should fix any issues with this
2025-05-14 20:23:03 +01:00
Jim Shield 49f4d404e3 place start functions behind onResourceStart()
ESX helper
2025-05-12 22:49:28 +01:00
Jim Shield 2b92f749b5 Refactor a couple files for readability 2025-05-12 10:49:00 +01:00
Jim Shield 5e80192cef Update fxmanifest.lua to new format
Removes core loading in `fxmanifest.lua` in favour of more "verbose" file loader in jim_bridge v`2.0.08+`
2025-05-10 20:08:03 +01:00
Jim Shield 2eff1996c2 Version bump
`3.0` - `3.0.01`
2025-05-07 23:33:10 +01:00
Jim Shield 29b3b2ffb9 Hopefully fix the error when charging
I think if you had alot of players, it would overload itself and slip in a nil value when checking for player info

This checks if it is a real source number being sent and also adds a slightly delay to help load easier
2025-05-07 15:58:03 +01:00
Jim Shield 5cc7b60a1f fix discord bot yml 2025-05-01 13:37:46 +01:00
Jim Shield 41e146e35a add gitbot yml 2025-05-01 00:19:37 +01:00
Jim Shield 70fefa2a74 Merge pull request #47 from jimathy/v3.0 2025-04-28 18:20:00 +01:00
Jim Shield f2b82e0b8c Create FUNDING.yml 2025-04-13 13:23:37 +01:00
Jim Shield cbc202f101 Create FUNDING.yml + delay loading 2025-04-13 13:14:20 +01:00
Jim Shield ecebdc801e adjust what can and cant be done on other frameworks for now 2025-03-08 21:05:07 +00:00
Jim Shield 10f477982d make use of jim_bridge new banking functions 2025-03-07 13:36:24 +00:00
Jim Shield 62e8242d9e (Beta) Fixes for multiframework features 2025-03-01 12:57:11 +00:00
Jim Shield ef6b664890 Add files via upload 2025-02-22 13:23:43 +00:00
Jim Shield 2ebfeff554 Update 3.0 beta 2025-02-21 13:54:49 +00:00
Jim Shield 38f360fc26 Check for job commission info 2024-01-28 12:29:14 +00:00
Jim Shield a21ea9f1db Add /polcharge support 2024-01-28 12:27:47 +00:00
Jim Shield 0905c7489c v3.0 Beta Push 2024-01-27 21:57:05 +00:00
Jim Shield 84a7f0611e Fix notification error in client.lua 2024-01-17 17:19:10 +00:00
Jim Shield 7b275735f6 Merge pull request #43 from County-Line-Roleplay-server/main 2024-01-10 02:00:16 +00:00
Jim Shield e27f5eef3a Merge pull request #42 from RazerGhost/main 2024-01-10 00:50:35 +00:00
Jim Shield 01f9d1a255 Merge pull request #41 from County-Line-Roleplay-server/main
Corrects Error QB-Banking
2024-01-09 23:58:26 +00:00
Jim Shield 0656afd7f1 Merge pull request #40 from taylorrenee1/main
added ox lib compat to input - may have ended up breaking some things sorry jim :^)
2024-01-09 23:58:10 +00:00
Jim Shield 813c25ad93 Merge pull request #37 from MystrGee/main
Add okokBanking support
2024-01-09 23:57:57 +00:00
Jim Shield ac309a6a07 Merge pull request #36 from McKlean/main
v2.8.7 - QB-Banking support
2023-12-20 01:35:08 +00:00
Jim Shield eb8a17c5c3 Merge pull request #32 from UwUway/main
finish teh push
2023-11-08 21:43:57 +00:00
Jim Shield 065ad75dbd Merge pull request #31 from UwUway/main
add bzz terminal support and command disabling
2023-11-08 21:31:14 +00:00
Jim Shield 7188e36881 Update fxmanifest.lua 2023-09-27 20:25:54 +01:00
Jim Shield 34a1d0d504 Fix image links from jim-mechanic not showing correctly 2023-09-06 19:24:03 +01:00
Jim Shield 92b55d9d2d Merge pull request #28 from taylorrenee1/main
fix(jim-payments): fix support for renewed add support for fd
2023-09-06 17:23:00 +01:00
Jim Shield 4ec75a90fa Merge pull request #20 from Andyauk/main
Management working for gangs and jobs
2023-02-01 09:30:39 +00:00
Jim Shield 71a6d4d7dd Merge pull request #13 from jimathy/v2.8.4
v2.8.4
2022-10-08 19:48:02 +01:00
Jim Shield fc902b34e2 v2.8.4 - Reset default config.lua 2022-10-08 19:46:31 +01:00
Jim Shield 89fa06507b v2.8.4 - Fix logic of the ticket systems 2022-10-08 19:43:57 +01:00
Jim Shield 61e2e6f32e v2.8.4 - Discontinue support for qb-bossmenu 2022-10-08 19:26:21 +01:00
Jim Shield ec40bd5cf1 v2.8.3 - Renewed's QB-Phone support 2022-09-20 21:06:56 +01:00
Jim Shield 70f2ed8005 2.8.2 - Fix renewed banking support + debug prints 2022-09-19 09:20:55 +01:00
Jim Shield f0f5f19af8 v2.8.1 - Support added for Renewed-Banking + lua54 2022-09-18 15:32:10 +01:00
Jim Shield 939026fd68 Revert "Version 1.8.1 - Support added for Renewed Banking"
This reverts commit de4e6ad312.
2022-09-18 15:30:31 +01:00
Jim Shield de4e6ad312 Version 1.8.1 - Support added for Renewed Banking 2022-09-18 15:29:47 +01:00
Jim Shield 492bd53593 locale fix 2022-09-11 22:43:20 +01:00
Jim Shield 10fde7e6da Merge pull request #10 from AbrahamMoody/patch-1
Create de.lua
2022-09-05 22:58:15 +01:00
Jim Shield 2a86032299 Merge pull request #9 from vosscat/main
Locale Support
2022-09-03 20:32:25 +01:00
Jim Shield 92ba44355a Add support for AP-Goverment Tax 2022-09-03 20:25:11 +01:00
Jim Shield 1012e12d1e Support for Ap-Goverment tax 2022-09-03 20:06:37 +01:00
Jim Shield e28975d40b fix script finding no tickets to trade 2022-08-25 17:15:43 +01:00
Jim Shield 235e3d187c Fix ticket amount coming back as nil 2022-08-25 17:10:25 +01:00
Jim Shield 47dfcca052 Fix support for older versions of qb-target 2022-08-23 16:45:53 +01:00
Jim Shield a07382cca3 fix prop location loading 2022-08-23 16:44:55 +01:00
Jim Shield 7b0757214b fucking debug mode 2022-08-22 22:18:42 +01:00
Jim Shield 42f80fae77 Merge pull request #8 from jimathy/jimathy-v2.8-patch
Jimathy v2.8 patch
2022-08-22 22:17:45 +01:00
Jim Shield c9ac3e8bbd remove toggleItem(), not needed 2022-08-22 22:17:19 +01:00
Jim Shield 8fcde5867c triggerNotify() 2022-08-22 22:13:56 +01:00
Jim Shield 6b4c6a6779 keep gks info up to date 2022-08-22 21:58:38 +01:00
Jim Shield 55a25b59ac Add commission to be taken as standard 2022-08-22 21:49:53 +01:00
Jim Shield c136af4244 Fix "till" error on restart 2022-08-22 21:48:36 +01:00
Jim Shield 858c865b8b move server.lua to /server 2022-08-22 21:33:48 +01:00
Jim Shield 2c25faf2af move client.lua to /client 2022-08-22 21:33:39 +01:00
Jim Shield ee2bfaaeca move atmserver.lua to /server 2022-08-22 21:33:27 +01:00
Jim Shield ab1096f977 move atms.lua to /client 2022-08-22 21:33:11 +01:00
Jim Shield 3e9aa9676d Optimize, refactor and tidy 2022-08-22 21:32:15 +01:00
Jim Shield 3117ef68af Fix gks install info 2022-08-03 10:01:38 +01:00
Jim Shield 2c1f1e8573 Small banking changes 2022-07-28 19:35:35 +01:00
Jim Shield d71f3d29ed Add files via upload 2022-07-28 18:34:17 +01:00
Jim Shield df640a1a08 I hate github announces 1 letter changes 2022-07-28 18:06:20 +01:00
Jim Shield 8c1a6a11cc ran out of indents 2022-07-28 18:05:13 +01:00
Jim Shield e2712da4b0 Update README.md 2022-07-28 18:00:45 +01:00
Jim Shield 95eda3b471 Quick rearrange of preview images 2022-07-28 16:00:21 +01:00
Jim Shield 120dae8066 Update README.md 2022-07-28 15:56:57 +01:00
Jim Shield 0990422823 Re-order the config to make more sense 2022-07-28 11:10:00 +01:00
Jim Shield 475ae9f827 typo fix 2022-07-19 14:53:34 +01:00
Jim Shield 9c1953ab92 Custom cash register spawning support built in 2022-07-19 14:52:02 +01:00
Jim Shield d77d23e635 polcharge fixes 2022-07-16 09:21:12 +01:00
Jim Shield 2a67217155 Hotfix for confirmation polcharge's 2022-07-13 18:28:36 +01:00
Jim Shield df43549e08 fucking stay false 2022-07-13 18:12:52 +01:00
Jim Shield 91a0cadad7 Polcharge Commission now taken from society charge 2022-07-13 18:09:08 +01:00
Jim Shield 8cf1de1cf9 server print new society balance in debug mode 2022-07-13 17:36:45 +01:00
Jim Shield b543803194 PolCharge fixes + debug 2022-07-11 19:59:57 +01:00
Jim Shield da1a19eb2c Config options to recommended defaults 2022-07-05 19:55:40 +01:00
Jim Shield 41bedcc6ca /polcharge for police billing + Optimize + Fixes 2022-07-05 19:52:33 +01:00
Jim Shield a4413ea5c6 Stop asking me about gks-phone 2022-07-04 00:04:35 +01:00
Jim Shield 8adf3c3829 Stop giving the charged person tickets 2022-06-22 14:34:24 +01:00
Jim Shield f5753df4b2 rollback notification changes 2022-06-22 14:20:36 +01:00
Jim Shield ec9dc51ccf Quick fix for job tickets 2022-06-21 15:18:01 +01:00
Jim Shield 4b028d75b1 Gang Support in cash registers 2022-06-21 15:11:31 +01:00
Jim Shield 2302ff987b I hate github 2022-06-21 15:11:02 +01:00
Jim Shield d29d2d6904 Gang support for cash regsiters 2022-06-21 15:10:35 +01:00
Jim Shield f535df6b9c Rollback code to fix notification breaking 2022-06-16 00:03:10 +01:00
Jim Shield 170f680ef8 Update/Fix gks install support info 2022-06-15 20:24:38 +01:00
Jim Shield 2fc3b56e22 Rollback 2022-06-10 14:35:46 +01:00
Jim Shield a18db3d6b9 Trying to fix inventory space checks 2022-06-10 14:32:05 +01:00