diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 9b0a79dab7d70..a2daf32a42856 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1369,10 +1369,15 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	//volume = 140 //jetpack sould be larger, but then it will never deplete -rastaf0
 
-/obj/item/weapon/tank/jetpack/voidpack
+/obj/item/weapon/tank/jetpack/void_jetpack
 	name = "Void Jetpack (oxygen)"
 	icon_state = "voidjetpack0"
-	item_state =  "voidjetpack0"
+	item_state =  "jetpack"
+
+/obj/item/weapon/tank/jetpack/black_jetpack
+	name = "Black Jetpack (oxygen)"
+	icon_state = "black_jetpack0"
+	item_state =  "black_jetpack"
 
 /obj/item/weapon/tank/oxygen
 	name = "Gas Tank (Oxygen)"
diff --git a/code/game/objects/closets/malfunction.dm b/code/game/objects/closets/malfunction.dm
index 16bde812ed632..f89edd0d390dc 100644
--- a/code/game/objects/closets/malfunction.dm
+++ b/code/game/objects/closets/malfunction.dm
@@ -1,7 +1,7 @@
 /obj/closet/malf/suits/New()
 	..()
 	sleep(2)
-	new /obj/item/weapon/tank/jetpack/voidpack(src)
+	new /obj/item/weapon/tank/jetpack/void_jetpack(src)
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/clothing/head/helmet/space/nasavoid(src)
 	new /obj/item/clothing/suit/space/nasavoid(src)
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 0f344b0dff569..9efde93adf855 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -4,7 +4,6 @@
 
 ///General Offhand object properties///
 
-
 ////////////FIREAXE!//////////////
 
 
@@ -16,7 +15,6 @@
 	src.wielded = 0
 	src.name = "Fire Axe (Unwielded)"
 
-
 /obj/item/weapon/fireaxe/attack_self(mob/user as mob)
 	if( istype(user,/mob/living/carbon/monkey) )
 		user << "\red It's too heavy for you to fully wield"
diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm
index 6376e9412d5b5..7972c48406993 100644
--- a/code/game/objects/tank.dm
+++ b/code/game/objects/tank.dm
@@ -296,6 +296,8 @@
 	src.on = !( src.on )
 	if(src.name == "Void Jetpack (oxygen)")         //Slight change added by me. i didn't make it an if-elseif because some of you might want to add other types of resprited packs :3 -Agouri
 		src.icon_state = text("voidjetpack[]", src.on)
+	else if(src.name == "Black Jetpack (oxygen)")
+		src.icon_state = text("black_jetpack[]", src.on)
 	else
 		src.icon_state = text("jetpack[]", src.on)
 	if(src.on)
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 8b5e8d71a1ada..f025284c8ca79 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index 2a57d870ef4ff..d511b7218a001 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 8ec42e5e5d821..bc0718aa0654b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -35,6 +35,7 @@
 #define FILE_DIR "code/game/gamemodes/cult"
 #define FILE_DIR "code/game/gamemodes/events"
 #define FILE_DIR "code/game/gamemodes/extended"
+#define FILE_DIR "code/game/gamemodes/extra"
 #define FILE_DIR "code/game/gamemodes/malfunction"
 #define FILE_DIR "code/game/gamemodes/meteor"
 #define FILE_DIR "code/game/gamemodes/nuclear"
@@ -327,14 +328,13 @@
 #include "code\game\gamemodes\blob\theblob.dm"
 #include "code\game\gamemodes\changeling\changeling.dm"
 #include "code\game\gamemodes\changeling\changeling_powers.dm"
-#include "code\game\gamemodes\changeling\traitor_chan.dm"
 #include "code\game\gamemodes\cult\cult.dm"
 #include "code\game\gamemodes\events\clang.dm"
 #include "code\game\gamemodes\events\dust.dm"
-#include "code\game\gamemodes\events\ninja_abilities.dm"
-#include "code\game\gamemodes\events\ninja_equipment.dm"
-#include "code\game\gamemodes\events\space_ninja.dm"
 #include "code\game\gamemodes\extended\extended.dm"
+#include "code\game\gamemodes\extra\ninja_abilities.dm"
+#include "code\game\gamemodes\extra\ninja_equipment.dm"
+#include "code\game\gamemodes\extra\space_ninja.dm"
 #include "code\game\gamemodes\malfunction\Malf_Modules.dm"
 #include "code\game\gamemodes\malfunction\malfunction.dm"
 #include "code\game\gamemodes\meteor\meteor.dm"
@@ -626,7 +626,6 @@
 #include "code\modules\admin\create_mob.dm"
 #include "code\modules\admin\create_object.dm"
 #include "code\modules\admin\create_turf.dm"
-#include "code\modules\admin\newbanjob.dm"
 #include "code\modules\admin\verbs\adminhelp.dm"
 #include "code\modules\admin\verbs\adminjump.dm"
 #include "code\modules\admin\verbs\adminsay.dm"
@@ -787,7 +786,6 @@
 #include "code\modules\power\singularity\particle_accelerator\particle_emitter.dm"
 #include "code\modules\power\singularity\particle_accelerator\particle_power.dm"
 #include "code\unused\vehicle.dm"
-#include "code\unused\gamemodes\monkey.dm"
 #include "code\WorkInProgress\BrokenInhands.dm"
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\Cameras.dm"