Broken font shit?
"Else" clause removal (/obj/machinery/portable_atmospherics/canister/update_icon()).
"Else" clause removal (/obj/machinery/apc/update_icon()).
Missed the comment for line (/obj/machinery/apc/update_icon()).
Changes 'n shit
Merge pull request #11 from ZomgPonies/master

Merge from Master
Enemy Communication Intercepted...

security level elevated.
Admin room revamp
More admin room updates
Merge pull request #153 from SamCroswell/master

Admin Room Revamp, ERT Announcer Adjustments
Merge pull request #152 from Regen1/master

Heavy laser buff, new sniper projectile
Merge pull request #149 from alex-gh/vg_cherry-picks

VG update_icon optimizations for APCs and canisters.
Merge pull request #150 from Fox-McCloud/Enemy-Communication-Intercepted

Enemy communication intercepted
Merge pull request #12 from ZomgPonies/master

Merge From Master
Re-implementation

Makes the AI's voice more "AI"-like, adds a title screen, enables end of
the round sound-byte quips, and enables two additional songs during
pre-game
Merge pull request #154 from Fox-McCloud/Title+Music+AI-changes

Title+music+ai changes
Fixed shrapnel embedding

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
Generalized yank_out_object().
Fixes #4223

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
Check for verb removal.