final stuff
final stuff

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64