Commit Graph

642 Commits

Author SHA1 Message Date
Stev
25f67e8bdb Merge branch 'fixes' of https://bitbucket.org/lorenc/cnr into fixes 2018-12-25 22:45:36 +00:00
Stev
9278296ee8 hoping the removing business memebers to be resolved. 2018-12-25 22:45:07 +00:00
Stev
99e1c77bb6 code cleaning 2018-12-25 16:35:25 +00:00
Stev
3504a065d3 reverting the change to fix mute detections. 2018-12-25 16:11:17 +00:00
Crova
afbb67f322 Removes "flying" stairs on Cake's building; http://forum.sfcnr.com/showthread.php?60965-Mapping-BUG 2018-12-25 16:52:22 +01:00
damen
8e2101fad3 adds XP check for firetruck usage 2018-12-25 01:59:13 -05:00
Stev
65fd8ac780 disables spawn protection in pb 2018-12-24 18:22:55 +00:00
Stev
c9464706ef leader detection inside offlinekick 2018-12-23 22:45:15 +00:00
Stev
9b44be62cc co-leaders can use /gang offlinekick 2018-12-23 22:43:43 +00:00
Stev
d1dae5376f fixes /gang offlinekick 2018-12-23 22:11:49 +00:00
Stev
424cb20991 fixes alcatrax checkpoint for mining 2018-12-23 21:11:50 +00:00
Lorenc Pekaj
d2d0bfd8f7 place constants where fit on functions 2018-12-23 17:26:46 +11:00
Lorenc Pekaj
7fe17a317f bug fix with chuff saying random stuff in chat 2018-12-23 12:35:32 +11:00
Lorenc Pekaj
fdd6f4297a rename cmds to stopask stopreport 2018-12-23 12:35:17 +11:00
Lorenc Pekaj
803af66803 move fps code to module 2018-12-23 12:16:55 +11:00
Lorenc Pekaj
98231fdb58 rearrange feature specific modules into appropriate directories 2018-12-23 11:41:04 +11:00
Lorenc Pekaj
50bd48b688 moviemode in its own module 2018-12-23 11:14:28 +11:00
Lorenc Pekaj
4b79a5eba3 move more code associated with vip to its own appropriate modules 2018-12-23 10:58:03 +11:00
Lorenc Pekaj
f9c6250764 twitter command moved to /commands folder 2018-12-23 10:24:17 +11:00
Lorenc Pekaj
02ac789629 move /changes to command module 2018-12-23 10:20:13 +11:00
Lorenc Pekaj
4cdfb5fd24 move arrest functions to module 2018-12-23 10:19:38 +11:00
Lorenc Pekaj
08e25e4a5b add server rule setting in config.pwn 2018-12-23 10:13:49 +11:00
Lorenc Pekaj
49d646048b automatically check for inactive stocks at the end of a game day 2018-12-23 09:56:48 +11:00
Lorenc Pekaj
2dada2721c help dialog when purchasing a vehicle only shows if it's your first car. 2018-12-23 01:07:28 +11:00
Lorenc Pekaj
671f66f0b8 gang offline kick 2018-12-23 01:05:23 +11:00
Lorenc Pekaj
de8cca84be moving admins cmd's into _admin.pwn 2018-12-23 00:56:55 +11:00
Lorenc Pekaj
8d25432f6e made a start on auth modulization but WIP 2018-12-23 00:06:42 +11:00
Lorenc Pekaj
c0ecf96158 move discord commands / functionality to cnr/discord/ 2018-12-22 23:53:42 +11:00
Lorenc Pekaj
68ca399410 move cop chat into cop/cop_chat.pwn 2018-12-22 23:36:05 +11:00
Lorenc Pekaj
04af1f585e begin modulizing cop features in directory features/cop/ 2018-12-22 23:22:29 +11:00
Lorenc Pekaj
e6996d4bb0 passive mode (and spawn protection) placed in passive_mode.pwn 2018-12-22 23:08:20 +11:00
Lorenc Pekaj
1736bfd849 move turf function into its module 2018-12-22 22:50:21 +11:00
Lorenc Pekaj
82c1d0e1b5 move c4 and jail/alcatraz data into its own modules c4.pwn and jail.pwn 2018-12-22 22:48:58 +11:00
Lorenc Pekaj
a41f69316e move random hits into its own module 2018-12-22 22:13:57 +11:00
Lorenc Pekaj
641cc82753 move some more vip code into appropriate modules 2018-12-22 22:08:05 +11:00
Lorenc Pekaj
2f793c7a89 move redeem vip code into its own module 2018-12-22 22:01:10 +11:00
Lorenc Pekaj
cdbf5ae2b2 add christmas module (togglable... like ) 2018-12-22 21:26:52 +11:00
Lorenc Pekaj
9f82258469 add player objects 2018-12-18 21:06:13 +11:00
Lorenc Pekaj
8e3b97eb4d alcatraz fixes 2018-12-18 21:06:04 +11:00
Lorenc Pekaj
87468b5e9e add custom physics module to \irresistible\ 2018-12-12 22:51:49 +11:00
Lorenc Pekaj
c5d887bf06 modify header of script to use simple names/aliases 2018-12-12 19:21:57 +11:00
Lorenc Pekaj
6166c34dd7 increase trucking pay 2018-12-09 00:50:13 +11:00
Lorenc Pekaj
b1735de8b1 remove train driver minijob 2018-12-09 00:46:11 +11:00
Lorenc Pekaj
4fd6abb3e6 nerf fireman pay a bit 2018-12-09 00:05:09 +11:00
Lorenc Pekaj
0d78b9ae91 add milky's sewer 2018-12-08 23:39:58 +11:00
Steven Howard
309945b6de Merged in bugs (pull request #35)
Bugs
2018-12-04 01:04:01 +00:00
Lorenc Pekaj
23d8a3b4f9 50% of donated capital to stock is used instead of 75% 2018-12-04 00:17:48 +11:00
Lorenc Pekaj
41b68256b8 cleanup 2018-12-04 00:09:08 +11:00
Lorenc Pekaj
8feb261284 bruteforce / breakin automatic when you enter a house 2018-12-04 00:04:12 +11:00
Lorenc Pekaj
395bd7c86f press F to pickup furniture 2018-12-03 23:22:27 +11:00
Lorenc Pekaj
9e9beef18c burglar modulized 2018-12-03 22:15:41 +11:00
Steven Howard
f8e6a45cfe cannon doesn't reset health and weapons now.
fixes http://forum.sfcnr.com/showthread.php?59234-Orbital-canon
2018-12-02 21:16:09 +00:00
Steven Howard
bc008c3578 should fix the nametag despawning
http://forum.sfcnr.com/showthread.php?60956-nametags-off-doesn-t-keeps-deactivating
2018-12-02 17:19:39 +00:00
Lorenc Pekaj
5ad37f9830 add command to force stocks to be inactive 2018-12-02 22:18:16 +11:00
Lorenc Pekaj
666bd93163 change facility text object 2018-12-02 14:48:12 +11:00
Steven Howard
77a152d929 moving MAX_WANTED_LVL into the correct place 2018-12-01 23:20:56 +00:00
Steven Howard
a5ebc11274 moves ban codes into _admin.pwn 2018-12-01 23:17:05 +00:00
Steven Howard
ae481b1e81 changed otto cars to wangs cars in gps 2018-12-01 22:33:36 +00:00
Steven Howard
b5160ede22 fixes wanted messages format 2018-12-01 22:27:42 +00:00
Steven Howard
9ada0d5400 adds another gps location for ammnation 2018-12-01 21:56:33 +00:00
Steven Howard
fc520ac39b fixes vehicle dealership vehicle spawns
http://forum.sfcnr.com/showthread.php?61472-Vehicle-Dealership-Spawn
2018-11-28 20:24:18 +00:00
Lorenc Pekaj
11e1a9088d fix class bug and inactive gates/biz 2018-11-25 14:39:52 +11:00
Lorenc Pekaj
f1f487a1b8 play cheer noise on hardpoint payout 2018-11-24 05:26:27 +11:00
Lorenc Pekaj
e520129da2 spawn protection fix 2018-11-24 05:22:32 +11:00
Lorenc Pekaj
ce3232c37f visage apartment object removals 2018-11-24 04:59:48 +11:00
Lorenc Pekaj
5351647f95 remove players that are removed from their vehicle 2018-11-24 04:59:38 +11:00
Lorenc Pekaj
455b728258 fix spawn bug with infinite health + allow vip plat to have 2 jobs 2018-11-24 04:15:37 +11:00
Lorenc Pekaj
688d5b9a3f remove ircpm from cmd list 2018-11-24 03:58:41 +11:00
Lorenc Pekaj
ebbfcc59e7 move fireman to its own module and introduce more police skins 2018-11-24 03:47:20 +11:00
Lorenc Pekaj
cc621872c4 remove paramedic and make specific items a minijob (e.g healing in truck/spraycan) 2018-11-24 03:03:45 +11:00
Lorenc Pekaj
27cfffbd77 replace a few criminal jobs with mugger 2018-11-24 02:41:15 +11:00
Steven Howard
5b3b3e4af3 Merged in bugs (pull request #34)
fixes a critical bug with hardpoints, it would restore players health everytime they enter zone
2018-11-22 15:32:36 +00:00
Lorenc Pekaj
fc5d8d086e undercover acc and object update 2018-11-23 01:57:25 +11:00
Steven Howard
633eaa19c8 fixes a critical bug with hardpoints, it would restore players health everytime they enter zone 2018-11-21 21:07:26 +00:00
Lorenc Pekaj
158890715f turf location relocations 2018-11-18 22:41:56 +11:00
Lorenc Pekaj
951a348c44 do not credit free vips assets 2018-11-18 22:41:41 +11:00
Lorenc Pekaj
1f3c3f4f8c add more turfs, number on turfs too (https://forum.sa-mp.com/showthread.php?t=649230), auto disable spawn protection on enter hardpoint 2018-11-18 20:57:12 +11:00
Lorenc Pekaj
42b7c5e87c increase gang vehicle limit, decrease gang vehicle spawn time to 3 min 2018-11-18 20:56:28 +11:00
Lorenc Pekaj
36fa43ff1e aod not counted as a person that can takeover 2018-11-15 01:11:44 +11:00
Lorenc Pekaj
fd8d9655db fix race issue with selecting new leader 2018-11-13 16:06:14 +11:00
Lorenc Pekaj
81f3e5a768 alert passive player he cannot pick up dropped weapons 2018-11-13 16:05:58 +11:00
Lorenc Pekaj
5f12c4a15e force sale the inactive player's stocks 2018-11-11 12:58:57 +11:00
Lorenc Pekaj
8a94df6036 alcatraz fix 2018-11-11 12:42:42 +11:00
Lorenc Pekaj
6db949a51f reduce hardpoint pay 25% 2018-11-11 12:38:26 +11:00
Lorenc Pekaj
99f98a2101 raise max market cap on stocks 2018-11-11 12:29:41 +11:00
Steven Howard
50567719f1 Merged in bugs (pull request #33)
Bugs
2018-11-10 16:21:40 +00:00
Steven Howard
d5236f4bb8 pilot difficulty "hard" should only give wanted level. 2018-11-10 11:32:01 +00:00
Steven Howard
1694d90a14 business production dialogue addiction of bank balance 2018-11-10 11:30:22 +00:00
Steven Howard
8f6621524b playing hitmarker sound when player is spectating 2018-11-10 10:17:08 +00:00
Steven Howard
7197c3289b passive players will not be able to pick up weapon, ammo and money drops. 2018-11-10 09:56:47 +00:00
Lorenc Pekaj
43974bf30c cannon will kill people on a hill too (up to 20 m below target area) 2018-11-10 19:39:22 +11:00
Lorenc Pekaj
2f6202a4a0 maximum player can drop is $25K 2018-11-10 18:02:57 +11:00
Lorenc Pekaj
821c034e7d fix race outrun sync 2018-11-10 18:00:10 +11:00
Lorenc Pekaj
810af12771 use average player count for potential winnings and show map icon 2018-11-10 17:57:54 +11:00
Lorenc Pekaj
f406fb5139 veh dealership mcap increase 2018-11-10 14:46:05 +11:00
Lorenc Pekaj
dfbd7eb780 fix gang vehicles 2018-11-10 14:44:23 +11:00
Lorenc Pekaj
67e0d99db7 hardpoint 2018-11-10 14:44:16 +11:00
Steven Howard
632ddd1e2c wanted level when killing in duel change 2018-11-09 19:18:14 +00:00
Lorenc Pekaj
8f8c7bfe0f initial hardpoint beta 2018-11-10 03:02:14 +11:00
Lorenc Pekaj
32e8e45d4b fix possible shares issue 2018-11-09 18:52:48 +11:00
Lorenc Pekaj
7dc93e5023 fix reward point issue 2018-11-09 18:50:58 +11:00
Lorenc Pekaj
d83e0c3120 modulize the rewards point system 2018-11-09 18:33:38 +11:00
Lorenc Pekaj
da98f1c20a address issue with bank hiest available in random shops 2018-11-09 17:49:38 +11:00
Lorenc Pekaj
9e70458953 allow only gang leaders to mod gang vehicles 2018-11-09 15:46:03 +11:00
Lorenc Pekaj
6a0ab57505 prevent occupied gang vehicle from being spawned 2018-11-09 15:45:07 +11:00
Lorenc Pekaj
65dd9d68d0 remove debug statement 2018-11-09 15:32:29 +11:00
Lorenc Pekaj
286d6b6332 remove pool debug msg 2018-11-09 15:31:29 +11:00
Lorenc Pekaj
d269546bbf fix visage apartment ownership transfer 2018-11-09 15:31:02 +11:00
Lorenc Pekaj
13331cc67d fix styling with vd dialog 2018-11-09 15:28:35 +11:00
Lorenc Pekaj
78addfe4e2 increase vehicle dealership price 2018-11-09 15:16:50 +11:00
Lorenc Pekaj
61519f8370 little cleanup 2018-11-09 15:16:41 +11:00
Lorenc Pekaj
732d7a7e92 add buying/selling/mod updating/spawning vehicle in facility 2018-11-09 15:04:38 +11:00
Lorenc Pekaj
8156e1749e add mechanic into the facilities with a checkpoint 2018-11-08 22:57:02 +11:00
Lorenc Pekaj
3947176508 init 2018-11-08 21:34:54 +11:00
Lorenc Pekaj
2edbc681b6 delete useless stock module 2018-11-08 21:09:31 +11:00
Lorenc Pekaj
5987d60fff use physics_dynamic.inc for pool (https://github.com/zeelorenc/Object-Physics) - support multiple interiors 2018-11-08 18:20:40 +11:00
Lorenc Pekaj
7b4cd776de update $ET description 2018-11-08 12:11:50 +11:00
Lorenc Pekaj
ec431ad43a add pilot stock 2018-11-07 19:51:46 +11:00
Lorenc Pekaj
5ed2066e42 fix season rank in stats 2018-11-07 19:24:24 +11:00
Lorenc Pekaj
43e5b8bd7e users can now donate to stocks to prop them out (25% taxed) 2018-11-07 19:24:00 +11:00
Lorenc Pekaj
d9ce70f323 if max shares are increased from the IPO, it will be factored into the price 2018-11-07 18:10:36 +11:00
Lorenc Pekaj
78a597d606 fix market cap issue 2018-11-07 12:21:47 +11:00
Lorenc Pekaj
c4542f41aa Increase dividends for casino and government by a bit 2018-11-07 12:15:30 +11:00
Lorenc Pekaj
ea6dce5a41 show shares in sell orders (/shares) and cancel thru that command 2018-11-07 12:07:12 +11:00
Lorenc Pekaj
d4c03f4119 use huge string for shareholders 2018-11-06 15:40:20 +11:00
Lorenc Pekaj
349a8e4a27 show shareholders of stock 2018-11-06 15:24:24 +11:00
Lorenc Pekaj
caeae457ac reduce the floor of stock prices significantly 2018-11-06 14:02:11 +11:00
Lorenc Pekaj
6a297cd163 increase casino shareholding earnings by a bit ... and exaggerate their price factor for every 100k earnings 2018-11-06 13:52:23 +11:00
Lorenc Pekaj
1139f4e92e disable /sync in passive mode 2018-11-05 10:49:23 +11:00
Lorenc Pekaj
b09f52b4fb fix potential market issues with selling while not logged in 2018-11-05 10:33:37 +11:00
Lorenc Pekaj
baed9eb28c Add government and casino stocks. 2018-11-05 10:23:38 +11:00
Lorenc Pekaj
f503224775 fireworks and explosive rounds available at supa/ammunation 2018-11-04 19:24:55 +11:00
Lorenc Pekaj
c836d256b1 server maintainers ignored in kickall 2018-11-03 16:26:40 +11:00
Lorenc Pekaj
e2837265a9 Pawn store stock for burglars 2018-11-03 16:21:56 +11:00
Lorenc Pekaj
6e54f16ed6 add veh dealership, trucking company, cluckin bell stocks 2018-11-03 16:06:58 +11:00
Lorenc Pekaj
89bc99d7d5 remove ploughs 2018-11-03 16:04:28 +11:00
Lorenc Pekaj
75e4ead544 add ammunation company and fix a lot of stock market related bugs 2018-11-02 09:57:08 +11:00
Lorenc Pekaj
3fcf35fc9a fix potential mining bug that allowed mining two rocks at a time? 2018-11-02 09:52:13 +11:00
Lorenc Pekaj
cb6c7475a5 drop only 10% of players wealth 2018-11-01 21:58:24 +11:00
Lorenc Pekaj
c964914a97 Add ammu-nation stock (reliant on ammu sales) 2018-11-01 21:55:21 +11:00
Lorenc Pekaj
f3afaa9af4 remove some useless hq 2018-11-01 17:49:29 +11:00
Lorenc Pekaj
469e8ac865 stock market edits 2018-11-01 17:48:25 +11:00
Lorenc Pekaj
90cdbd9816 add trade log 2018-10-31 20:05:47 +11:00
Lorenc Pekaj
7645f3f8e8 create two reports by default when a new company is made 2018-10-31 19:04:59 +11:00
Lorenc Pekaj
8ad01c0b0f crushing ores at alca contributes to mining company 2018-10-31 19:03:24 +11:00
Lorenc Pekaj
2ad6e41dd8 add trading fee 2018-10-31 19:01:35 +11:00
Lorenc Pekaj
4cb9be95fb fix some dividend pool issue 2018-10-31 18:34:50 +11:00
Lorenc Pekaj
ae01993db4 - add sell feature
- add basic pricing mechanism
2018-10-31 18:19:18 +11:00
Lorenc Pekaj
c616c94359 dividend payout implementation 2018-10-31 09:42:10 +11:00
Lorenc Pekaj
68fc7ad263 add mining stock 2018-10-28 22:34:48 +11:00
Lorenc Pekaj
1d99d05bcb add buy slip functionality with initial market maker ... work on /shares 2018-10-26 11:44:45 +11:00
Lorenc Pekaj
8d8fdc1392 use float for prices, reduce data redundancy 2018-10-26 04:58:12 +11:00
Lorenc Pekaj
b1847fffdf begin base for price of stocks 2018-10-25 08:32:18 +11:00
Lorenc Pekaj
8777a286a0 begin stock market 2018-10-25 01:19:48 +11:00
Lorenc Pekaj
de6b8849f0 vip note user id fix 2018-10-24 22:07:28 +11:00
Lorenc Pekaj
5fd32db86e fix color issue w vip 2018-10-23 00:44:57 +11:00
Lorenc Pekaj
ce81b6917c edit vip description 2018-10-22 23:44:59 +11:00
Lorenc Pekaj
e3a0f389fd adjust /vip 2018-10-22 22:35:55 +11:00
Lorenc Pekaj
050ba05cf2 legacy VIP system implement 2018-10-22 21:50:11 +11:00
Lorenc Pekaj
b80202334f cannot use bank terminal if bank has been robbed 2018-10-22 19:06:18 +11:00
Lorenc Pekaj
9800b8f007 remove help dialog when a player spawns ... fix issue with supa not hiding help dialog 2018-10-22 18:33:10 +11:00
Lorenc Pekaj
a0016cd039 fix biz prod bug... http://forum.sfcnr.com/showthread.php?60820-b-production 2018-10-22 17:29:38 +11:00
Lorenc Pekaj
9626ab84dd fix class selection textdraw issue 2018-10-22 17:11:12 +11:00
Lorenc Pekaj
a64c916637 prevent NPCs from continuing with OnPlayerSpawn 2018-10-22 00:32:10 +11:00
Lorenc Pekaj
98941bbc7f move furniture code to furniture module 2018-10-17 04:34:29 +11:00
Lorenc Pekaj
13ddbb675c move load apt code to apartment module 2018-10-17 04:31:18 +11:00
Lorenc Pekaj
2a90d06d90 move some weapon drop modules 2018-10-17 04:28:47 +11:00
Lorenc Pekaj
0836381de9 update wanted level module description 2018-10-17 04:24:32 +11:00
Lorenc Pekaj
23e21bc109 add car particle spam and player pickup spam into anticheat modules 2018-10-17 04:20:16 +11:00
Lorenc Pekaj
857cff5e7e move hotel da novic into its own module 2018-10-17 03:58:05 +11:00
Lorenc Pekaj
f6d9d7c683 fix static includes 2018-10-17 03:34:59 +11:00
Lorenc Pekaj
32746cdd20 module for static map icons 2018-10-17 03:33:27 +11:00
Lorenc Pekaj
3955ed0982 move gate code to gate module 2018-10-17 03:22:15 +11:00
Lorenc Pekaj
84c6e464f5 move class information into classes.pwn 2018-10-17 03:20:47 +11:00
Lorenc Pekaj
e6b7d0ec23 moved more irresisitble guard code and gang code to modules 2018-10-17 02:59:36 +11:00
Lorenc Pekaj
df49d0abf7 move gate system into module 2018-10-17 02:43:33 +11:00
Lorenc Pekaj
a9e9ac28b2 move race into its own module 2018-10-17 02:29:16 +11:00
Lorenc Pekaj
86a501d4fb move more gang code into their modules 2018-10-17 02:20:20 +11:00
Lorenc Pekaj
c7a50b8ae7 move progress bars into appropriate modules 2018-10-17 01:52:12 +11:00
Lorenc Pekaj
4eb8095f34 notify player if his weed gets stolen 2018-10-17 00:57:16 +11:00
Lorenc Pekaj
13e687fdef improve raising of weed ... no more creating near other weed ... add vip increased planting limits 2018-10-17 00:53:46 +11:00
Lorenc Pekaj
d474159c05 give wanted when they plant 2018-10-16 21:38:26 +11:00
Lorenc Pekaj
62fbc7f1c2 increase drug house and militia pay 2018-10-16 21:26:19 +11:00
Lorenc Pekaj
b49b074eb4 adjust offset for weed plant 2018-10-16 21:25:21 +11:00
Lorenc Pekaj
4ec8229157 adds a new weed system, where you buy seeds from supa ... then /weed plant. LALT to collect the plant 2018-10-16 21:02:36 +11:00
Lorenc Pekaj
cc05a872a8 add roadblocks module 2018-10-16 01:54:39 +11:00
Lorenc Pekaj
1a24034b05 damage feed object only shown if player is not in a vehicle 2018-10-16 01:39:08 +11:00
Lorenc Pekaj
139b335ba3 world/int check ... remove vip for /dm 2018-10-15 21:31:45 +11:00
Lorenc Pekaj
9fd63b70c1 2000 per facility spawn 2018-10-15 21:28:26 +11:00
Lorenc Pekaj
60df8738df sync refilled health bugfix 2018-10-15 21:28:05 +11:00
Lorenc Pekaj
e054a62b22 show player money bags that are intentionally dropped 2018-10-15 19:50:58 +11:00
Lorenc Pekaj
c41eb323cd fix bug with kicked paintball players droppin money 2018-10-15 19:49:48 +11:00
Lorenc Pekaj
b2c10884e8 bug fixes with sync 2018-10-15 18:11:20 +11:00
Lorenc Pekaj
9c743d49fb fix critical issue with ic buy 2018-10-15 17:08:52 +11:00
Lorenc Pekaj
b11ea31fb5 type ALL/MAX in bank depo/withdraw/ic buy and it will do the maximum amount possible. IC sold goes straight to your bank account. 2018-10-15 16:46:26 +11:00
Lorenc Pekaj
0d12721a24 3 minute passive mode 2018-10-15 16:15:33 +11:00
Lorenc Pekaj
c5a62d5eaa add /moneybags ... player can create >25k announced money bags around the map. passive players cannot see pickups ... only their own money drops 2018-10-15 16:15:18 +11:00
Lorenc Pekaj
08474974bf wanted level in module and hooked functions (completely server sided). You can use GetPlayerWantedLevel, SetPlayerWantedLevel or GivePlayerWantedLevel 2018-10-15 15:19:36 +11:00
Lorenc Pekaj
68a890d747 no keystate for /s ... fixed so previous weapons are given back ... added cooldown as well 2018-10-15 15:18:42 +11:00
Steven Howard
b9edc6add6 Merged in sync (pull request #32)
Sync
2018-10-15 03:28:33 +00:00