Remove the Crew Armory and the Leviathan (#19728)

end of an era


![image](https://github.com/user-attachments/assets/3a8c35b1-5dd6-4456-8f87-b807e61b8535)

![image](https://github.com/user-attachments/assets/723dd548-852d-48f8-9255-881aa7e6f71b)

![image](https://github.com/user-attachments/assets/157491eb-a1b8-465b-868a-d8df1c56aa41)

![image](https://github.com/user-attachments/assets/50c1ebbb-0d4f-40f0-bc4f-2675f126b8be)

![image](https://github.com/user-attachments/assets/e3e8c83f-4d77-4c81-aa55-263e90eb0c90)


----------------------------------------------------------------------------------

----------------------------------------------------------------------------------

----------------------------------------------------------------------------------

----------------------------------------------------------------------------------

changes:
  - rscadd: "Removes the Crew Armory."
  - rscadd: "Removes the Leviathan."
  - rscadd: "Updates mapmerge2 tool with most current tg version."



MATT'S EDIT: For whoever is reading, the Leviathan and the Crew Armoury
are being removed to try and lower the Horizon's passive militarization
a bit. We're going to try playing without the crew armoury, but in case
security stomps are unbearable and Ops can't properly fulfill the role
of "giving people guns", then ERTs will likely end up being readded.

There will be an IC explanation given for the Leviathan's removal. The
crew armoury one will probably be a straight retcon.

---------

Co-authored-by: DreamySkrell <>

code/modules/paperwork/folders.dm

@@ -191,9 +191,19 @@
 	else
 		..()
 
+/obj/item/folder/envelope/empty
+	sealed = FALSE
+
+/obj/item/folder/envelope/empty/zat
+	name = "instructions envelope"
+	desc = "\
+		A small envelope with some warning words written in bold text on the front. \
+		It is all dusty and crumpled, like someone forgot about it a while ago.\
+	"
+
 /obj/item/folder/envelope/zat
 	name = "leviathan zero-point artillery instructions"
-	desc = "A small envelope with \"SCC CONFIDENTIAL\" written in bold text on the front."
+	desc = "A small envelope with 'SCC CONFIDENTIAL' written in bold text on the front."
 
 /obj/item/folder/envelope/zat/Initialize()
 	. = ..()

html/changelogs/DreamySkrell-crewarm-gone-levi-gone.yml

@@ -0,0 +1,9 @@
+
+author: DreamySkrell
+
+delete-after: True
+
+changes:
+  - rscadd: "Removes the Crew Armory."
+  - rscadd: "Removes the Leviathan."
+  - rscadd: "Updates mapmerge2 tool with most current tg version."

tools/mapmerge2/dmm.py

@@ -95,7 +95,7 @@ class DMM:
         # last-second handling of bogus keys to help prevent and fix broken maps
         self._ensure_free_keys(0)
         max_key = max_key_for(self.key_length)
-        bad_keys = {key: 0 for key in self.dictionary.keys() if key > max_key}
+        bad_keys = {key: 0 for key in self.dictionary.keys() if key >= max_key}
         if bad_keys:
             print(f"Warning: fixing {len(bad_keys)} overflowing keys")
             for k in bad_keys: