Merge pull request #21 from ReoDaProtovali/Fixing-the-fixes

Plentitide of small fixes part 2: electric boogaloo

code/game/objects/effects/decals/cleanable/misc.dm

@@ -277,24 +277,26 @@
 	icon_state = "salt_pile"
 	gender = NEUTER
 
-/obj/effect/decal/cleanable/glitter //GS13 - changed glitters to more subtle variants
+/obj/effect/decal/cleanable/glitter
 	name = "generic glitter pile"
 	desc = "The herpes of arts and crafts."
-	icon = 'GainStation13/icons/effects/atmospherics.dmi'
-	icon_state = "glitter"
+	icon = 'icons/effects/atmospherics.dmi'
 	gender = NEUTER
 	mergeable_decal = TRUE
 	persistent = FALSE
 
 /obj/effect/decal/cleanable/glitter/pink
 	name = "pink glitter"
+	icon_state = "plasma_old"
 	color = "#9e0089"
 
 /obj/effect/decal/cleanable/glitter/white
 	name = "white glitter"
+	icon_state = "nitrous_oxide_old"
 
 /obj/effect/decal/cleanable/glitter/blue
 	name = "blue glitter"
+	icon_state = "freon_old"
 	color = "#2dd6ff"
 
 /obj/effect/decal/cleanable/plasma

code/game/objects/structures/beds_chairs/chair.dm

@@ -160,7 +160,7 @@
 	buildstacktype = null //Custom mats handle this
 
 /obj/structure/chair/wood
-	icon = 'GainStation13/icons/obj/chairs.dmi'
+	icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 Edit: Our sprites
 	icon_state = "wooden_chair"
 	name = "wooden chair"
 	desc = "Old is never too old to not be in fashion."
@@ -540,7 +540,7 @@
 
 /obj/item/chair/wood
 	name = "wooden chair"
-	icon = 'GainStation13/icons/obj/chairs.dmi'
+	icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 Edit: Our sprites
 	icon_state = "wooden_chair_toppled"
 	item_state = "woodenchair"
 	resistance_flags = FLAMMABLE