NutScript · zoephix · Feb 14, 2021 · Feb 13, 2021 · Feb 13, 2021 · Feb 13, 2021
diff --git a/README.md b/README.md
@@ -9,6 +9,9 @@ NutScript 1.2 is the continuation of the original NutScript framework to provide
 For a few years 1.1-beta was the name of the newest and most updated version of Nutscript. We are now confident to rename it to 1.2, as the modern stable release of Nutscript.
 Nutscript 1.2 is actively worked on by community developers, and will see numerous new updates and features added.
 
+## 1.2 vs 1.2-wip
+the default 1.2 branch will always be the stable release. If you wish to test new releases before they are integrated into the stable branch, you can opt for 1.2-wip. Be aware that 1.2-wip may have bugs and issues.
+
 ## Documentation
 Check out the Nutscript wiki at https://nutscript.miraheze.org/wiki/Main_Page
 

diff --git a/entities/weapons/nut_hands.lua b/entities/weapons/nut_hands.lua
@@ -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
 

diff --git a/gamemode/core/derma/cl_dev_icon.lua b/gamemode/core/derma/cl_dev_icon.lua
@@ -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
 
@@ -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")
@@ -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

diff --git a/gamemode/core/hooks/sh_hooks.lua b/gamemode/core/hooks/sh_hooks.lua
@@ -221,11 +221,7 @@ function GM:CalcMainActivity(client, velocity)
 	local animClass = nut.anim.getModelClass(client:GetModel())
 
 	if (animClass ~= "player") then
-		local eyeAngles = client.EyeAngles(client)
-		local yaw = vectorAngle(velocity)[2]
-		local normalized = normalizeAngle(yaw - eyeAngles[2])
-
-		client.SetPoseParameter(client, "move_yaw", normalized)
+		client:SetPoseParameter("move_yaw", normalizeAngle(vectorAngle(velocity)[2] - client:EyeAngles()[2]))
 	end
 
 	if (

diff --git a/gamemode/core/libs/cl_markup.lua b/gamemode/core/libs/cl_markup.lua
@@ -1,15 +1,4 @@
-local string = string
-local table = table
-local surface = surface
-local tostring = tostring
-local pairs = pairs
-local setmetatable = setmetatable
-local math = math
-local Material = Material
-local tonumber = tonumber
-local file = file
-
-module("nut.markup")
+module("nut.markup", package.seeall)
 
 --[[---------------------------------------------------------
     Name: Constants used for text alignment.

diff --git a/gamemode/core/libs/sh_character.lua b/gamemode/core/libs/sh_character.lua
@@ -8,6 +8,10 @@ nut.util.include("character/cl_networking.lua")
 nut.util.include("character/sv_character.lua")
 
 if (SERVER) then
+	if (not nut.db) then
+		include("sv_database.lua")
+	end
+
 	-- Fetches all the character names and stores
 	-- them into a table so they only have to be fetched once
 	if (#nut.char.names < 1) then

diff --git a/gamemode/core/libs/sh_chatbox.lua b/gamemode/core/libs/sh_chatbox.lua
@@ -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

diff --git a/gamemode/core/libs/thirdparty/cl_ikon.lua b/gamemode/core/libs/thirdparty/cl_ikon.lua
@@ -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.
@@ -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
@@ -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

diff --git a/gamemode/core/libs/thirdparty/sh_pon.lua b/gamemode/core/libs/thirdparty/sh_pon.lua
@@ -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

diff --git a/plugins/area/sh_plugin.lua b/plugins/area/sh_plugin.lua
@@ -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)

diff --git a/plugins/doors/sh_commands.lua b/plugins/doors/sh_commands.lua
@@ -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.
@@ -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.

diff --git a/plugins/logging.lua b/plugins/logging.lua
@@ -104,6 +104,14 @@ if (SERVER) then
 		local arg = {...}
 		return (L("%s purchased the door", client:Name()))
 	end)
+
+	nut.log.addType("observerEnter", function(client, ...)
+		return string.format("%s has entered observer.", client:Name())
+	end)
+
+	nut.log.addType("observerExit", function(client, ...)
+		return string.format("%s has left observer.", client:Name())
+	end)
 
 	function PLUGIN:CharacterLoaded(id)
 		local character = nut.char.loaded[id]

diff --git a/plugins/notices/cl_notice.lua b/plugins/notices/cl_notice.lua
@@ -3,9 +3,11 @@ nut.notices = nut.notices or {}
 
 -- Move all notices to their proper positions.
 local function OrganizeNotices()
+	local scrW = ScrW()
+
 	for k, v in ipairs(nut.notices) do
 		v:MoveTo(
-			ScrW() - (v:GetWide() + 4),
+			scrW - (v:GetWide() + 4),
 			(k - 1) * (v:GetTall() + 4) + 4,
 			0.15,
 			(k / #nut.notices) * 0.25
@@ -17,10 +19,11 @@ end
 function nut.util.notify(message)
 	local notice = vgui.Create("nutNotice")
 	local i = table.insert(nut.notices, notice)
+	local scrW = ScrW()
 
 	-- Set up information for the notice.
 	notice:SetText(message)
-	notice:SetPos(ScrW(), (i - 1) * (notice:GetTall() + 4) + 4)
+	notice:SetPos(scrW, (i - 1) * (notice:GetTall() + 4) + 4)
 	notice:SizeToContentsX()
 	notice:SetWide(notice:GetWide() + 16)
 	notice.start = CurTime() + 0.25
@@ -44,7 +47,7 @@ function nut.util.notify(message)
 			for k, v in ipairs(nut.notices) do
 				if (v == notice) then
 					-- Move the notice off the screen.
-					notice:MoveTo(ScrW(), notice.y, 0.15, 0.1, nil, function()
+					notice:MoveTo(scrW, notice.y, 0.15, 0.1, nil, function()
 						notice:Remove()
 					end)
 

diff --git a/plugins/observer.lua b/plugins/observer.lua
@@ -79,6 +79,11 @@ if (CLIENT) then
 		end
 	end
 else
+	-- Log observer usage
+	function PLUGIN:OnPlayerObserve(client, state)
+		nut.log.add(client, (state and "observerEnter") or "observerExit")
+	end
+
 	function PLUGIN:PlayerNoClip(client, state)
 		-- Observer mode is reserved for administrators.
 		if (client:IsAdmin()) then
@@ -95,6 +100,7 @@ else
 				client:GodEnable()
 				-- Don't allow npcs to target the player.
 				client:SetNoTarget(true)
+				-- Run observer hook
 				hook.Run("OnPlayerObserve", client, state)
 			else
 				if (client.nutObsData) then
@@ -124,6 +130,7 @@ else
 				client:GodDisable()
 				-- Let npcs target the player again.
 				client:SetNoTarget(false)
+				-- Run observer hook
 				hook.Run("OnPlayerObserve", client, state)
 			end
 		end