diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-01 21:04:16 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-01 21:04:16 -0400 |
| commit | e1516804ffa48fa0c8abf69c191e404a8df5d0b5 (patch) | |
| tree | 64bd4baa8b5b6cf2433167d9d4bd3189c2826f00 /gamemode | |
| parent | b8c39c8c682c426dbde45d66b28a4b9a41cd4f01 (diff) | |
| download | gmstranded-e1516804ffa48fa0c8abf69c191e404a8df5d0b5.tar.gz gmstranded-e1516804ffa48fa0c8abf69c191e404a8df5d0b5.tar.bz2 gmstranded-e1516804ffa48fa0c8abf69c191e404a8df5d0b5.zip | |
Started working on commenting
Diffstat (limited to 'gamemode')
| -rw-r--r-- | gamemode/itemsystem/common_dropable.lua | 2 | ||||
| -rw-r--r-- | gamemode/server/player_functions.lua | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gamemode/itemsystem/common_dropable.lua b/gamemode/itemsystem/common_dropable.lua index 94513d3..14d3da5 100644 --- a/gamemode/itemsystem/common_dropable.lua +++ b/gamemode/itemsystem/common_dropable.lua @@ -1,3 +1,5 @@ +--Adds a function to to allow the player to drop this item, in quantities of 1, half, all, or X, which brings up a menu asking the player how many they would like to drop + function genericMakeDroppable(tbl) if(SERVER) then return end local drop1 = function(player) diff --git a/gamemode/server/player_functions.lua b/gamemode/server/player_functions.lua index 09de491..4ef39fd 100644 --- a/gamemode/server/player_functions.lua +++ b/gamemode/server/player_functions.lua @@ -664,6 +664,13 @@ end function PlayerMeta:CancelProcess() if ( !self.InProcess ) then return end + --If we just clear it out, it should all be good. + for i = 1, 10 do + if(timer.Exists("GMS_ProcessTimer_" .. i)) then + timer.Destroy("GMS_ProcessTimer_" .. i) + end + end + GAMEMODE.ProcessThinkHookTable = {} timer.Destroy("process") self:Freeze(false) self.InProcess = false |