From ef735548e86644a56c294e44bd6e673dc29bf1b2 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 3 Oct 2021 14:36:36 +0200
Subject: [PATCH] I really need to get to work on this branch, but alas, here I
 am still pulling in changes from master.

---
 achievements.lst               | 2 +-
 language.version               | 4 ++--
 zscript.txt                    | 2 +-
 zscript/compat/swwm_compat.zsc | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/achievements.lst b/achievements.lst
index 4766191dd..3e202bdd8 100644
--- a/achievements.lst
+++ b/achievements.lst
@@ -73,7 +73,7 @@ oneguy,0,no,any
 onehp,10,yes,any
 onestanding,0,no,nothexen
 oopsie,0,no,any
-par,15,yes,nothexen
+par,15,yes,doom
 parry,200,yes,any
 peace,0,no,nothexen
 #pene,20,yes,any
diff --git a/language.version b/language.version
index 9623bbcaa..702eb85a7 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r5 \cu(Wed 29 Sep 18:47:23 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.2pre r5 \cu(2021-09-29 18:47:23)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r7 \cu(Sun  3 Oct 14:36:51 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.2pre r7 \cu(2021-10-03 14:36:51)\c-";
diff --git a/zscript.txt b/zscript.txt
index a27512df9..952aa5cba 100644
--- a/zscript.txt
+++ b/zscript.txt
@@ -4,7 +4,7 @@ version "4.6"
    SWWM GZ Main Codebase
    (C)2020-2021 Marisa Kirisame, UnSX Team
    This copyright and the attached LICENSE.code file apply to all files
-   included from here, with the exception of the Gutamatics library
+   included from here, with the exception of any third party libraries
 */
 
 // Gutamatics
diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc
index a498bf428..647b7f746 100644
--- a/zscript/compat/swwm_compat.zsc
+++ b/zscript/compat/swwm_compat.zsc
@@ -121,6 +121,8 @@ Class SWWMLevelCompatibility : LevelPostProcessor
 		case '30D1480A6D4F3A3153739D4CCF659C4E':
 			level.nextsecretmap = level.nextmap;	// so the handler can detect this
 			level.nextmap = "E5M1";
+			// remove a multiplayer-exclusive teleport because it's dumb as all fuck that it exists
+			SetThingEdNum(78,0);
 			break;
 		// Micro Slaughter Community Project MAP13 (beta) / MAP14 (v1)
 		case 'E45AA3BE411845AA0DEE7CA5DAAB65FE':