Commit Graph

1363 Commits

Author SHA1 Message Date
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
Marin Kovač
65d5ab05eb Merged in militia-ship-fix (pull request #63)
Fixes militia ship
2019-01-19 23:27:43 +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
Damen DeBerry
7f45c494fe Merged in passive-command-checks (pull request #61)
Passive Mode Additions/Corrections
2019-01-19 06:50:28 +00:00
Damen
1020e0fab2 adds numerous passive-mode checks, adds else-statements prior to if-statements 2019-01-19 00:58:56 -05:00
Marin Kovač
41a36c0050 Merged in rich-mansion-casino (pull request #60)
Rich's mansion casino/actors addition
2019-01-19 02:32:26 +00:00
Crova
6841aa1ee1 Private Rich's casino + actors 2019-01-18 21:57:26 +01:00
Damen DeBerry
ef55564c29 Merged in vip-adjustments (pull request #59)
vipgun adjustment
2019-01-18 10:54:43 +00:00
Damen DeBerry
936d13a6e2 Merged in minor-adjustments (pull request #58)
Minor adjustments
2019-01-18 10:53:57 +00:00
Damen
eba2908ef8 removes knife from VIP lounge 2019-01-17 21:57:37 -05:00
Damen
90596ad6b7 Revert "adds check to fix casino damaging players"
This reverts commit a176b9a701.
2019-01-17 20:49:17 -05: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
Lorenc Pekaj
bb45138674 merge updates.txt with damen's 2019-01-16 18:41:31 +11:00
Damen DeBerry
3c04ee5608 Merged in minor-adjustments (pull request #57)
Minor Adjustments
2019-01-16 07:36:10 +00:00
Damen DeBerry
a7eb0c1e38 Merged in money-fixes (pull request #56)
Money Handling Adjustments
2019-01-16 07:34:20 +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
Damen
687bd240f0 fixes bank money saving, moves into it's own function, removes sm limit, increases ic limit to 10,000 2019-01-15 18:04:57 -05:00
Steven Howard
36f48e753b Merged in arrest-fix (pull request #54)
breakcuffs
2019-01-15 09:00:37 +00:00
Stev
9b3f6f91c7 removing breakcuff code from main into arrest module 2019-01-14 19:54:57 +00:00
Crova
22ae95ca6d Weed sell price param 2019-01-14 12:51:48 +01:00
Lorenc Pekaj
001c387cfb move breakcuff code to module arrest.pwn 2019-01-14 20:39:32 +11:00
Damen DeBerry
32715d9245 Merged in Adjustments (pull request #52)
Adjustments
2019-01-14 09:14:34 +00:00
Damen
0348faf02d adjusts pool timer from 30 to 25 in attempt to fix physics bug, thought per Owen 2019-01-13 22:20:01 -05:00
Damen
7cb9af3806 adjusts random parameters to 101 and adds additional measures to prevent bc attempts when no longer needed 2019-01-13 12:10:08 -05:00
Damen
9bc63471cb adds KillTimer for arrest, forgot to do when re-did branch 2019-01-13 01:15:48 -05:00
Damen
7eae2186a5 reworks bc, fixes firework purchase, adjusts jail-multiplier 2019-01-13 01:07:16 -05:00
Lorenc Pekaj
cfaf27240d -- update updates.txt 2019-01-12 22:37:49 +11:00
Lorenc Pekaj
1b5c54dc2d /updatedonategoal for lead maintainer to variably adjust the donation requirement per month 2019-01-12 22:27:45 +11:00
Damen DeBerry
936ec548c7 Merged in features-on-acc-creation (pull request #50)
adds features dialog on account creation
2019-01-12 08:46:55 +00:00
Damen DeBerry
73b00936f9 Merged in chat-msg-fix (pull request #49)
Chat Message Fix
2019-01-12 08:45:52 +00:00
Damen
c957e00d40 adds features dialog on account creation 2019-01-12 01:20:28 -05:00
Damen
9ab27f4e31 fixes gang/leo chat message duplication into global chat 2019-01-12 01:06:04 -05:00
Lorenc Pekaj
bf3a2ba9e5 remove debug stuff on the redeem code 2019-01-06 18:49:59 +11:00
Lorenc Pekaj
7ee91d8e6d show % of month funding at the top 2019-01-06 12:06:01 +11:00
Damen DeBerry
654695e4fd Merged in biz-supply-fix (pull request #46)
Business Protection Label Fix
2019-01-03 01:37:41 +00:00
Damen
7ce386e6f9 updates business production label upon supply purchases 2019-01-02 13:42:19 -05:00
Lorenc Pekaj
f1993e9d8a disable migration checker if in production mode / disabled in settings 2019-01-02 21:24:46 +11:00
Lorenc Pekaj
941ead4c4c add migration manager ... automatically get errored if your database migrations are not up to date! 2019-01-02 21:20:40 +11:00
Lorenc Pekaj
4aedc7dd5c use jail function in place of variable 2019-01-02 18:54:19 +11:00