Code Cleanup

Minor code Cleanup.
Revert "Code Cleanup"

This reverts commit 02ce0456c8728f730a20c905dfae351596472a0c.
Code Cleanup
Alien Update

This is an update, converting all the aliens to "Accurate" aliens.
Merge branch 'master' of https://github.com/apophis775/ColonialMarines into apophis775-master

Conflicts:
	code/game/jobs/job/marines.dm
	code/modules/marines/closets.dm
	code/modules/marines/marine_areas.dm
	code/modules/marines/marine_weapons.dm
	code/modules/marines/newarmor.dm
	code/modules/mob/new_player/preferences_setup.dm
	config/admins.txt
	config/donators.txt
	icons/marine-weapons.dmi
	icons/obj/ammo.dmi
	icons/obj/gun.dmi
Merge branch 'apophis775-master'

Conflicts:
	code/game/jobs/job/marines.dm
	code/modules/marines/closets.dm
	code/modules/marines/marine_areas.dm
	code/modules/marines/marine_weapons.dm
	code/modules/marines/newarmor.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/carrier.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/corroder.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/hivelord.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/ravager.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/runner.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/spitter.dm
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
	code/modules/mob/living/carbon/alien/humanoid/queen.dm
	code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
	code/modules/mob/living/carbon/alien/larva/larva.dm
	code/modules/mob/living/carbon/alien/larva/update_icons.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/simple_animal/hostile/alien.dm
	code/modules/mob/new_player/preferences_setup.dm
	icons/marine-weapons.dmi
	icons/obj/ammo.dmi
	icons/obj/gun.dmi
	maps/tgstation3.2-Sulaco.dmm