Delete .int from tracking
Ignore Backup Map updates
Merge branch 'master' of https://github.com/Baystation12/Baystation12.git into Rollback

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/ATMOSPHERICS/pipes.dm
	code/game/area/Space Station 13 areas.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/embedded_controller/airlock_controller.dm
	code/game/objects/explosion.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/clothing/clothing.dm
	code/modules/clothing/shoes/magboots.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/telesci/bscrystal.dm
	data/.gitignore
	data/mode.txt
	icons/mob/eyes.dmi
	icons/mob/head.dmi
	icons/mob/uniform.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/clothing/glasses.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/uniforms.dmi
	icons/turf/areas.dmi
	maps/tgstation2.dmm
Merge branch 'Rollback'

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/ATMOSPHERICS/pipes.dm
	code/game/area/Space Station 13 areas.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/projectile/bullets.dm
	icons/mob/eyes.dmi
	icons/mob/head.dmi
	icons/mob/uniform.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/clothing/glasses.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/uniforms.dmi