diff --git a/icons/obj/telescience.dmi b/icons/obj/telescience.dmi
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
diff --git a/icons/obj/turrets.dmi b/icons/obj/turrets.dmi
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
diff --git a/maps/MetaStation.v37H.dmm → maps/MetaStation.v39A.III.dmm b/maps/MetaStation.v37H.dmm → maps/MetaStation.v39A.III.dmm
diff --git a/maps/RandomZLevels/Academy.dmm b/maps/RandomZLevels/Academy.dmm
diff --git a/maps/RandomZLevels/blackmarketpackers.dmm b/maps/RandomZLevels/blackmarketpackers.dmm
diff --git a/maps/RandomZLevels/centcomAway.dmm b/maps/RandomZLevels/centcomAway.dmm
diff --git a/maps/RandomZLevels/challenge.dmm b/maps/RandomZLevels/challenge.dmm
diff --git a/maps/RandomZLevels/example.dmm b/maps/RandomZLevels/example.dmm
diff --git a/maps/RandomZLevels/listeningpost.dmm b/maps/RandomZLevels/listeningpost.dmm
diff --git a/maps/RandomZLevels/spacebattle.dmm b/maps/RandomZLevels/spacebattle.dmm
diff --git a/maps/RandomZLevels/stationCollision.dm b/maps/RandomZLevels/stationCollision.dm
diff --git a/maps/RandomZLevels/stationCollision.dmm b/maps/RandomZLevels/stationCollision.dmm
diff --git a/maps/RandomZLevels/wildwest.dmm b/maps/RandomZLevels/wildwest.dmm
diff --git a/maps/tgstation.2.1.2.dmm b/maps/tgstation.2.1.2.dmm
diff --git a/nano/css/icons.css b/nano/css/icons.css
diff --git a/nano/css/shared.css b/nano/css/shared.css
diff --git a/nano/images/uiBackground.png b/nano/images/uiBackground.png
diff --git a/nano/images/uiBackground.xcf b/nano/images/uiBackground.xcf
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/2-jsviews.js b/nano/js/libraries/2-jsviews.js
diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js
diff --git a/nano/js/nano_config.js b/nano/js/nano_config.js
diff --git a/nano/js/nano_update.js b/nano/js/nano_update.js
diff --git a/nano/templates/TemplatesGuide.txt b/nano/templates/TemplatesGuide.txt
diff --git a/nano/templates/apc.tmpl b/nano/templates/apc.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/wip/apc.tmpl b/nano/templates/wip/apc.tmpl
diff --git a/sound/items/cardshuffle.ogg b/sound/items/cardshuffle.ogg
diff --git a/sound/vox_fem/centcomm.ogg → sound/vox_fem/centcom.ogg b/sound/vox_fem/centcomm.ogg → sound/vox_fem/centcom.ogg
diff --git a/sound/weapons/grenadelaunch.ogg b/sound/weapons/grenadelaunch.ogg
diff --git a/tgstation.dme b/tgstation.dme
diff --git a/tools/HitboxExpander/.gitignore b/tools/HitboxExpander/.gitignore
diff --git a/tools/HitboxExpander/README b/tools/HitboxExpander/README
diff --git a/tools/HitboxExpander/hitbox_expander.py b/tools/HitboxExpander/hitbox_expander.py
diff --git a/tools/HitboxExpander/third_party/Imaging-1.1.7.zip b/tools/HitboxExpander/third_party/Imaging-1.1.7.zip
diff --git a/tools/HitboxExpander/third_party/zlib.zip b/tools/HitboxExpander/third_party/zlib.zip