Commit Graph

1181 Commits

Author SHA1 Message Date
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
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
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
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
d554a3b6ed update prep 2019-05-08 02:13:39 -04:00
Damen
db1668df46 bug fixes 2019-05-07 15:01:23 -04:00
Damen
41507920af
Merge pull request #6 from basicDamen/takeover
old turf system
2019-05-07 13:28:53 -04:00
Stev
61122e3b9d oldschool turfing system 2019-05-05 22:34:59 +01:00
Lorenc Pekaj
0fe49d8cdc Merge branch 'master' of https://github.com/basicDamen/sf-cnr 2019-05-01 22:41:24 +10: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
Lorenc Pekaj
77e114fa39
call CHEAT_TYPE_CARWARP instead of RAPID_FIRE 2019-04-19 18:10:27 +10:00
Damen
8c59a62a9f adds changelog v11.55.180 2019-04-18 00:40:04 -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
ec2fff0b89
Merge pull request #5 from basicDamen/development
Development
2019-04-14 13:15:35 -04:00
Damen
d759201e8b
Merge branch 'master' into development 2019-04-14 13:15:29 -04:00