From 777a2800a32c470076187167f7c55c3e4a64beb9 Mon Sep 17 00:00:00 2001
From: TedStudley <TedStudley@Gmail.com>
Date: Sat, 3 Jan 2015 17:03:23 -0800
Subject: [PATCH] Updates/fixes to NTSL

  - Fixed NTSL division
  - Added new NTSL math functions
  - Added changelog information
---
 .../scripting/Implementations/Telecomms.dm    |  5 ++++
 .../scripting/Implementations/_Logic.dm       | 25 +++++++++++++++++++
 .../scripting/Interpreter/Evaluation.dm       |  4 +--
 code/modules/scripting/Scanner/Scanner.dm     |  3 ++-
 html/changelogs/Studley.yml                   |  5 ++++
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/Studley.yml

diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm
index e807beeaedb..ea9fda485e7 100644
--- a/code/modules/scripting/Implementations/Telecomms.dm
+++ b/code/modules/scripting/Implementations/Telecomms.dm
@@ -190,6 +190,11 @@
 		interpreter.SetProc("randseed", /proc/n_randseed)
 		interpreter.SetProc("min", /proc/n_min)
 		interpreter.SetProc("max", /proc/n_max)
+		interpreter.SetProc("sin", /proc/n_sin)
+		interpreter.SetProc("cos", /proc/n_cos)
+		interpreter.SetProc("asin", /proc/n_asin)
+		interpreter.SetProc("acos", /proc/n_acos)
+		interpreter.SetProc("log", /proc/n_log)
 
 		// Time
 		interpreter.SetProc("time", /proc/n_time)
diff --git a/code/modules/scripting/Implementations/_Logic.dm b/code/modules/scripting/Implementations/_Logic.dm
index 343adf34d43..6fd47acf7c8 100644
--- a/code/modules/scripting/Implementations/_Logic.dm
+++ b/code/modules/scripting/Implementations/_Logic.dm
@@ -262,6 +262,31 @@
 	if(isnum(num)&&isnum(min)&&isnum(max))
 		return ((min <= num) && (num <= max))
 
+// Returns the sine of num
+/proc/n_sin(var/num)
+	if(isnum(num))
+		return sin(num)
+
+// Returns the cosine of num
+/proc/n_cos(var/num)
+	if(isnum(num))
+		return cos(num)
+
+// Returns the arcsine of num
+/proc/n_asin(var/num)
+	if(isnum(num)&&-1<=num&&num<=1)
+		return arcsin(num)
+
+// Returns the arccosine of num
+/proc/n_acos(var/num)
+	if(isnum(num)&&-1<=num&&num<=1)
+		return arccos(num)
+
+// Returns the natural log of num
+/proc/n_log(var/num)
+	if(isnum(num)&&0<num)
+		return log(num)
+
 // Replace text
 /proc/n_replace(text, find, replacement)
 	if(istext(text) && istext(find) && istext(replacement))
diff --git a/code/modules/scripting/Interpreter/Evaluation.dm b/code/modules/scripting/Interpreter/Evaluation.dm
index 02cdc929c5c..c25c2f0f796 100644
--- a/code/modules/scripting/Interpreter/Evaluation.dm
+++ b/code/modules/scripting/Interpreter/Evaluation.dm
@@ -134,7 +134,7 @@
 			else if(isobject(b) && !isobject(a))
 				RaiseError(new/runtimeError/TypeMismatch("/", a, b))
 				return null
-			if(b==0)
+			if(b==0 || b==null)
 				RaiseError(new/runtimeError/DivisionByZero())
 				return null
 			return a/b
@@ -166,4 +166,4 @@
 	//Unary//
 		Minus(a)						return -a
 		LogicalNot(a)				return !a
-		BitwiseNot(a)				return ~a
\ No newline at end of file
+		BitwiseNot(a)				return ~a
diff --git a/code/modules/scripting/Scanner/Scanner.dm b/code/modules/scripting/Scanner/Scanner.dm
index 35f21b39fd0..a667becea17 100644
--- a/code/modules/scripting/Scanner/Scanner.dm
+++ b/code/modules/scripting/Scanner/Scanner.dm
@@ -118,13 +118,14 @@
 		for(, src.codepos<=lentext(code), src.codepos++)
 
 			var/char=copytext(code, codepos, codepos+1)
+			var/nextchar=copytext(code, codepos+1, codepos+2)
 			if(char=="\n")
 				line++
 				linepos=codepos
 
 			if(ignore.Find(char))
 				continue
-			else if(char == "/")
+			else if(char == "/" && (nextchar == "/" || nextchar == "*"))
 				ReadComment()
 			else if(end_stmt.Find(char))
 				tokens+=new /token/end(char, line, COL)
diff --git a/html/changelogs/Studley.yml b/html/changelogs/Studley.yml
new file mode 100644
index 00000000000..03f2481434c
--- /dev/null
+++ b/html/changelogs/Studley.yml
@@ -0,0 +1,5 @@
+author: Studley
+delete-after: True
+changes:
+  - bugfix: "Fixed NTSL division."
+  - rscadd: "Added new NTSL math functions, including 'sin,' 'cos,' 'asin,' 'acos,' and 'log.'"