Commit Graph

1363 Commits

Author SHA1 Message Date
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
c772fb762b - update changelog 2019-05-31 20:12:22 +10: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
a174f06e41 -- update changelog.txt 2019-05-31 20:03:27 +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
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
Lorenc Pekaj
cd41e5e160
Merge pull request #8 from dusan01/turfs
Turfs bug fix
2019-05-31 18:58:44 +10:00
Dusan
a3be94a4b8 Fixed turf bug 2019-05-31 10:36:46 +02:00
Dusan
71b4d4af8f
Merge pull request #5 from zeelorenc/master
Merge
2019-05-31 09:54:51 +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
Lorenc Pekaj
71f836e77f
Merge pull request #6 from dusan01/master
Change realestate to use cash
2019-05-31 09:10:20 +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
Dusan
974ed41a6f
Merge pull request #4 from zeelorenc/master
Merge
2019-05-30 16:39:45 +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
Dusan
5849267f4e
Merge pull request #3 from zeelorenc/master
Merge
2019-05-30 12:45:08 +02:00
Lorenc Pekaj
62b11ee20a -- update changelog txt 2019-05-30 20:25:32 +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
Lorenc Pekaj
f633bf950c
Merge pull request #5 from dusan01/master
New Discord Channel/Role ID's
2019-05-30 19:39:19 +10:00
Lorenc Pekaj
541bdfdf7f git ignore log 2019-05-30 19:35:04 +10:00
Dusan
9a398d8105 Discord Channel/Role ID's 2019-05-30 11:18:41 +02:00
Dusan
218d77d9f4
Merge pull request #2 from zeelorenc/master
Merge
2019-05-30 11:13:08 +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
Lorenc Pekaj
8af6d44e68
Merge pull request #4 from dusan01/master
Discord Integration
2019-05-30 09:27:05 +10: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
Dusan
306f1b01d5
Merge pull request #1 from zeelorenc/master
Merge
2019-05-29 18:12:54 +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
41fedbd2cb --update changelog 2019-05-29 23:47:10 +10: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
78e65c1408 definitions for cloudys event system 2019-05-29 22:41:44 +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
Lorenc Pekaj
ea4b0d0759 Merge branch 'master' of github.com:zeelorenc/sf-cnr 2019-05-29 21:00:38 +10:00