diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm
diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm
diff --git a/code/modules/html_interface/html_interface.dm b/code/modules/html_interface/html_interface.dm
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
diff --git a/code/modules/json/json.dm b/code/modules/json/json.dm
diff --git a/code/modules/nano/JSON Reader.dm → code/modules/json/json_reader.dm b/code/modules/nano/JSON Reader.dm → code/modules/json/json_reader.dm
diff --git a/code/modules/json/json_token.dm b/code/modules/json/json_token.dm
diff --git a/code/modules/json/json_writer.dm b/code/modules/json/json_writer.dm
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
diff --git a/code/modules/nano/JSON Writer.dm b/code/modules/nano/JSON Writer.dm
diff --git a/code/modules/nano/_JSON.dm b/code/modules/nano/_JSON.dm
diff --git a/code/modules/nano/external.dm b/code/modules/nano/external.dm
diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm
diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
diff --git a/code/modules/nano/states/admin.dm b/code/modules/nano/states/admin.dm
diff --git a/code/modules/nano/states/base.dm b/code/modules/nano/states/base.dm
diff --git a/code/modules/nano/states/conscious.dm b/code/modules/nano/states/conscious.dm
diff --git a/code/modules/nano/states/contained.dm b/code/modules/nano/states/contained.dm
diff --git a/code/modules/nano/states/deep_inventory.dm b/code/modules/nano/states/deep_inventory.dm
diff --git a/code/modules/nano/states/default.dm b/code/modules/nano/states/default.dm
diff --git a/code/modules/nano/states/inventory.dm b/code/modules/nano/states/inventory.dm
diff --git a/code/modules/nano/states/notcontained.dm b/code/modules/nano/states/notcontained.dm
diff --git a/code/modules/nano/states/physical.dm b/code/modules/nano/states/physical.dm
diff --git a/code/modules/nano/states/self.dm b/code/modules/nano/states/self.dm
diff --git a/code/modules/nano/states/zlevel.dm b/code/modules/nano/states/zlevel.dm
diff --git a/code/modules/nano/subsystem.dm b/code/modules/nano/subsystem.dm
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
diff --git a/code/modules/procedural mapping/mapGenerators/syndicate.dm b/code/modules/procedural mapping/mapGenerators/syndicate.dm
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
diff --git a/code/world.dm b/code/world.dm
diff --git a/config/admins.txt b/config/admins.txt
diff --git a/config/game_options.txt b/config/game_options.txt
diff --git a/config/tips.txt b/config/tips.txt
diff --git a/html/changelog.html b/html/changelog.html
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
diff --git a/html/changelogs/AutoChangeLog-pr-12899.yml b/html/changelogs/AutoChangeLog-pr-12899.yml
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
diff --git a/icons/obj/smooth_structures/rice_window.dmi b/icons/obj/smooth_structures/rice_window.dmi
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
diff --git a/icons/turf/snow.dmi b/icons/turf/snow.dmi
diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
diff --git a/nano/css/shared.css b/nano/css/shared.css
diff --git a/nano/images/icon-eye.xcf → nano/image_source/icon-eye.xcf b/nano/images/icon-eye.xcf → nano/image_source/icon-eye.xcf
diff --git a/nano/NTLogoRevised.fla → nano/image_source/source/NTLogoRevised.fla b/nano/NTLogoRevised.fla → nano/image_source/source/NTLogoRevised.fla
diff --git a/nano/image_source/source/icon-eye.xcf b/nano/image_source/source/icon-eye.xcf
diff --git a/nano/image_source/source/uiBackground-Syndicate.xcf b/nano/image_source/source/uiBackground-Syndicate.xcf
diff --git a/nano/uiBackground.fla → nano/image_source/source/uiBackground.fla b/nano/uiBackground.fla → nano/image_source/source/uiBackground.fla
diff --git a/nano/image_source/source/uiBackground.xcf b/nano/image_source/source/uiBackground.xcf
diff --git a/nano/image_source/source/uiBasicBackground.xcf b/nano/image_source/source/uiBasicBackground.xcf
diff --git a/nano/image_source/source/uiIcons16Green.xcf b/nano/image_source/source/uiIcons16Green.xcf
diff --git a/nano/image_source/source/uiIcons16Red.xcf b/nano/image_source/source/uiIcons16Red.xcf
diff --git a/nano/images/uiIcons24.xcf → nano/image_source/source/uiIcons24.xcf b/nano/images/uiIcons24.xcf → nano/image_source/source/uiIcons24.xcf
diff --git a/nano/images/uiNoticeBackground.xcf → ...mage_source/source/uiNoticeBackground.xcf b/nano/images/uiNoticeBackground.xcf → ...mage_source/source/uiNoticeBackground.xcf
diff --git a/nano/images/uiTitleBackground.xcf → ...image_source/source/uiTitleBackground.xcf b/nano/images/uiTitleBackground.xcf → ...image_source/source/uiTitleBackground.xcf
diff --git a/nano/images/uiBackground.xcf → nano/image_source/uiBackground.xcf b/nano/images/uiBackground.xcf → nano/image_source/uiBackground.xcf
diff --git a/nano/image_source/uiIcons24.xcf b/nano/image_source/uiIcons24.xcf
diff --git a/nano/image_source/uiNoticeBackground.xcf b/nano/image_source/uiNoticeBackground.xcf
diff --git a/nano/image_source/uiTitleBackground.xcf b/nano/image_source/uiTitleBackground.xcf
diff --git a/nano/images/c_charging.gif b/nano/images/c_charging.gif
diff --git a/nano/images/c_discharging.gif b/nano/images/c_discharging.gif
diff --git a/nano/images/c_max.gif b/nano/images/c_max.gif
diff --git a/nano/images/nanomapBackground.png b/nano/images/nanomapBackground.png
diff --git a/nano/images/nanomap_z1.png b/nano/images/nanomap_z1.png
diff --git a/nano/images/uiBackground-Syndicate.png b/nano/images/uiBackground-Syndicate.png
diff --git a/nano/images/uiBackground.png b/nano/images/uiBackground.png
diff --git a/nano/images/uiBasicBackground.png b/nano/images/uiBasicBackground.png
diff --git a/nano/images/uiIcons16.png b/nano/images/uiIcons16.png
diff --git a/nano/images/uiIcons16Green.png b/nano/images/uiIcons16Green.png
diff --git a/nano/images/uiIcons16Red.png b/nano/images/uiIcons16Red.png
diff --git a/nano/images/uiMaskBackground.png b/nano/images/uiMaskBackground.png
diff --git a/nano/images/uiTitleFluff-Syndicate.png b/nano/images/uiTitleFluff-Syndicate.png
diff --git a/nano/interfaces/air_alarm.tmpl b/nano/interfaces/air_alarm.tmpl
diff --git a/nano/interfaces/apc.tmpl b/nano/interfaces/apc.tmpl
diff --git a/nano/interfaces/atmos_filter.tmpl b/nano/interfaces/atmos_filter.tmpl
diff --git a/nano/interfaces/atmos_mixer.tmpl b/nano/interfaces/atmos_mixer.tmpl
diff --git a/nano/interfaces/atmos_pump.tmpl b/nano/interfaces/atmos_pump.tmpl
diff --git a/nano/interfaces/canister.tmpl b/nano/interfaces/canister.tmpl
diff --git a/nano/interfaces/chem_dispenser.tmpl b/nano/interfaces/chem_dispenser.tmpl
diff --git a/nano/templates/chem_heater.tmpl → nano/interfaces/chem_heater.tmpl b/nano/templates/chem_heater.tmpl → nano/interfaces/chem_heater.tmpl
diff --git a/nano/interfaces/cryo.tmpl b/nano/interfaces/cryo.tmpl
diff --git a/nano/interfaces/smes.tmpl b/nano/interfaces/smes.tmpl
diff --git a/nano/interfaces/solar_control.tmpl b/nano/interfaces/solar_control.tmpl
diff --git a/nano/interfaces/tanks.tmpl b/nano/interfaces/tanks.tmpl
diff --git a/nano/js/libraries.min.js b/nano/js/libraries.min.js
diff --git a/nano/js/libraries/2-jsrender.js b/nano/js/libraries/2-jsrender.js
diff --git a/nano/js/libraries/3-jquery.timers.js b/nano/js/libraries/3-jquery.timers.js
diff --git a/nano/layouts/layout_basic.css b/nano/layouts/layout_basic.css
diff --git a/nano/layouts/layout_basic.tmpl b/nano/layouts/layout_basic.tmpl
diff --git a/nano/layouts/layout_default.css b/nano/layouts/layout_default.css
diff --git a/nano/layouts/layout_default.tmpl b/nano/layouts/layout_default.tmpl
diff --git a/nano/scripts/doT.js b/nano/scripts/doT.js
diff --git a/nano/scripts/jquery-ui.js b/nano/scripts/jquery-ui.js
diff --git a/nano/js/libraries/1-jquery.js → nano/scripts/jquery.js b/nano/js/libraries/1-jquery.js → nano/scripts/jquery.js
diff --git a/nano/scripts/nano_base_callbacks.js b/nano/scripts/nano_base_callbacks.js
diff --git a/nano/js/nano_base_helpers.js → nano/scripts/nano_base_helpers.js b/nano/js/nano_base_helpers.js → nano/scripts/nano_base_helpers.js
diff --git a/nano/js/nano_config.js → nano/scripts/nano_config.js b/nano/js/nano_config.js → nano/scripts/nano_config.js
diff --git a/nano/scripts/nano_state.js b/nano/scripts/nano_state.js
diff --git a/nano/scripts/nano_state_default.js b/nano/scripts/nano_state_default.js
diff --git a/nano/scripts/nano_state_manager.js b/nano/scripts/nano_state_manager.js
diff --git a/nano/scripts/nano_template.js b/nano/scripts/nano_template.js
diff --git a/nano/js/nano_update.js → nano/scripts/nano_update.js b/nano/js/nano_update.js → nano/scripts/nano_update.js
diff --git a/nano/scripts/nano_utility.js b/nano/scripts/nano_utility.js
diff --git a/nano/css/icons.css → nano/styles/icons.css b/nano/css/icons.css → nano/styles/icons.css
diff --git a/nano/styles/shared.css b/nano/styles/shared.css
diff --git a/nano/templates/TemplatesGuide.txt b/nano/templates/TemplatesGuide.txt
diff --git a/nano/templates/air_alarm.tmpl b/nano/templates/air_alarm.tmpl
diff --git a/nano/templates/apc.tmpl b/nano/templates/apc.tmpl
diff --git a/nano/templates/atmos_filter.tmpl b/nano/templates/atmos_filter.tmpl
diff --git a/nano/templates/atmos_gas_pump.tmpl b/nano/templates/atmos_gas_pump.tmpl
diff --git a/nano/templates/atmos_mixer.tmpl b/nano/templates/atmos_mixer.tmpl
diff --git a/nano/templates/canister.tmpl b/nano/templates/canister.tmpl
diff --git a/nano/templates/chem_dispenser.tmpl b/nano/templates/chem_dispenser.tmpl
diff --git a/nano/templates/cryo.tmpl b/nano/templates/cryo.tmpl
diff --git a/nano/templates/smes.tmpl b/nano/templates/smes.tmpl
diff --git a/nano/templates/solar_control.tmpl b/nano/templates/solar_control.tmpl
diff --git a/nano/templates/tanks.tmpl b/nano/templates/tanks.tmpl
diff --git a/tgstation.dme b/tgstation.dme
diff --git a/tools/dmitool/README.txt b/tools/dmitool/README.txt
diff --git a/tools/dmitool/build.gradle b/tools/dmitool/build.gradle
diff --git a/tools/dmitool/dmimerge.sh b/tools/dmitool/dmimerge.sh
diff --git a/tools/dmitool/dmitool.jar b/tools/dmitool/dmitool.jar
diff --git a/tools/dmitool/dmitool.py b/tools/dmitool/dmitool.py
diff --git a/tools/dmitool/git_merge_installer.bat b/tools/dmitool/git_merge_installer.bat
diff --git a/tools/dmitool/git_merge_installer.sh b/tools/dmitool/git_merge_installer.sh
diff --git a/tools/dmitool/merging.txt b/tools/dmitool/merging.txt
diff --git a/tools/dmitool/src/main/java/dmitool/DMI.java b/tools/dmitool/src/main/java/dmitool/DMI.java
diff --git a/tools/dmitool/src/main/java/dmitool/DMIDiff.java b/tools/dmitool/src/main/java/dmitool/DMIDiff.java
diff --git a/tools/dmitool/src/main/java/dmitool/DMIException.java b/tools/dmitool/src/main/java/dmitool/DMIException.java
diff --git a/tools/dmitool/src/main/java/dmitool/IconState.java b/tools/dmitool/src/main/java/dmitool/IconState.java
diff --git a/tools/dmitool/src/main/java/dmitool/IconStateDiff.java b/tools/dmitool/src/main/java/dmitool/IconStateDiff.java
diff --git a/tools/dmitool/src/main/java/dmitool/Image.java b/tools/dmitool/src/main/java/dmitool/Image.java
diff --git a/tools/dmitool/src/main/java/dmitool/Main.java b/tools/dmitool/src/main/java/dmitool/Main.java
diff --git a/tools/dmitool/src/main/java/dmitool/NonPalettedImage.java b/tools/dmitool/src/main/java/dmitool/NonPalettedImage.java
diff --git a/tools/dmitool/src/main/java/dmitool/PNGChunk.java b/tools/dmitool/src/main/java/dmitool/PNGChunk.java
diff --git a/tools/dmitool/src/main/java/dmitool/PalettedImage.java b/tools/dmitool/src/main/java/dmitool/PalettedImage.java
diff --git a/tools/dmitool/src/main/java/dmitool/RGBA.java b/tools/dmitool/src/main/java/dmitool/RGBA.java