Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion entities/weapons/nut_hands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ CARRY_FORCE_LEVEL = {
-- gameplay purposes
CARRY_WEIGHT_LIMIT = 100

-- I know some people will fuck around with new prop-throwing system. I'm preventing that shit without making it too non-sense
-- Prevent prop-throwing system abuse.
THROW_VELOCITY_CAP = 150
PLAYER_PICKUP_RANGE = 200

Expand Down
8 changes: 4 additions & 4 deletions gamemode/core/derma/cl_dev_icon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ function PANEL:Init()
btn:DockMargin(5, 5, 5, 0)
btn.DoClick = function()
self:SetupEditor(true, i)
self:UpdateShits()
self:UpdateIcon()
end
end

Expand All @@ -258,7 +258,7 @@ function PANEL:Init()
self.mdl.OnEnter = function()
ICON_INFO.modelName = self.mdl:GetValue()
self:SetupEditor(true)
self:UpdateShits()
self:UpdateIcon()
end

self:AddText("Icon Size")
Expand Down Expand Up @@ -396,10 +396,10 @@ function PANEL:Init()
end

self:SetupEditor()
self:UpdateShits(true)
self:UpdateIcon(true)
end

function PANEL:UpdateShits()
function PANEL:UpdateIcon()
fagLord = true
self.camFOV:SetValue(ICON_INFO.FOV)
local p = self.prev
Expand Down
9 changes: 0 additions & 9 deletions gamemode/core/libs/sh_chatbox.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,6 @@ function nut.chat.parse(client, message, noSend)
local anonymous = false
local chatType = "ic"

--[[
-- fuckoff
-- Handle anonymous/unknown speaker chat.
if (message:sub(1, 1) == "?" and message:sub(2):find("%S")) then
anonymous = true
message = message:sub(2)
end
]]

-- Loop through all chat classes and see if the message contains their prefix.
for k, v in pairs(nut.chat.classes) do
local isChosen = false
Expand Down
20 changes: 7 additions & 13 deletions gamemode/core/libs/thirdparty/cl_ikon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

ikon = ikon or {}
ikon.dev = false
ikon.maxSize = 8 -- 8x8 (512^2) is max icon size. eitherwise, fuck off.
ikon.maxSize = 8 -- 8x8 (512^2) is max icon size.

/*
Initialize hooks and RT Screens.
Expand All @@ -66,15 +66,14 @@ function ikon:init()
*/
OLD_HALOADD = OLD_HALOADD or halo.Add
function halo.Add(...)
-- shut the fuck up
if (ikon.rendering != true) then
OLD_HALOADD(...)
end
end

OLD_HALORENDER = OLD_HALORENDER or halo.Render
function halo.Render(...)
-- shut the fuck up

if (ikon.rendering != true) then
OLD_HALORENDER(...)
end
Expand Down Expand Up @@ -321,22 +320,17 @@ function ikon:renderIcon(name, w, h, mdl, camInfo, updateCache)
file.Write("nsIcon/" .. schemaName .. "/" .. name .. ".png", capturedIcon)
ikon.info = nil
render.PopRenderTarget()

-- lol blame your shit mate

if (updateCache) then
-- it's all your falut
-- you rendered wrong shit
-- if you know better solution, give me to it.
local noshit = tostring(os.time())
file.Write(noshit .. ".png", capturedIcon)
local iconString = tostring(os.time())
file.Write(iconString .. ".png", capturedIcon)

timer.Simple(0, function()
local wtf = Material("../data/".. noshit ..".png")
local wtf = Material("../data/".. iconString ..".png")

ikon.cache[name] = wtf
file.Delete(noshit .. ".png")
file.Delete(iconString .. ".png")
end)
-- make small ass texture and put that thing in here?
end
ikon.requestList[name] = nil
return true
Expand Down
2 changes: 1 addition & 1 deletion gamemode/core/libs/thirdparty/sh_pon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ do
if predictedNumeric == nil then
output[#output + 1] = '[' -- no array component
else
output[#output + 1] = '~' -- array component came first so shit needs to happen
output[#output + 1] = '~' -- array component came first
end

for k, v in next, tbl, predictedNumeric do
Expand Down
1 change: 0 additions & 1 deletion plugins/area/sh_plugin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ else
end

-- draw matrix string.
-- slow as fuck I guess?
local function drawMatrixString(str, font, x, y, scale, angle, color)
surface.SetFont(font)
local tx, ty = surface.GetTextSize(str)
Expand Down
4 changes: 2 additions & 2 deletions plugins/doors/sh_commands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ nut.command.add("doorsell", {
-- Take their money and notify them.
client:getChar():giveMoney(price)
client:notifyLocalized("dSold", nut.currency.get(price))
hook.Run("OnPlayerPurchaseDoor", client, entity, false, PLUGIN.callOnDoorChildren) -- i fucking hate this life
hook.Run("OnPlayerPurchaseDoor", client, entity, false, PLUGIN.callOnDoorChildren)
nut.log.add(client, "selldoor")
else
-- Otherwise tell them they can not.
Expand Down Expand Up @@ -79,7 +79,7 @@ nut.command.add("doorbuy", {
client:getChar():takeMoney(price)
client:notifyLocalized("dPurchased", nut.currency.get(price))

hook.Run("OnPlayerPurchaseDoor", client, entity, true, PLUGIN.callOnDoorChildren) -- i fucking hate this life
hook.Run("OnPlayerPurchaseDoor", client, entity, true, PLUGIN.callOnDoorChildren)
nut.log.add(client, "buydoor")
else
-- Otherwise tell them they can not.
Expand Down