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 |
|
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 |
|