Merge branch 'master' of https://bibbitgit.duckdns.org/melancholytron/qmutants

qmutants.py

@@ -1096,8 +1096,8 @@ class mutant(QWidget):
         
         #Exit game if..
         if self.in_combat and result.find("You're not carrying a "+self.weapon.lower()) != -1:
-            self.command_str.emit("x\r\n")
-            self.exit_game()
+            self.command_str.emit("kick\r\n")
+            #self.exit_game()
         
         #GTFO        
         if self.wander and (((result.find("It's too dark to see anything!") != -1 and self.path_step == 0) or