Zet0rz / nzombies

A GM13 Nazi Zombies style (WIP) gamemode
GNU General Public License v3.0
73 stars 79 forks source link

Morphine Fix #578

Closed DjNathann closed 6 years ago

DjNathann commented 6 years ago

414 Fix Hopefully

nzombies/gamemodes/nzombies/gamemode/special_weapons/sh_specialweapons.lua 1.

  1. local function RegisterDefaultSpecialWeps()
  2. nzSpecialWeapons:AddKnife( "nz_quickknife_crowbar", false, 0.65 )
  3. nzSpecialWeapons:AddKnife( "nz_bowie_knife", true, 0.65, 2.5 )
  4. nzSpecialWeapons:AddKnife( "nz_one_inch_punch", true, 0.75, 1.5 )
  5. nzSpecialWeapons:AddGrenade( "nz_grenade", 4, false, 0.85, false, 0.4 ) -- ALWAYS pass false instead of nil or it'll assume default value
  6. nzSpecialWeapons:AddSpecialGrenade( "nz_monkey_bomb", 3, false, 3, false, 0.4 )
  7. nzSpecialWeapons:AddDisplay( "nz_revive_morphine", false, function(wep)
  8. return !(IsValid(wep.Owner:GetPlayerReviving()) and wep.Owner:KeyDown(IN_USE))
  9. end)
  10. nzSpecialWeapons:AddDisplay( "nz_perk_bottle", false, function(wep)
  11. return SERVER and CurTime() > wep.nzDeployTime + 3.1
  12. end)
  13. nzSpecialWeapons:AddDisplay( "nz_packapunch_arms", false, function(wep)
  14. return SERVER and CurTime() > wep.nzDeployTime + 2.5
  15. end)
  16. end
  17. hook.Add("InitPostEntity", "nzRegisterSpecialWeps", RegisterDefaultSpecialWeps)
  18. --hook.Add("OnReloaded", "nzRegisterSpecialWeps", RegisterDefaultSpecialWeps)
DjNathann commented 6 years ago

P.S I don't know how to pull request..

lolleko commented 6 years ago

How to make a pull request

[Github] Click the for button in the top right. [Github->Local] Clone your fork. [Local] Make your changes. [Local->Github] Push your changes to your fork. [Github] Click the Pullrequest Tab and make a new pull request, selecting zet0rz/master-workshop as base fork and your fork as head fork

https://help.github.com/articles/creating-a-pull-request/

bozoweed commented 6 years ago

morphine is allready fixed by me in laste comit #550

DjNathann commented 6 years ago

Its a good version.

bozoweed commented 6 years ago

why not but what your fix make for been better ?