ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,401 Commits 1 Branch 3 Tags 23 MiB
d314639f59
Commit Graph

911 Commits

Author SHA1 Message Date
Dusan
a348fad73d Moved to hote_da_novic.pwn 2019-06-06 10:15:38 +02:00
Lorenc Pekaj
cd1b756235
Merge pull request #28 from dusan01/features/boombox 
Features/boombox
 2019-06-06 09:39:00 +10:00
Dusan
aaa43cacbb Apartment Objects 2019-06-05 20:06:00 +02:00
Dusan
e41883b9a7 Update boom_box.pwn 2019-06-05 19:32:54 +02:00
Dusan
d0c3abf86a Update boom_box.pwn 2019-06-05 15:51:37 +02:00
Dusan
d5f40ba2b6 Boombox wip 2019-06-05 15:51:14 +02:00
Dusan
3e517f0847 Boombox wip 2019-06-05 12:18:56 +02:00
Dusan
46e43f24f8 Boombox [WIP] 2019-06-05 10:51:23 +02:00
Lorenc Pekaj
7f064da883
Merge pull request #27 from dusan01/fixes/meth-rp-xp 
Added XP for meth
 2019-06-05 10:49:10 +10:00
Dusan
9f135df7ba Added XP for meth 2019-06-04 19:13:28 +02:00
Lorenc Pekaj
e9e0703599 update rp xp payouts 2019-06-04 19:15:15 +10:00
Dusan
12d5e3b15b Fireman and Lumberjack XP 2019-06-03 13:51:25 +02:00
Lorenc Pekaj
a7ea5168a8
Merge pull request #25 from meCloudy/patch-10 
Fixes the Quit To Avoid in events
 2019-06-02 22:29:13 +10:00
Cloudy
de946d243f
Update arrest.pwn 2019-06-02 15:26:38 +03:00
Cloudy
928e6fba7b
Update arrest.pwn 2019-06-02 15:20:49 +03:00
Cloudy
5a750d91e9
Update account.pwn 2019-06-02 15:16:44 +03:00
Lorenc Pekaj
4fc0b63bc6
Merge pull request #24 from meCloudy/patch-9 
Changed fishing boats location
 2019-06-02 22:09:31 +10:00
Cloudy
eb318f0467
Event system related 
Criminals who engage with cops then leave the game are no longer considered quitting to avoid.
 2019-06-02 15:03:19 +03:00
Cloudy
80b252e9fb
Fixes player quit to avoid 
No longer awards nearest cop is criminal is in event
 2019-06-02 14:50:15 +03:00
Cloudy
71f6d1d650
Update info_pickups.pwn 2019-06-02 12:03:58 +03:00
Cloudy
e975e2a34c
Changed fishing location 2019-06-02 11:57:23 +03:00
Cloudy
1a7b45c0d6
Adds fishing info pickup. 2019-06-02 11:33:47 +03:00
Lorenc Pekaj
5de5f6bf34 nerf rp experience sell value a bit 2019-06-02 17:11:23 +10:00
Lorenc Pekaj
a8d55d9c6c nerf mining xp per rock 2019-06-02 17:10:29 +10:00
Lorenc Pekaj
fba9840a57 fix typo 2019-06-02 17:10:13 +10:00
Lorenc Pekaj
aedabe2d6b give mining xp for mining the rock 2019-06-02 16:50:57 +10:00
Lorenc Pekaj
7a7aaabeee increase success rate parallel to the player roleplay level 2019-06-02 16:35:56 +10:00
Lorenc Pekaj
53f366c1f8 revert mining chances code 2019-06-02 16:29:45 +10:00
Lorenc Pekaj
f14dfe8951
Merge pull request #22 from ItsStev/roleplay-experience 
Roleplay experience
 2019-06-02 16:25:36 +10:00
Stev
2a5fdb24e0 remove pointless variable 2019-06-02 07:23:04 +01:00
Lorenc Pekaj
0491f4eb9f fix slot spamming win msg 2019-06-02 12:30:16 +10:00
Lorenc Pekaj
d7c0d7c2f4 update hex color embeds with their defs 2019-06-02 12:01:17 +10:00
Lorenc Pekaj
1d7e9e9f73 remove debug msg for stock 2019-06-02 12:01:03 +10:00
Lorenc Pekaj
37daa87f51 add __cloudy_fishing_system def 2019-06-02 11:44:32 +10:00
Lorenc Pekaj
58b40f3af8
Merge pull request #21 from dusan01/features/vip-reformat 
Features/vip reformat
 2019-06-02 11:40:53 +10:00
Lorenc Pekaj
681db77c29
Merge pull request #20 from meCloudy/viewpbchat 
Viewpbchat
 2019-06-02 11:40:03 +10:00
Dusan
cbfc056baf VIP Reformated 
- /vipcmds modified to match ones in /cmds
- /vipcmds moved to msgbox instead of tablist
- /vip now displays all available packages, once you click on one it will show you details about it, if you click on "Buy" it will redirect to IC Market
-
 2019-06-02 00:31:48 +02:00
Cloudy
3b36340f3e Update for /viewpbchat 
Sends a message to all admins who are viewing pb chats.
 2019-06-02 01:11:26 +03:00
Cloudy
097cece224 viewpbchat command 
The command /viewpbchat, enables level 5 admins or higher to view pb lobby chats.
 2019-06-02 01:11:00 +03:00
Cloudy
80637fd0cb Adds /viewpbchat to /acmds 
Adds the new /viewpbchat command to level 5 admin commands list.
 2019-06-02 01:09:57 +03:00
Cloudy
1460db6af7 Adds variable 
Adds the p_TogglePBChat variable to player.pwn
 2019-06-02 01:01:26 +03:00
Cloudy
ee58f1d9d2
Adds fishing boats 2019-06-01 21:55:58 +03:00
Stev
040c4684b0 success rate depending on roleplay level 2019-06-01 17:26:09 +01:00
Stev
a27e3fbc67 changing level array 2019-06-01 15:12:25 +01:00
Stev
8d1486ae4d giving experince for minijobs 2019-06-01 15:09:15 +01:00
Stev
ccfaca5b48 starting roleplay level array 2019-06-01 14:58:56 +01:00
Lorenc Pekaj
3d28606771
Merge pull request #16 from dusan01/features/note-based-lvl5-6-cmds 
Level 5 and 6 note based commands, replacecar and typos
 2019-06-01 22:45:16 +10:00
Dusan
ff4254fd75 Level 5-6 acmds based on note 2019-06-01 14:41:37 +02:00
Lorenc Pekaj
c6eaca88e8 make donation goal between 0 and 10k 2019-06-01 19:52:32 +10:00
Lorenc Pekaj
c519ae54fa clean up help.pwn 2019-06-01 18:28:56 +10:00
Lorenc Pekaj
49660232df update default motd to nothing 2019-06-01 18:27:57 +10:00
Lorenc Pekaj
c9ebbe74e8 restore oldschool class selection 2019-06-01 18:20:48 +10:00
Lorenc Pekaj
8db168b9c8
Merge pull request #14 from ItsStev/duel-system 
duel system tweeks
 2019-06-01 12:01:33 +10:00
Nemesis211
640dd4191d
Adds givearmour for level 5 2019-06-01 01:21:50 +05:00
Stev
af4f9ae4c7 returning dialog menu when setting cac 2019-05-31 19:08:05 +01:00
Stev
faf53995b7 adding CAC only option in duel player 2019-05-31 17:41:51 +01:00
Stev
6b54ff2e13 adding new location for duel 2019-05-31 17:24:06 +01:00
Lorenc Pekaj
a97e30dfcc fix funding goal bug 2019-05-31 21:40:04 +10:00
Lorenc Pekaj
618aedc841
Merge pull request #9 from dusan01/fixes/c4 
Fixed C4 bug
 2019-05-31 21:34:01 +10:00
Lorenc Pekaj
f1902bb219
Merge pull request #10 from dusan01/fixes/admin-commands 
Typos in admin commands
 2019-05-31 21:33:29 +10:00
Dusan
6c94cda69d Chatban global message 2019-05-31 13:20:02 +02:00
Dusan
3e51f450e2 Typos 2019-05-31 12:50:28 +02:00
Dusan
a15157a835 Fixed C4 bug 2019-05-31 12:26:26 +02:00
Lorenc Pekaj
54543b1039 10% bonus pay to cop + rhino vulnerable to damage 2019-05-31 20:12:13 +10:00
Lorenc Pekaj
bd69f60120 fix compile issue 2019-05-31 20:11:39 +10:00
Lorenc Pekaj
3486700dbd if funding goal <= 0.0 - hide the % left 2019-05-31 19:53:49 +10:00
Lorenc Pekaj
6f924f077a reduce fee to 50k for /estate 2019-05-31 19:50:32 +10:00
Lorenc Pekaj
8535d120a4 disable discord by default as per issues by other server owners 2019-05-31 19:28:54 +10:00
Lorenc Pekaj
33de4b0722 fix cloudy merge potential issue 2019-05-31 19:24:56 +10:00
Lorenc Pekaj
e2a3744b3e
Merge pull request #3 from meCloudy/patch-1 
Event related function added
 2019-05-31 19:23:44 +10:00
Dusan
a3be94a4b8 Fixed turf bug 2019-05-31 10:36:46 +02:00
Lorenc Pekaj
8843a3854d
Merge pull request #7 from ItsStev/damage-feed 
moving variable, to ensure objects (above head) will show correctly
 2019-05-31 09:11:25 +10:00
Stev
846d8758b7 moving variable, to ensure objects (above head) will show correctly 2019-05-30 22:21:54 +01:00
Dusan
954fc549d4 Realestate for cash 2019-05-30 16:41:27 +02:00
Lorenc Pekaj
03ac65c92b bronze vip minimum 2019-05-31 00:15:31 +10:00
Lorenc Pekaj
b649050e70 do not attempt to include discord if its disabled 2019-05-30 23:14:55 +10:00
Lorenc Pekaj
2e0e74cc36 rm debug 2019-05-30 22:32:13 +10:00
Lorenc Pekaj
90b731c57a players lose 5% of their stock if a stock drops 80% 2019-05-30 20:24:31 +10:00
Lorenc Pekaj
3313fc3929 update role member id 2019-05-30 19:54:07 +10:00
Dusan
9a398d8105 Discord Channel/Role ID's 2019-05-30 11:18:41 +02:00
Lorenc Pekaj
bd2e7b5b43 make discord relay optional 2019-05-30 19:00:01 +10:00
Cloudy
a2f11b3786
Update jail.pwn 2019-05-30 09:10:05 +03:00
Dusan
80345dd7f5 Typo fix 2019-05-29 21:40:49 +02:00
Dusan
fc49cca074 Discord Integration 
- Server <> Discord chat
- Player commands
- Admin commands
 2019-05-29 21:38:16 +02:00
Cloudy
0af017149f
Update jail.pwn 
Removes player from event upon getting jailed
 2019-05-29 17:38:21 +03:00
Cloudy
bfa237c5e4
Update jail.pwn 2019-05-29 17:34:54 +03:00
Lorenc Pekaj
fe09bbd963 add new event checks compatiable with cloudy's event system 2019-05-29 23:40:57 +10:00
Lorenc Pekaj
1c3fecdc91 add SERVER_OPERATOR setting in config.pwn 2019-05-29 23:05:13 +10:00
Lorenc Pekaj
75386728bf cloudy exclusive modules 2019-05-29 22:20:01 +10:00
Lorenc Pekaj
5d50c0e03c Full turfing reversion to how it was 2019-05-29 22:11:48 +10:00
Lorenc Pekaj
363abbd50a rm unused variable 2019-05-29 21:25:59 +10:00
Damen
f6db784f38 add gang iter count for testing 2019-05-16 22:05:41 -04:00
Damen
a14e8f5a91 Revert "adds facility ITER ID into CP" 
This reverts commit 303461a532.
 2019-05-16 21:54:51 -04:00
Damen
303461a532 adds facility ITER ID into CP 2019-05-16 21:12:29 -04:00
Damen
ba482d834d Revert "Merge pull request #7 from basicDamen/takeover" 
This reverts commit acb3cba0bc, reversing
changes made to 22aeee6494.
 2019-05-14 13:01:01 -04:00
Damen
acb3cba0bc
Merge pull request #7 from basicDamen/takeover 
gang fix merge
 2019-05-14 12:54:56 -04:00
Damen
22aeee6494 all online members, regardless of afk considered for profit on turfs 2019-05-14 12:53:40 -04:00
Stev
ba09b2ad35 try this 2019-05-14 17:52:25 +01:00
Damen
fe089953c4 removes testgang, adds test msg 2019-05-14 12:39:58 -04:00
Damen
9cd09213c3 gang, bobby pins, and ammu 2019-05-13 20:58:38 -04:00
Damen
db1668df46 bug fixes 2019-05-07 15:01:23 -04:00
Stev
61122e3b9d oldschool turfing system 2019-05-05 22:34:59 +01:00
Stev
2f53808c15 old turf system (needs testing) 2019-04-24 21:56:01 +01:00
Damen
ee382460c6 adjusts acmds dialog 2019-04-21 13:14:08 -04:00
Damen
2ceacd18bc eastereggs, detain/bc bug fixes, changelog addition 2019-04-20 11:55:44 -04:00
Damen
81ac231605 removes keypress vehicle spike setting 2019-04-18 00:30:49 -04:00
Damen
f827f3bb89 further rule fixes, reduces bc rate to 50 2019-04-18 00:24:12 -04:00
Damen
a35521c324 adjusts /healall to only do it in caster's world 2019-04-17 23:09:18 -04:00
Damen
1ac960569c gives business bank money upon selling & resets business bank 2019-04-17 20:08:22 -04:00
Damen
4c6b0e9aef fixes getting wanted while spectating a player in alcatraz 2019-04-17 19:54:41 -04:00
Damen
9c15082b3b updates rules function to be dialog based 2019-04-17 19:36:02 -04:00
Damen
64a089e024 adds back /(bc)breakcuffs 2019-04-17 19:29:27 -04:00
Damen
d4ec561a8a Merge branch 'master' of https://github.com/basicDamen/sf-cnr 2019-04-17 19:13:59 -04:00
Damen
89e3c2b85c comments out issue till later fixed 2019-04-17 19:13:56 -04:00
Lorenc Pekaj
dbb33102db
do not deduct seasonal xp from sales (needs test) 2019-04-15 13:41:20 +10:00
Damen
d759201e8b
Merge branch 'master' into development 2019-04-14 13:15:29 -04:00
Damen
a58221cd0f attempts to fix dropoff kicking, again 2019-04-14 13:03:52 -04:00
Damen
16e4fc6942 changes 'xp' in static MOTD to 'vehicles' 2019-04-14 12:43:59 -04:00
Damen
edea5ff259 fixes detained kick on checkpoint 2019-04-14 12:42:54 -04:00
Damen
61dc7abdb9
Merge pull request #2 from basicDamen/city-hardpoint 
moves city hard points
 2019-04-14 10:53:37 -04:00
Lorenc Pekaj
25dc908a59 city hard points 2019-04-14 20:25:16 +10:00
Lorenc Pekaj
50e6920724 adds XP market and /perks based off DM and Robbery XP 2019-04-14 18:41:47 +10:00
Damen
f7655afcc1 optimises IsPlayerDetained function placement 2019-04-11 21:00:08 -04:00
Damen
da2fbe5440 add id requirement to ar system, add back detaining 2019-04-11 20:59:05 -04:00
Damen
56360d06c1 removes MMB arrest, MOTD preset, changelog addition 2019-04-10 13:40:12 -04:00
Damen
7d30117650 adjustments, fixes, etc. 2019-04-10 13:27:53 -04:00
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
654b304d2f adds discord in-game command 2019-04-09 00:55:02 -04:00
Damen
a05da37787 fixes minor /acmds typo 2019-04-08 18:37:52 -04:00
Damen
da68b881cb additions and changes 
- adds /chatban
- adds /chatbanlist
- adds migration file to support chatban
- adjusts admin level commands to reflect new commands and also old
- moves command into correct admin level file
 2019-04-08 01:13:20 -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
Lorenc Pekaj
90d0e6da66 add Paradis3 Home 2019-04-04 18:23:56 +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