diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 511a885dd0b..8b398a7f330 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,13 +12,22 @@
 /icons/ @GoldenAlpharex
 
 # Jolly-66
-/modular_nova/modules/mapping @Jolly-66
+/modular_nova/modules/mapping @Jolly-66 @Zergspower
 /tools/UpdatePaths @Jolly-66
 
+# Zergspower
+/modular_nova/modules/borgs @Zergspower
+/modular_nova/modules/borg_buffs @Zergspower
+/modular_nova/modules/ghostcafe @Zergspower
+/modular_nova/modules/hotel_rooms @Zergspower
+/modular_nova/master_files/code/modules/mapfluff @Zergspower
+/modular_nova/modules/ashwalkers @Zergspower
+/modular_nova/modules/aesthetics/keyed_doors @Zergspower
+
 # Multiple Owners
 
 # Maptainers
-/_maps/ @Jolly-66
+/_maps/ @Jolly-66 @Zergspower
 
 # Expensive files that touching basically always cause performance problems
 ## Init times
diff --git a/modular_nova/master_files/icons/obj/structures/puzzle_door.dmi b/modular_nova/master_files/icons/obj/structures/puzzle_door.dmi
deleted file mode 100644
index 3016f3b9f98..00000000000
Binary files a/modular_nova/master_files/icons/obj/structures/puzzle_door.dmi and /dev/null differ
diff --git a/modular_nova/modules/suicide_verb/readme.md b/modular_nova/modules/suicide_verb/readme.md
deleted file mode 100644
index a31cd8968b2..00000000000
--- a/modular_nova/modules/suicide_verb/readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/Skyrat-SS13/Skyrat-tg/pull/3194
-
-## Title: Suicide verb removal
-
-MODULE ID: SUICIDE_VERB
-
-### Description:
-
-Removes the LRP suicide verb, in the same manner as most RP servers.
-
-### TG Proc/File Changes:
-
-Modified:
-
-- `code/modules/client/verbs/suicide.dm`
-
-Removed:
-
-- `/mob/living/carbon/human/verb/suicide()`
-- `/mob/living/brain/verb/suicide()`
-- `/mob/living/silicon/ai/verb/suicide()`
-- `/mob/living/silicon/robot/verb/suicide()`
-- `/mob/living/silicon/pai/verb/suicide()`
-- `/mob/living/carbon/alien/adult/verb/suicide()`
-- `/mob/living/simple_animal/verb/suicide()`
-
-### Defines:
-
-- N/A
-
-### Master file additions
-
-- N/A
-
-### Included files that are not contained in this module:
-
-- N/A
-
-### Credits:
-
-Rohesie