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

948 Commits

Author SHA1 Message Date
Lorenc Pekaj
6f924f077a reduce fee to 50k for /estate 2019-05-31 19:50:32 +10:00
Lorenc Pekaj
a8db144383 fix migrations 2019-05-31 19:45:38 +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
16382e624e make chatban .sql 2019-05-31 00:31:24 +10: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
Lorenc Pekaj
635e77c341
call CHEAT_TYPE_CARWARP instead of RAPID_FIRE 2019-04-19 18:18:09 +10: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
d947770328 increase house list text for spawn 2019-04-09 01:12:58 -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
Damen
411ede7e5c adds Damen as Lead Maintainer 2019-04-06 00:45:27 -04:00
Lorenc Pekaj
b1b31ea891 remove buggy returnplayerhealth 2019-04-06 13:05:20 +11:00
Lorenc Pekaj
bcd7561e33 Reset undercover, server mainter, etc. 2019-04-04 19:11:12 +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
Lorenc
f5bd610f07
update year + contributor list 2019-04-03 10:08:24 +11: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
395e610e8a delay call by 10ms to avoid foreach premature foreach iterator removals 2019-02-17 23:57: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
2e2c1d1b20 shift soccer stadium and br stadium 2019-02-17 19:49:27 +11:00
Lorenc Pekaj
f4851f9466 random reload ban issue resolve 2019-02-17 19:49:10 +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
Lorenc Pekaj
cb853c1be5 colour older changelogs black 2019-02-03 21:25:56 +11:00
Lorenc Pekaj
750fab8abb Merged in changelog (pull request #71) 
Changelog
 2019-02-03 10:15:18 +00:00
Lorenc Pekaj
a62aae90c4 show changelogs in _changelogs.cfg file 2019-02-03 21:12:41 +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
76b49ebe4b comments out migration file 2019-01-27 19:41:13 -05:00
Damen
199d7734d5 hotfixes for arresting and dropweapon 2019-01-27 18:22:06 -05:00
Lorenc Pekaj
a3eee5ae26 move to scriptfiles/changelogs/cnr 2019-01-27 19:52:42 +11:00
Lorenc Pekaj
a2ee7a830e move changes cmd into cnr/changelog.pwn 2019-01-27 19:29:55 +11: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
5b7dfb7558 Fixes a map bug, being able to rob safes without exploding the gates. 2019-01-19 15:31:44 +01: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
2bc361b896 UC acc addition 2019-01-17 02:09:50 -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