diff --git a/code/modules/projectiles/ammunition/energy/special.dm b/code/modules/projectiles/ammunition/energy/special.dm
index 2bf7c06ec6..0cea7a361d 100644
--- a/code/modules/projectiles/ammunition/energy/special.dm
+++ b/code/modules/projectiles/ammunition/energy/special.dm
@@ -32,12 +32,13 @@
 /obj/item/ammo_casing/energy/temp
 	projectile_type = /obj/item/projectile/temp
 	select_name = "freeze"
-	e_cost = 250
+	e_cost = 50 // twenty shots before emptying
 	fire_sound = 'sound/weapons/pulse3.ogg'
 
 /obj/item/ammo_casing/energy/temp/hot
 	projectile_type = /obj/item/projectile/temp/hot
 	select_name = "bake"
+	fire_sound = 'sound/weapons/pulse2.ogg'
 
 /obj/item/ammo_casing/energy/meteor
 	projectile_type = /obj/item/projectile/meteor
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index f965100846..d612c33e3c 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -310,9 +310,10 @@
 /obj/item/gun/energy/temperature
 	name = "temperature gun"
 	icon_state = "freezegun"
+	item_state = "freezegun"
 	desc = "A gun that changes temperatures."
 	ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/hot)
-	cell_type = "/obj/item/stock_parts/cell/high"
+	shaded_charge = 1
 	pin = null
 
 /obj/item/gun/energy/temperature/security
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 71e6e79f59..ec23af6748 100644
--- a/code/modules/projectiles/projectile/special/temperature.dm
+++ b/code/modules/projectiles/projectile/special/temperature.dm
@@ -1,9 +1,17 @@
 /obj/item/projectile/temp
 	name = "freeze beam"
 	icon_state = "ice_2"
+	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	damage = 0
+	light_range = 2
 	damage_type = BURN
 	nodamage = FALSE
+	hitsound = 'sound/weapons/frost.ogg'
+	hitsound_wall = 'sound/weapons/frost.ogg'
+	ricochets_max = 50	//Honk!
+	ricochet_chance = 80
+	is_reflectable = TRUE
+	light_color = LIGHT_COLOR_BLUE
 	flag = "energy"
 	var/temperature = 100
 
@@ -15,7 +23,12 @@
 
 /obj/item/projectile/temp/hot
 	name = "heat beam"
+	icon_state = "lava"
+	damage = 10
+	hitsound = 'sound/weapons/sear.ogg'
+	hitsound_wall = 'sound/weapons/effects/searwall.ogg'
 	temperature = 400
+	light_color = LIGHT_COLOR_RED
 
 /obj/item/projectile/temp/cryo
 	name = "cryo beam"
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index 07000f43aa..44250a9e9a 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index cf07bbba91..7ed7af93e2 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 158c95ee5d..75cfad06f5 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/sound/weapons/frost.ogg b/sound/weapons/frost.ogg
new file mode 100644
index 0000000000..67884e87be
Binary files /dev/null and b/sound/weapons/frost.ogg differ