Commit Graph

705 Commits

Author SHA1 Message Date
Damen
438e25e7d7 attempt to fix casino point theft 2019-04-10 12:06:10 -04:00
Damen
6894da91be adds SFPD protection for cops 2019-04-09 23:06:20 -04:00
Damen
0922f8d8a0 add new player LEO arresting support 2019-04-09 22:22:50 -04:00
Damen
43303726de adds 'hide gambling win msgs' setting in cp 2019-04-09 01:40:28 -04:00
Damen
c95767b7fa removes ability to use /perks will in army vehicles 2019-04-09 01:06:06 -04:00
Damen
9fc85cc224 Name Directed Adjustments
Changed names to Damen instead of Lorenc for issues.
2019-04-07 20:49:40 -04:00
Damen
ca1965b9e9 Adds /disableemp 2019-04-06 23:15:20 -04:00
Damen
cb64786cff Adjusts Stephanie's Messages & Adds Changelog 2019-04-06 02:39:46 -04:00
Lorenc Pekaj
b1b31ea891 remove buggy returnplayerhealth 2019-04-06 13:05:20 +11:00
Damen
c07b0e362d Removes Passive Mode, Creates Health Check when Arresting, and Adjusts Below Sea Level Value
- Removes Passive Mode from the game, while keeping the Spawn Kill Protection.
- Creates a Health Check on the Victim when attempted to be affected by a LEO command (taze, cuff, arrest)
- Adjusts the value return of 'IsPlayerBelowSeaLevel' to ensure that you can still use vehicle commands when the waves flow around.
2019-04-04 01:20:00 -04:00
Damen DeBerry
213102ca21 fixes the ID reset for weed buy 2019-03-20 02:05:04 +00:00
Lorenc Pekaj
4f71af4c99 Merge branch 'master' of ssh://bitbucket.org/lorenc/cnr 2019-03-02 14:58:26 +11:00
Stev
41055198ad removes the ability to consume a health pickup if over 100 health - Damen 2019-03-01 22:21:06 +00:00
Stev
3e410a67c4 fixes the gps server msg's color formatting if house title has hex in it - Damen 2019-03-01 22:18:51 +00:00
Stev
81c52f3b3f fixes q to avoid arrest for admins spectating - Damen 2019-03-01 22:15:14 +00:00
Stev
a304a00ede attempts to fix pool issue - Damen 2019-03-01 22:12:42 +00:00
Lorenc Pekaj
8d6a2921e8 remove debug lines 2019-02-28 20:01:59 +11:00
Lorenc Pekaj
3110d394a0 update br stock name 2019-02-26 22:45:38 +11:00
Lorenc Pekaj
e316e5047a possible fix with seasonal data resetting 2019-02-25 22:52:29 +11:00
Lorenc Pekaj
cfcd55dc73 no wanted ppl in br 2019-02-24 20:56:03 +11:00
Lorenc Pekaj
de05b615a6 civ only minigame 2019-02-24 20:51:57 +11:00
Lorenc Pekaj
7a3d082a4b fixes more battle royale bugs 2019-02-24 20:41:06 +11:00
Lorenc Pekaj
7cdc3ac697 ignore market maker account 2019-02-24 19:58:26 +11:00
Lorenc Pekaj
ec67f55a86 If a stock drops more than 80%, its shareholders will lose 20% of its shares. 2019-02-24 19:55:14 +11:00
Lorenc Pekaj
691baa0dbb remove debug message 2019-02-24 18:19:43 +11:00
Lorenc Pekaj
909e3c9cdb hide some objects 2019-02-24 18:16:59 +11:00
Lorenc Pekaj
b38129b006 disable free vip on email email confirm 2019-02-24 17:24:25 +11:00
Lorenc Pekaj
01d0b29514 drop weapons in BR 2019-02-24 17:06:13 +11:00
Lorenc Pekaj
99b1717ab8 remove broken hide from passive code & add vw support 2019-02-24 17:05:43 +11:00
Lorenc Pekaj
795b93bb20 rename walking weapon to running 2019-02-24 09:26:50 +11:00
Lorenc Pekaj
982007fbd3 fix minor bug with battle royale lobby name 2019-02-23 19:39:28 +11:00
Lorenc Pekaj
6929b4a653 cannot leave battle royale unless spawned 2019-02-23 19:27:08 +11:00
Lorenc Pekaj
5a166dbfa5 add comment 2019-02-23 19:26:05 +11:00
Lorenc Pekaj
5fe215beed disable happy hour configuration 2019-02-23 19:22:36 +11:00
Lorenc Pekaj
398f4c8ece remove non-cac players in a cac lobby 2019-02-23 19:22:24 +11:00
Lorenc Pekaj
ddf01fbe13 fix atm angle 2019-02-23 19:15:27 +11:00
Lorenc Pekaj
4e7d6f1906 fix issue with donation goal percentage not loading 2019-02-23 19:11:33 +11:00
Lorenc Pekaj
791fbfce12 atm at stadium 2019-02-23 19:05:09 +11:00
Lorenc Pekaj
6afea53a89 auto kill afk player out of area 2019-02-23 18:42:08 +11:00
Lorenc Pekaj
9aab082d92 prevent games from being started when started already 2019-02-23 18:36:32 +11:00
Lorenc Pekaj
4ddacb8912 fix client message 2019-02-23 18:33:59 +11:00
Lorenc Pekaj
3432324b62 add airdrops 2019-02-23 18:27:19 +11:00
Lorenc Pekaj
80df4cad1c use andromada for plane object 2019-02-21 19:57:29 +11:00
Lorenc Pekaj
86f4592af1 attempt to fix full rotation force throw bug 2019-02-18 20:56:20 +11:00
Lorenc Pekaj
93133775dc debug messages + force throw player out 2019-02-18 20:31:46 +11:00
Stev
dab9197012 disabling some commands for battle royale 2019-02-17 21:13:32 +00:00
Lorenc Pekaj
7c784f8d3f fix previous turf issue 2019-02-18 00:29:53 +11:00
Lorenc Pekaj
08131d4e92 raise player limit + fix remaining player bug 2019-02-18 00:23:09 +11:00
Lorenc Pekaj
e88d6ffb20 allow spawn protection to be disabled while setting a specific health 2019-02-18 00:01:37 +11:00
Lorenc Pekaj
7e7ab281e3 fixes with battle royale 2019-02-18 00:01:22 +11:00
Lorenc Pekaj
606a3e3ee0 change foreach style on br royale player iterator 2019-02-17 23:10:38 +11:00
Lorenc Pekaj
7e24727c80 fix br gps 2019-02-17 23:10:21 +11:00
Lorenc Pekaj
f1adc8e80d BR fixes 2019-02-17 21:06:52 +11:00
Lorenc Pekaj
9e9c4e16c3 add br to gps 2019-02-17 21:06:34 +11:00
Lorenc Pekaj
e3a0d3d0d2 start game in br edit 2019-02-17 19:49:47 +11:00
Lorenc Pekaj
dc0ba63432 remove melee 2019-02-17 19:03:59 +11:00
Lorenc Pekaj
e7aab90583 add stock 2019-02-17 18:58:21 +11:00
Lorenc Pekaj
24364d6c2d message/prize fixes 2019-02-17 18:22:58 +11:00
Lorenc Pekaj
9cedfbde13 disable walls 2019-02-17 17:12:10 +11:00
Lorenc Pekaj
46a8566dab fix messages 2019-02-17 17:09:35 +11:00
Lorenc Pekaj
dcbadc71dd add more areas 2019-02-17 17:03:27 +11:00
Lorenc Pekaj
2ccd65f172 pickups work, prize pool donate, hide player nametags/cp 2019-02-17 16:03:58 +11:00
Lorenc Pekaj
3a38d75a16 store the gangzone areas into an iterator and use iter_next 2019-02-17 16:01:31 +11:00
Lorenc Pekaj
0cf9853cd7 add donate feature 2019-02-17 12:57:19 +11:00
Lorenc Pekaj
04fca32882 lobby area 2019-02-17 12:25:50 +11:00
Lorenc Pekaj
d45a8e539a invisible walls 2019-02-17 10:29:14 +11:00
Lorenc Pekaj
46554c9417 hide fires on spawn 2019-02-17 10:28:58 +11:00
Lorenc Pekaj
dcfcc35d63 adjust height / hide cps/labels/stuff 2019-02-10 19:20:24 +11:00
Lorenc Pekaj
c6449359e5 destroy entities if exist 2019-02-10 17:21:36 +11:00
Lorenc Pekaj
f54d560244 preset health/armour 2019-02-10 17:17:15 +11:00
Lorenc Pekaj
7b84857a1e add random bombing + start game mechansim 2019-02-10 17:09:15 +11:00
Lorenc Pekaj
4278df30f1 generate random pickup loc and vehicle loc 2019-02-10 12:40:37 +11:00
Lorenc Pekaj
7e135971b7 make gangzone and walls shrink over time 2019-02-10 11:48:47 +11:00
Lorenc Pekaj
66d4295aef create border walls for the area 2019-02-10 00:17:46 +11:00
Lorenc Pekaj
ee210e82a4 plane rotation 2019-02-09 19:45:37 +11:00
Lorenc Pekaj
83cf6a37ba fix edit lobby 2019-02-09 13:27:00 +11:00
Lorenc Pekaj
2ef9f24062 edit area & validation checks 2019-02-06 22:09:44 +11:00
Lorenc Pekaj
a92ce1182c check if player has cash for the entry fee, then debit 2019-02-06 21:58:20 +11:00
Lorenc Pekaj
9448d03b5a edit lobby fields 2019-02-06 21:51:48 +11:00
Lorenc Pekaj
6ead3f3650 start on lobby creation methods / variables 2019-02-05 21:02:23 +11:00
Lorenc Pekaj
81bbfcc82c initial commit battle royale 2019-02-05 20:03:08 +11:00
Lorenc Pekaj
5667a0d870 fix tiny error 2019-02-03 21:29:43 +11:00
Lorenc Pekaj
f8516870c2 fix kova bugs 2019-02-03 21:26:15 +11:00
Marin Kovač
f3849a6a86 Merged in gps-vehicle-atm-command (pull request #70)
/gps vehicle/atm
2019-02-03 09:27:16 +00:00
Crova
a15fa28382 Sexying the code 2019-02-03 10:25:33 +01:00
Crova
406d705ae1 Interior check, vehicle id validation 2019-02-03 10:13:39 +01:00
Crova
bb530eb1c9 /gps vehicle/atm 2019-02-03 09:12:45 +01:00
Damen DeBerry
28cfde8b08 Merged in bug-fixes-x (pull request #69)
Hotfix
2019-01-28 01:16:58 +00:00
Damen
52d26259ab further hotfix to dropweapon 2019-01-27 20:16:21 -05:00
Damen DeBerry
f01bb11459 Merged in bug-fixes-x (pull request #68)
Hotfixes
2019-01-28 00:51:12 +00:00
Damen
199d7734d5 hotfixes for arresting and dropweapon 2019-01-27 18:22:06 -05:00
Damen DeBerry
50b3cdd6ed Merged in bug-fixes-x (pull request #66)
Bug Fixes
2019-01-27 04:02:08 +00:00
Damen
ca0c93bb37 more adjustments based on comments 2019-01-26 22:45:00 -05:00
Damen
7278d113f5 adjustments made per comments and testing 2019-01-25 19:41:05 -05:00
Damen
f14e571fb8 fixes info pickup text type for meth van 2019-01-25 02:50:27 -05:00
Damen
8e7e3ce2b8 adds awarding nearest leo whenever quit to avoid or afk wanted, adds checkpoint checks to ensure no-one goes into an interior to q to avoid 2019-01-25 02:47:01 -05:00
Damen
0291b7ddec removes the ability for passive players to enter business vehicles 2019-01-25 01:33:31 -05:00
Damen
3a5a562b8e adjusts passives with association to wanted players and vehicles, including some fixes 2019-01-25 01:04:20 -05:00
Damen
00beb49466 removes the ability for LEOs to purchase a chainsaw, while also reworking certain functions to make them more accessible for global use 2019-01-25 00:18:07 -05:00
Damen
b9066187e6 removes player from player-owned Journeys when they disconnect 2019-01-25 00:02:36 -05:00
Damen
44ccbd825d removes the ability to use player-owned vehicle commands in a vehicle underwater 2019-01-24 23:47:47 -05:00
Damen
ba54a9f72d adjusts the migration error to fix developing work, removes the ability to use animations while using a parachute, fixes weed error OnPlayerDisconnect, removes the ability to gain IC while doing an animation, removes the ability to send IC to spectating admins, adds a variable setter OnPlayerConnect to remove the ability to relog to skip the cooldown timer for Dirty Mechanic 2019-01-24 23:39:34 -05:00
Steven Howard
a024d7da66 Merged master into bug-fixes 2019-01-23 20:33:50 +00:00
Lorenc Pekaj
2cf0111d75 address warning with Weed_ResetSellingProperties 2019-01-20 11:15:21 +11:00
Lorenc Pekaj
4da941cd09 reset selling properties weed 2019-01-20 11:14:44 +11:00
Marin Kovač
bf94e5f763 Merged in weed-param (pull request #53)
Weed sell price param
2019-01-19 23:28:55 +00:00
Crova
ea176e5928 Removes tax from weed sell/buy 2019-01-19 15:19:37 +01:00
Stev
0682e46559 increasing business production dialog 2019-01-19 13:18:18 +00:00
Crova
6841aa1ee1 Private Rich's casino + actors 2019-01-18 21:57:26 +01:00
Damen DeBerry
936d13a6e2 Merged in minor-adjustments (pull request #58)
Minor adjustments
2019-01-18 10:53:57 +00:00
Damen
06fe16d774 add casino damage fix 2019-01-17 20:48:57 -05:00
Damen
a176b9a701 adds check to fix casino damaging players 2019-01-17 20:39:47 -05:00
Damen
bf74d61c67 adjusts speed to attempt pool fix, per owen 2019-01-17 00:31:18 -05:00
Lorenc Pekaj
d1e58ea2aa use player bank getters & setters instead of variable directly 2019-01-16 18:47:31 +11:00
Damen DeBerry
3c04ee5608 Merged in minor-adjustments (pull request #57)
Minor Adjustments
2019-01-16 07:36:10 +00:00
Damen
d78b8dbd3e removes a line i accidentally added when removing timer on arrest 2019-01-16 00:15:29 -05:00
Damen
b10f171af1 adjusts pool timer to attempt physics fix, updates updates.txt 2019-01-15 22:45:11 -05:00
Damen
c78e61e6c7 moves breakout cmd to jail module, adjusts breakcuff success rate 2019-01-15 22:31:15 -05:00
Damen
687bd240f0 fixes bank money saving, moves into it's own function, removes sm limit, increases ic limit to 10,000 2019-01-15 18:04:57 -05:00
Stev
9b3f6f91c7 removing breakcuff code from main into arrest module 2019-01-14 19:54:57 +00:00
Crova
22ae95ca6d Weed sell price param 2019-01-14 12:51:48 +01:00
Lorenc Pekaj
001c387cfb move breakcuff code to module arrest.pwn 2019-01-14 20:39:32 +11:00
Damen
0348faf02d adjusts pool timer from 30 to 25 in attempt to fix physics bug, thought per Owen 2019-01-13 22:20:01 -05:00
Damen
9bc63471cb adds KillTimer for arrest, forgot to do when re-did branch 2019-01-13 01:15:48 -05:00
Damen
7eae2186a5 reworks bc, fixes firework purchase, adjusts jail-multiplier 2019-01-13 01:07:16 -05:00
Lorenc Pekaj
1b5c54dc2d /updatedonategoal for lead maintainer to variably adjust the donation requirement per month 2019-01-12 22:27:45 +11:00
Lorenc Pekaj
bf3a2ba9e5 remove debug stuff on the redeem code 2019-01-06 18:49:59 +11:00
Lorenc Pekaj
7ee91d8e6d show % of month funding at the top 2019-01-06 12:06:01 +11:00
Damen
7ce386e6f9 updates business production label upon supply purchases 2019-01-02 13:42:19 -05:00
Lorenc Pekaj
4aedc7dd5c use jail function in place of variable 2019-01-02 18:54:19 +11:00
Damen
f835bca30e adds jail check to sync command 2019-01-02 01:07:25 -05:00
Lorenc Pekaj
9e699d8f9e move billboards and trolley vehicles into its own modules 2019-01-02 03:09:36 +11:00
Lorenc Pekaj
1427fc0196 move game day code into its own module 2019-01-02 02:51:02 +11:00
Lorenc Pekaj
16b12b4610 code cleanup 2019-01-02 02:37:45 +11:00
Lorenc Pekaj
0ccc26dbe4 move enterable shamal code to module 2019-01-02 01:11:47 +11:00
Lorenc Pekaj
692f58a1f5 move global taxing into its own module 2019-01-02 00:57:26 +11:00
Lorenc Pekaj
f1b41098c3 move house, biz, entrance cp handling into module 2019-01-02 00:51:00 +11:00
Lorenc Pekaj
e33b7916ff make NYE feature a tiny bit more pretty for another year 2019-01-02 00:36:14 +11:00
Lorenc Pekaj
f700d2051b modulize banning, registration, login 2019-01-02 00:19:17 +11:00
Lorenc Pekaj
304881b123 remove auto-save feature because it is already automatic now 2019-01-01 22:46:57 +11:00
Lorenc Pekaj
df6c8385b6 gang bank module cleanup 2019-01-01 22:34:25 +11:00
Lorenc Pekaj
bdb6bda5bc * move gang bank, player bank into its own modules
* save player money each time a cash flow occurs (beta)
2019-01-01 22:33:06 +11:00
Lorenc Pekaj
615dd8f7ab move ticket code into its own module cop/ticket.pwn 2019-01-01 18:20:43 +11:00
Lorenc Pekaj
8875c7654c place bail code in cop/bail.pwn 2019-01-01 18:13:42 +11:00
Lorenc Pekaj
48f1ececb9 fix broken module 2019-01-01 17:55:07 +11:00
Lorenc Pekaj
89ba340c28 move player note associated code to vip/player_note.pwn 2019-01-01 17:54:34 +11:00
Lorenc Pekaj
e2c168561e move player togglable textdraw stuff to module 2019-01-01 17:27:00 +11:00
Damen
109b62c8cf removes ability to obtain a knife legitimately within the server 2018-12-28 00:18:04 -05:00
Lorenc Pekaj
8d23fa1c90 use on server update for nye timer 2018-12-27 18:30:50 +11:00
Lorenc Pekaj
6b2aecf757 remove box color on nye textdraws 2018-12-27 18:26:13 +11:00
Lorenc Pekaj
d9129b600c fixed issue with player chat message not sending if option enabled 2018-12-27 18:08:12 +11:00
Lorenc Pekaj
0be53aab7c making use of TogglePlayerSetting instead of DisablePassiveMode 2018-12-27 12:51:45 +11:00
Damen DeBerry
30b9846d10 Merged in passive-adjustment (pull request #37)
Passive Removal and LEO-Innocent Attacking Protection
2018-12-27 01:46:23 +00:00
Lorenc Pekaj
4c9b65adb0 create TogglePlayerSetting for future use 2018-12-27 12:46:00 +11:00
Lorenc Pekaj
d92241ca20 typo fixes 2018-12-27 00:01:41 +11:00
Lorenc Pekaj
48aa543433 disable xmas update, enable new years module 2018-12-26 23:57:45 +11:00
Stev
0bff900b1b fixes the business member management (removing from business) 2018-12-26 11:08:50 +00:00
Stev
af8fad34ed displaying ID in global chat changeable in settings /cp 2018-12-26 10:02:48 +00:00
Damen
e22aa5022b removes passive dialog selection on account creation, adds passive unable to damage vehicles by weapons, adds leos unable to attack innocent vehicles unles they have wanted players alongside them 2018-12-26 01:11:02 -05:00
Stev
25f67e8bdb Merge branch 'fixes' of https://bitbucket.org/lorenc/cnr into fixes 2018-12-25 22:45:36 +00:00
Stev
9278296ee8 hoping the removing business memebers to be resolved. 2018-12-25 22:45:07 +00:00
Stev
99e1c77bb6 code cleaning 2018-12-25 16:35:25 +00:00
damen
8e2101fad3 adds XP check for firetruck usage 2018-12-25 01:59:13 -05:00
Stev
65fd8ac780 disables spawn protection in pb 2018-12-24 18:22:55 +00:00
Stev
c9464706ef leader detection inside offlinekick 2018-12-23 22:45:15 +00:00
Stev
9b44be62cc co-leaders can use /gang offlinekick 2018-12-23 22:43:43 +00:00
Stev
d1dae5376f fixes /gang offlinekick 2018-12-23 22:11:49 +00:00
Stev
424cb20991 fixes alcatrax checkpoint for mining 2018-12-23 21:11:50 +00:00
Lorenc Pekaj
d2d0bfd8f7 place constants where fit on functions 2018-12-23 17:26:46 +11:00
Lorenc Pekaj
803af66803 move fps code to module 2018-12-23 12:16:55 +11:00
Lorenc Pekaj
98231fdb58 rearrange feature specific modules into appropriate directories 2018-12-23 11:41:04 +11:00
Lorenc Pekaj
50bd48b688 moviemode in its own module 2018-12-23 11:14:28 +11:00
Lorenc Pekaj
4b79a5eba3 move more code associated with vip to its own appropriate modules 2018-12-23 10:58:03 +11:00
Lorenc Pekaj
4cdfb5fd24 move arrest functions to module 2018-12-23 10:19:38 +11:00
Lorenc Pekaj
08e25e4a5b add server rule setting in config.pwn 2018-12-23 10:13:49 +11:00
Lorenc Pekaj
49d646048b automatically check for inactive stocks at the end of a game day 2018-12-23 09:56:48 +11:00
Lorenc Pekaj
2dada2721c help dialog when purchasing a vehicle only shows if it's your first car. 2018-12-23 01:07:28 +11:00
Lorenc Pekaj
671f66f0b8 gang offline kick 2018-12-23 01:05:23 +11:00
Lorenc Pekaj
8d25432f6e made a start on auth modulization but WIP 2018-12-23 00:06:42 +11:00
Lorenc Pekaj
68ca399410 move cop chat into cop/cop_chat.pwn 2018-12-22 23:36:05 +11:00
Lorenc Pekaj
04af1f585e begin modulizing cop features in directory features/cop/ 2018-12-22 23:22:29 +11:00
Lorenc Pekaj
e6996d4bb0 passive mode (and spawn protection) placed in passive_mode.pwn 2018-12-22 23:08:20 +11:00
Lorenc Pekaj
1736bfd849 move turf function into its module 2018-12-22 22:50:21 +11:00
Lorenc Pekaj
82c1d0e1b5 move c4 and jail/alcatraz data into its own modules c4.pwn and jail.pwn 2018-12-22 22:48:58 +11:00
Lorenc Pekaj
a41f69316e move random hits into its own module 2018-12-22 22:13:57 +11:00
Lorenc Pekaj
cdbf5ae2b2 add christmas module (togglable... like ) 2018-12-22 21:26:52 +11:00
Lorenc Pekaj
87468b5e9e add custom physics module to \irresistible\ 2018-12-12 22:51:49 +11:00
Lorenc Pekaj
c5d887bf06 modify header of script to use simple names/aliases 2018-12-12 19:21:57 +11:00
Lorenc Pekaj
6166c34dd7 increase trucking pay 2018-12-09 00:50:13 +11:00
Lorenc Pekaj
b1735de8b1 remove train driver minijob 2018-12-09 00:46:11 +11:00
Lorenc Pekaj
4fd6abb3e6 nerf fireman pay a bit 2018-12-09 00:05:09 +11:00
Steven Howard
309945b6de Merged in bugs (pull request #35)
Bugs
2018-12-04 01:04:01 +00:00
Lorenc Pekaj
23d8a3b4f9 50% of donated capital to stock is used instead of 75% 2018-12-04 00:17:48 +11:00
Lorenc Pekaj
41b68256b8 cleanup 2018-12-04 00:09:08 +11:00
Lorenc Pekaj
8feb261284 bruteforce / breakin automatic when you enter a house 2018-12-04 00:04:12 +11:00
Lorenc Pekaj
395bd7c86f press F to pickup furniture 2018-12-03 23:22:27 +11:00
Lorenc Pekaj
9e9beef18c burglar modulized 2018-12-03 22:15:41 +11:00
Steven Howard
f8e6a45cfe cannon doesn't reset health and weapons now.
fixes http://forum.sfcnr.com/showthread.php?59234-Orbital-canon
2018-12-02 21:16:09 +00:00
Lorenc Pekaj
5ad37f9830 add command to force stocks to be inactive 2018-12-02 22:18:16 +11:00
Steven Howard
ae481b1e81 changed otto cars to wangs cars in gps 2018-12-01 22:33:36 +00:00