From 9398e9f1f0e95233fc402d2fc0f62d7b51ad5097 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Sat, 4 Jul 2020 15:18:29 -0700
Subject: [PATCH] Remove duplicate talkgreen_2 script and alarmon/alarmoff
 commands

For some reason, there were just exact duplicates of the talkgreen_2
script and alarmon/alarmoff commands. I have no idea why, but cppcheck
identified them.
---
 desktop_version/src/Script.cpp  |  9 ---------
 desktop_version/src/Scripts.cpp | 24 ------------------------
 2 files changed, 33 deletions(-)

diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
index 19772414..1e237ded 100644
--- a/desktop_version/src/Script.cpp
+++ b/desktop_version/src/Script.cpp
@@ -1156,15 +1156,6 @@ void scriptclass::run()
 					}
 				}
 			}
-			else if (words[0] == "alarmon")
-			{
-				game.alarmon = true;
-				game.alarmdelay = 0;
-			}
-			else if (words[0] == "alarmoff")
-			{
-				game.alarmon = false;
-			}
 			else if (words[0] == "activateteleporter")
 			{
 				i = obj.getteleporter();
diff --git a/desktop_version/src/Scripts.cpp b/desktop_version/src/Scripts.cpp
index bbd7c326..40b60c65 100644
--- a/desktop_version/src/Scripts.cpp
+++ b/desktop_version/src/Scripts.cpp
@@ -4334,30 +4334,6 @@ void scriptclass::load(std::string t)
         };
         filllines(lines);
     }
-    else if (t == "talkgreen_2")
-    {
-        static const char* lines[] = {
-        "cutscene()",
-        "untilbars()",
-        "face(player,green)",
-        "face(green,player)",
-
-        "squeak(green)",
-        "text(green,0,0,3)",
-        "I think I can get this ship",
-        "moving again, but it's going",
-        "to take a while...",
-        "position(green,above)",
-        "speak_active",
-
-        "endtext",
-
-        "endcutscene()",
-        "untilbars()",
-        "createactivityzone(green)",
-        };
-        filllines(lines);
-    }
     else if (t == "talkgreen_3")
     {
         static const char* lines[] = {