ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged master into sync

Browse Source
This commit is contained in:
Steven Howard 2018-10-14 09:56:22 +01:00
commit ddbab0f803
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gamemodes/irresistible/cnr/features/shop.pwn
View File

@ -41,9 +41,9 @@ new
{ SHOP_ITEM_CHASITY_BELT, false, "Chastity Belt", "Protection from aids", 1, 550 }, { SHOP_ITEM_CHASITY_BELT, false, "Chastity Belt", "Protection from aids", 1, 550 },
{ SHOP_ITEM_SECURE_WALLET, false, "Secure Wallet", "Protection from robberies", 1, 660 }, { SHOP_ITEM_SECURE_WALLET, false, "Secure Wallet", "Protection from robberies", 1, 660 },
{ SHOP_ITEM_SCISSOR, true , "Scissors", "Automatically cut ties", 8, 1100 }, { SHOP_ITEM_SCISSOR, true , "Scissors", "Automatically cut ties", 8, 1100 },
{ SHOP_ITEM_ROPES, true , "Rope", "/tie", 8, 2250 }, // [1500] { SHOP_ITEM_ROPES, true , "Rope", "/tie", 8, 1500 },
{ SHOP_ITEM_BOBBY_PIN, true , "Bobby Pin", "Automatically break cuffs", 16, 1950 }, // [1000] -makecopgreatagain
{ SHOP_ITEM_FOIL, true , "Aluminium Foil", "Automatically deflect EMP", 8, 3400 }, { SHOP_ITEM_FOIL, true , "Aluminium Foil", "Automatically deflect EMP", 8, 3400 },
{ SHOP_ITEM_BOBBY_PIN, true , "Bobby Pin", "Automatically break cuffs", 16, 3900 }, // [1000] -makecopgreatagain
{ SHOP_ITEM_MONEY_CASE, false, "Money Case", "Increases robbing amount", 1, 4500 }, // [1250] { SHOP_ITEM_MONEY_CASE, false, "Money Case", "Increases robbing amount", 1, 4500 }, // [1250]
{ SHOP_ITEM_DRILL, true , "Thermal Drill", "Halves safe cracking time", 1, 5000 }, { SHOP_ITEM_DRILL, true , "Thermal Drill", "Halves safe cracking time", 1, 5000 },
{ SHOP_ITEM_METAL_MELTER, true , "Metal Melter", "/breakout", 4, 7500 } { SHOP_ITEM_METAL_MELTER, true , "Metal Melter", "/breakout", 4, 7500 }

5
gamemodes/irresistible/cnr/features/weapon_drop.pwn
View File

@ -47,6 +47,9 @@ hook OnPlayerDeathEx( playerid, killerid, reason, Float: damage, bodypart )
hook OnPlayerDeath( playerid, killerid, reason ) hook OnPlayerDeath( playerid, killerid, reason )
#endif #endif
{ {
if ( IsPlayerJailed( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerDueling( playerid ) )
return 1; // do not break return
new Float: X, Float: Y, Float: Z; new Float: X, Float: Y, Float: Z;
new expire_time = GetServerTime( ) + 180; new expire_time = GetServerTime( ) + 180;
@ -54,8 +57,6 @@ hook OnPlayerDeath( playerid, killerid, reason )
if ( IsPlayerConnected( killerid ) && ! IsPlayerNPC( killerid ) ) if ( IsPlayerConnected( killerid ) && ! IsPlayerNPC( killerid ) )
{ {
if ( IsPlayerJailed( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerDueling( playerid ) )
return 1;
for ( new slotid = 0; slotid < 13; slotid++ ) for ( new slotid = 0; slotid < 13; slotid++ )

13
scriptfiles/updates.txt
View File

@ -1,12 +1,23 @@
(+) Newly registered players will be asked if they prefer DM or RP - if they like RP, passive mode is on.
(+) Added confirmation dialog before selling a home / business / vehicle components. (+) Added confirmation dialog before selling a home / business / vehicle components.
(+) Pilot and train minijobs are now saved to the database (and in /highscores). (+) Pilot and train minijobs are now saved to the database (and in /highscores).
(+) Adds some strippers in the LV brothel (for fun). (+) Adds some strippers in the LV brothel (for fun).
(+) Adds Hide From Minimap perk (costs $25,000) ... hides you for 1 minute. (+) Adds Hide From Minimap perk (costs $25,000) ... hides you for 1 minute.
(/) You can now set spikes in non-air and non-sea vehicles using your AIM key. (+) Fire tracker is now /fires ... and it shows the fires on the map as red blips.
(+) New hitmarker system ... activate using /cp - Now shows taken/given damage!
(+) Level 5 admins can now view the police chat.
(+) If you die, you will drop 25% of the money you are currently holding.
(/) Passive mode now completely disables deathmatch.
(/) You can now set spikes in non-air and non-sea vehicles using your CAPSLOCK key.
(/) Car jackers now need to wait only 1 min before exporting another vehicle (before 2 min). (/) Car jackers now need to wait only 1 min before exporting another vehicle (before 2 min).
(/) Players with level 100 in a specific level are able to accrue more XP in the level. (/) Players with level 100 in a specific level are able to accrue more XP in the level.
(/) Explosive rounds used on vehicles will have a more significant impact.
(/) Explosive rounds require the key N to activate.
(/) Rank is now XP based now (prior score based).
(*) Should be faster to place multiple drills using left alt. (*) Should be faster to place multiple drills using left alt.
(*) Fixes death bug with players suiciding in a vehicle. (*) Fixes death bug with players suiciding in a vehicle.
(*) Fixed Alcatraz map escaping issues. (*) Fixed Alcatraz map escaping issues.
(*) Addressed issue with being unable to rob ChuffSec. (*) Addressed issue with being unable to rob ChuffSec.
(*) Fixed issue with business exports being randomly canceled.
(*) ATMs in facilities are now operational.
(-) Removed a counter in cluckin' bell for ease of access to the safe. (-) Removed a counter in cluckin' bell for ease of access to the safe.