diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index fa59cbbecb0..196c185bdeb 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm
index 693f7037756..512c2f2489f 100644
--- a/maps/tgstation.2.0.7.dmm
+++ b/maps/tgstation.2.0.7.dmm
@@ -5845,9 +5845,9 @@
 "ciu" = (/obj/machinery/dispenser,/turf/unsimulated/floor{icon_state = "green"; dir = 1},/area/centcom/control)
 "civ" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/unsimulated/floor{icon_state = "green"; dir = 1},/area/centcom/control)
 "ciw" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/unsimulated/floor{icon_state = "green"; dir = 5},/area/centcom/control)
-"cix" = (/obj/rack{dir = 4},/obj/item/weapon/tank/jetpack/voidpack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/nasavoid,/obj/item/clothing/head/helmet/space/nasavoid,/obj/item/clothing/mask/gas,/turf/unsimulated/floor{icon_state = "green"; dir = 9},/area/centcom/control)
-"ciy" = (/obj/rack{dir = 4},/obj/item/weapon/tank/jetpack/voidpack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/nasavoid,/obj/item/clothing/head/helmet/space/nasavoid,/obj/item/clothing/mask/gas,/turf/unsimulated/floor{icon_state = "green"; dir = 1},/area/centcom/control)
-"ciz" = (/obj/rack{dir = 4},/obj/item/weapon/tank/jetpack/voidpack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/nasavoid,/obj/item/clothing/head/helmet/space/nasavoid,/obj/item/clothing/mask/gas,/turf/unsimulated/floor{icon_state = "green"; dir = 5},/area/centcom/control)
+"cix" = (/obj/rack{dir = 4},/obj/item/weapon/tank/jetpack/void_jetpack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/nasavoid,/obj/item/clothing/head/helmet/space/nasavoid,/obj/item/clothing/mask/gas,/turf/unsimulated/floor{icon_state = "green"; dir = 9},/area/centcom/control)
+"ciy" = (/obj/rack{dir = 4},/obj/item/weapon/tank/jetpack/void_jetpack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/nasavoid,/obj/item/clothing/head/helmet/space/nasavoid,/obj/item/clothing/mask/gas,/turf/unsimulated/floor{icon_state = "green"; dir = 1},/area/centcom/control)
+"ciz" = (/obj/rack{dir = 4},/obj/item/weapon/tank/jetpack/void_jetpack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/nasavoid,/obj/item/clothing/head/helmet/space/nasavoid,/obj/item/clothing/mask/gas,/turf/unsimulated/floor{icon_state = "green"; dir = 5},/area/centcom/control)
 "ciA" = (/obj/landmark{name = "prisonwarp"},/turf/unsimulated/floor{name = "plating"},/area/prison/solitary)
 "ciB" = (/turf/unsimulated/floor{tag = "icon-floorgrime"; icon_state = "floorgrime"},/area/prison/solitary)
 "ciC" = (/obj/machinery/portable_atmospherics/canister/air,/turf/unsimulated/floor{icon_state = "green"; dir = 8},/area/centcom/control)
diff --git a/tgstation.dme b/tgstation.dme
index bc0718aa065..8ec42e5e5d8 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -35,7 +35,6 @@
 #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"
@@ -328,13 +327,14 @@
 #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,6 +626,7 @@
 #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"
@@ -786,6 +787,7 @@
 #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"