diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 0b461af0861..4e1a5843f60 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -183,6 +183,13 @@ obj/item/device/flashlight/lamp/bananalamp
 		update_brightness(U)
 	else
 		update_brightness(null)
+		
+/obj/item/device/flashlight/flare/update_brightness(var/mob/user = null)
+	..()
+	if(on)
+		item_state = "[initial(item_state)]-on"
+	else
+		item_state = "[initial(item_state)]"
 
 /obj/item/device/flashlight/flare/attack_self(mob/user)
 
@@ -200,6 +207,15 @@ obj/item/device/flashlight/lamp/bananalamp
 		src.force = on_damage
 		src.damtype = "fire"
 		processing_objects += src
+		
+/obj/item/device/flashlight/flare/torch
+	name = "torch"
+	desc = "A torch fashioned from some leaves and a log."
+	w_class = 4
+	brightness_on = 7
+	icon_state = "torch"
+	item_state = "torch"
+	on_damage = 10
 
 /obj/item/device/flashlight/slime
 	gender = PLURAL
diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm
index 943e593183e..3cf7bd35c68 100644
--- a/code/game/objects/items/stacks/tiles/light.dm
+++ b/code/game/objects/items/stacks/tiles/light.dm
@@ -12,13 +12,8 @@
 	singular_name = "light floor tile"
 	desc = "A floor tile, made out off glass. Use a multitool on it to change its color."
 	icon_state = "tile_light blue"
-	w_class = 3.0
-	force = 3.0
-	throwforce = 5.0
-	throw_speed = 5
-	throw_range = 20
-	flags = CONDUCT
-	max_amount = 60
+	force = 3
+	throwforce = 5
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
 	var/on = 1
 	var/state = LIGHTFLOOR_ON
@@ -49,4 +44,5 @@
 		icon_state="tile_"+color_desc()
 		user << "[src] is now "+color_desc()
 
-	return ..()
\ No newline at end of file
+	return ..()
+	
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm
index d40434a1d6e..b864b8f0897 100644
--- a/code/game/objects/items/stacks/tiles/plasteel.dm
+++ b/code/game/objects/items/stacks/tiles/plasteel.dm
@@ -4,14 +4,11 @@
 	singular_name = "floor tile"
 	desc = "Those could work as a pretty decent throwing weapon"
 	icon_state = "tile"
-	w_class = 3.0
-	force = 6.0
+	force = 6
 	materials = list(MAT_METAL=500)
-	throwforce = 10.0
+	throwforce = 10
 	throw_speed = 3
 	throw_range = 7
-	flags = CONDUCT
-	max_amount = 60
 
 /obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
 	..()
@@ -19,28 +16,10 @@
 	src.pixel_y = rand(1, 14)
 	return
 
-/*
-/obj/item/stack/tile/plasteel/attack_self(mob/user as mob)
-	if (usr.stat)
-		return
-	var/T = user.loc
-	if (!( istype(T, /turf) ))
-		user << "\red You must be on the ground!"
-		return
-	if (!( istype(T, /turf/space) ))
-		user << "\red You cannot build on or repair this turf!"
-		return
-	src.build(T)
-	src.add_fingerprint(user)
-	use(1)
-	return
-*/
-
 /obj/item/stack/tile/plasteel/proc/build(turf/S as turf)
 	if (istype(S,/turf/space))
 		S.ChangeTurf(/turf/simulated/floor/plating/airless)
 	else
 		S.ChangeTurf(/turf/simulated/floor/plating)
-//	var/turf/simulated/floor/W = S.ReplaceWithFloor()
-//	W.make_plating()
-	return
\ No newline at end of file
+	return
+	
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index f54f2481bb6..aa077a6be77 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -1,9 +1,23 @@
-/* Diffrent misc types of tiles
+/* Different misc types of tiles
  * Contains:
  *		Grass
  *		Wood
  *		Carpet
  */
+ /obj/item/stack/tile
+	name = "broken tile"
+	singular_name = "broken tile"
+	desc = "A broken tile. This should not exist."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "tile"
+	item_state = "tile"
+	w_class = 3
+	force = 1
+	throwforce = 1
+	throw_speed = 5
+	throw_range = 20
+	max_amount = 60
+	flags = CONDUCT
 
 /*
  * Grass
@@ -14,13 +28,6 @@
 	singular_name = "grass floor tile"
 	desc = "A patch of grass like they often use on golf courses"
 	icon_state = "tile_grass"
-	w_class = 3.0
-	force = 1.0
-	throwforce = 1.0
-	throw_speed = 5
-	throw_range = 20
-	flags = CONDUCT
-	max_amount = 60
 	origin_tech = "biotech=1"
 
 /*
@@ -32,13 +39,6 @@
 	singular_name = "wood floor tile"
 	desc = "an easy to fit wood floor tile"
 	icon_state = "tile-wood"
-	w_class = 3.0
-	force = 1.0
-	throwforce = 1.0
-	throw_speed = 5
-	throw_range = 20
-	flags = CONDUCT
-	max_amount = 60
 
 /*
  * Carpets
@@ -48,10 +48,3 @@
 	singular_name = "carpet"
 	desc = "A piece of carpet. It is the same size as a floor tile"
 	icon_state = "tile-carpet"
-	w_class = 3.0
-	force = 1.0
-	throwforce = 1.0
-	throw_speed = 5
-	throw_range = 20
-	flags = CONDUCT
-	max_amount = 60
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index ffa0b3de900..03340af09b7 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -143,6 +143,7 @@
 	desc = "A universal syndicate small-arms suppressor for maximum espionage."
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "suppressor"
+	item_state = "suppressor"
 	w_class = 2
 	var/oldsound = null
 	var/initial_w_class = null
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index a25f3f2657e..8180bb2561f 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -169,7 +169,7 @@
 	desc = "A golden cup"
 	name = "golden cup"
 	icon_state = "golden_cup"
-	item_state = "" //nope :(
+	item_state = "golden_cup" //yup :)
 	w_class = 4
 	force = 14
 	throwforce = 10
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index f85ee8c3453..219d5c433b4 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index f051cc0a5c5..e8ca54b94d1 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index f417a982a64..d4c4b244809 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ