From e46d93bc2adb61991a61cef90132995391f753a6 Mon Sep 17 00:00:00 2001
From: craftxbox <craftxbox@craftxbox.com>
Date: Sun, 27 Oct 2019 17:43:56 -0230
Subject: [PATCH 1/4] Fix highlight regex (#12655)

---
 goon/browserassets/js/browserOutput.js | 33 ++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/goon/browserassets/js/browserOutput.js b/goon/browserassets/js/browserOutput.js
index 136b0106021..094e8258562 100644
--- a/goon/browserassets/js/browserOutput.js
+++ b/goon/browserassets/js/browserOutput.js
@@ -72,6 +72,8 @@ var opts = {
 	'enableEmoji': true
 };
 
+var regexHasError = false; //variable to check if regex has excepted 
+
 function outerHTML(el) {
     var wrap = document.createElement('div');
     wrap.appendChild(el.cloneNode(true));
@@ -91,6 +93,19 @@ if (typeof String.prototype.trim !== 'function') {
 	};
 }
 
+//Polyfill for string.prototype.includes. Why the fuck. Just why the fuck.
+if (!String.prototype.includes) {
+	String.prototype.includes = function(search, start) {
+	  'use strict';
+  
+	  if (search instanceof RegExp) {
+		throw TypeError('first argument must not be a RegExp');
+	  } 
+	  if (start === undefined) { start = 0; }
+	  return this.indexOf(search, start) !== -1;
+	};
+}
+
 //Shit fucking piece of crap that doesn't work god fuckin damn it
 function linkify(text) {
 	var rex = /((?:<a|<iframe|<img)(?:.*?(?:src=["']|href=["']).*?))?(?:(?:https?:\/\/)|(?:www\.))+(?:[^ ]*?\.[^ ]*?)+[-A-Za-z0-9+&@#\/%?=~_|$!:,.;]+/ig;
@@ -158,14 +173,22 @@ function setHighlightColor(match) {
 
 //Highlights words based on user settings
 function highlightTerms(el) {
+	if(regexHasError) return; //just stop right there ig the regex is gonna except
 	for (var i = 0; i < opts.highlightTerms.length; i++) { //Each highlight term
 		if(opts.highlightTerms[i]) {
-			var rexp = new RegExp(opts.highlightTerms[i],"gmi")
 			if(!opts.highlightRegexEnable){
-				rexp = new RegExp("("+opts.highlightTerms[i].replace(new RegExp("([^a-zA-Z0-9])","gmi"),"\\$1")+")","gmi")
-				el.innerText = el.innerText.replace(rexp,"<span style=\"background-color:"+opts.highlightColor+"\">$1</span>") //disabling regex disables html matching too
+				if(el.innerText.toString().toLowerCase().includes(opts.highlightTerms[i].toLowerCase())) //match normally
+				el.innerHTML = '<span style="background-color:'+opts.highlightColor+'">'+el.innerHTML+'</span>' //encloseincludes
 				continue;
 			}
+			var rexp;
+			try{
+				rexp = new RegExp(opts.highlightTerms[i],"gmi")
+			} catch(e){
+				el.innerHTML+='<br/><span style="boldwarning"> Your highlight regex - '+opts.highlightTerms[i]+' - is malformed. Thrown exception: '+e+'</span>'
+				regexHasError = true;
+				return;
+			}
 			el.innerHTML = el.innerHTML.replace(rexp,"<span style=\"background-color:"+opts.highlightColor+"\">$0</span>") //i cant figure out a proper, non snowflakey way to let people select the group that gets highlighted
 		}
 	}
@@ -575,7 +598,7 @@ $(function() {
 		'spingDisabled': getCookie('pingdisabled'),
 		'shighlightTerms': getCookie('highlightterms'),
 		'shighlightColor': getCookie('highlightcolor'),
-		'shighlightRegexEnable': getCookie('highlightregexenable'),
+		'shighlightRegexEnable': getCookie('highlightregexenable') == "true",
 		'shideSpam': getCookie('hidespam'),
 		'darkChat': getCookie('darkChat'),
 	};
@@ -1027,6 +1050,8 @@ $(function() {
 		} else {
 			opts.highlightColor = color;
 		}
+		regexHasError = false; //they changed the regex so it might be valid now
+
 		var $popup = $('#highlightPopup').closest('.popup');
 		$popup.remove();
 

From 54838ccfcf1579128d9dfdb2d13576b982f57e12 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 27 Oct 2019 16:13:58 -0400
Subject: [PATCH 2/4] Automatic changelog generation for PR #12655 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-12655.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-12655.yml

diff --git a/html/changelogs/AutoChangeLog-pr-12655.yml b/html/changelogs/AutoChangeLog-pr-12655.yml
new file mode 100644
index 00000000000..c32a92c9289
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12655.yml
@@ -0,0 +1,6 @@
+author: "craftxbox"
+delete-after: True
+changes: 
+  - bugfix: "fixed colors not working without regex"
+  - bugfix: "fixed text panel not loading when an invalid regex is added"
+  - rscadd: "polyfilled string.prototype.includes"

From e945a8ad7bc3c65af75a3e43dadf1e8a1ee794bd Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Tue, 29 Oct 2019 15:23:43 +0100
Subject: [PATCH 3/4] remove duplicate definition

---
 code/game/mecha/mecha.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index aed3216332c..85f511395f1 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1,9 +1,3 @@
-
-
-#define MECHAMOVE_RAND 1
-#define MECHAMOVE_TURN 2
-#define MECHAMOVE_STEP 4
-
 /obj/mecha
 	name = "Mecha"
 	desc = "Exosuit"

From 8b9f6632038bbc98f93ce1c0740c3d7ea5f0f9cc Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Tue, 29 Oct 2019 21:30:32 -0400
Subject: [PATCH 4/4] Automatic changelog generation for PR #12665 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-12665.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-12665.yml

diff --git a/html/changelogs/AutoChangeLog-pr-12665.yml b/html/changelogs/AutoChangeLog-pr-12665.yml
new file mode 100644
index 00000000000..7761e78cf63
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12665.yml
@@ -0,0 +1,4 @@
+author: "TDSSS"
+delete-after: True
+changes: 
+  - rscdel: "duplicate mecha definitions"