Merge branch 'master' of https://github.com/Aurorastation/Aurora.3

code/game/objects/items/devices/dociler.dm

@@ -3,12 +3,11 @@
 	desc = "A complex single use recharging injector that spreads a complex neurological serum that makes animals docile and friendly. Somewhat."
 	w_class = 3
 	origin_tech = list(TECH_BIO = 5, TECH_MATERIAL = 2)
-	icon_state = "animal_tagger1"
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi'
-		)
-	item_state = "gun"
+	// To-do track down where the hell this sprite went?
+	icon = 'icons/obj/guns/decloner.dmi'
+	icon_state = "decloner"
+	item_state = "decloner"
+	contained_sprite = TRUE
 	force = 0
 	var/loaded = 1
 	var/mode = "completely"

code/game/objects/items/toys.dm

@@ -131,14 +131,11 @@
 /obj/item/toy/crossbow
 	name = "foam dart crossbow"
 	desc = "A weapon favored by many overactive children. Ages 8 and up."
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/crossbow.dmi'
 	icon_state = "crossbow"
 	item_state = "crossbow"
 	drop_sound = 'sound/items/drop/gun.ogg'
-	item_icons = list(//ITEM_ICONS ARE DEPRECATED. USE CONTAINED SPRITES IN FUTURE
-		icon_l_hand = 'icons/mob/items/lefthand_guns.dmi',
-		icon_r_hand = 'icons/mob/items/righthand_guns.dmi'
-		)
+	contained_sprite = TRUE
 	w_class = ITEMSIZE_SMALL
 	attack_verb = list("attacked", "struck", "hit")
 	var/bullets = 5

code/game/objects/items/weapons/material/shards.dm

@@ -99,7 +99,7 @@
 	..(loc, "titanium")
 
 /obj/item/material/shard/phoron/New(loc)
-	..(loc, "phglass")
+	..(loc, "borosilicate glass")
 
 /obj/item/material/shard/wood/New(loc)
 	..(loc, "wood")