Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

code/game/objects/items/stacks/medical.dm

@@ -113,7 +113,7 @@
 	name = "\improper S'rendarr's Hand leaf"
 	singular_name = "S'rendarr's Hand leaf"
 	desc = "A soft leaf that is rubbed on bruises."
-	icon = 'harvest.dmi'
+	icon = 'icons/obj/harvest.dmi'
 	icon_state = "cabbage"
 	heal_brute = 7
 
@@ -121,7 +121,7 @@
 	name = "\improper Messa's Tear leaf"
 	singular_name = "Messa's Tear leaf"
 	desc = "A cold leaf that is rubbed on burns."
-	icon = 'harvest.dmi'
+	icon = 'icons/obj/harvest.dmi'
 	icon_state = "ambrosiavulgaris"
 	heal_burn = 7
 

code/game/objects/items/stacks/sheets/mineral.dm

@@ -253,4 +253,4 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
 	throw_speed = 3
 	throw_range = 3
 	origin_tech = "materials=4"
-	perunit = 2000
+	perunit = 2000

code/game/objects/items/trash.dm

@@ -54,4 +54,4 @@
 		icon_state = "liquidfood"
 
 /obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
-	return
+	return

code/game/objects/items/weapons/implants/implant.dm

@@ -2,7 +2,7 @@
 #define MALFUNCTION_PERMANENT 2
 /obj/item/weapon/implant
 	name = "implant"
-	icon = 'device.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "implant"
 	var/implanted = null
 	var/mob/imp_in = null

code/game/objects/items/weapons/implants/implantcase.dm

@@ -121,7 +121,7 @@
 /obj/item/weapon/implantcase/death_alarm
 	name = "Glass Case- 'Death Alarm'"
 	desc = "A case containing a death alarm implant."
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "implantcase-b"
 
 	New()

code/game/objects/items/weapons/paint.dm

@@ -5,7 +5,7 @@ var/global/list/cached_icons = list()
 /obj/item/weapon/reagent_containers/glass/paint
 	desc = "It's a paint bucket."
 	name = "paint bucket"
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "paint_neutral"
 	item_state = "paintcan"
 	m_amt = 200

code/game/objects/items/weapons/power_cells.dm

@@ -111,4 +111,4 @@
 	maxcharge = 10000
 	maxcharge = 10000
 	m_amt = 0
-	g_amt = 0
+	g_amt = 0

code/game/objects/items/weapons/surgery_tools.dm

@@ -794,7 +794,7 @@ LOOK FOR SURGERY.DM*/
 //misc, formerly from code/defines/weapons.dm
 /obj/item/weapon/bonegel
 	name = "bone gel"
-	icon = 'surgery.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "bone-gel"
 	force = 0
 	w_class = 2.0
@@ -802,7 +802,7 @@ LOOK FOR SURGERY.DM*/
 
 /obj/item/weapon/FixOVein
 	name = "FixOVein"
-	icon = 'surgery.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "fixovein"
 	force = 0
 	throwforce = 1.0
@@ -812,7 +812,7 @@ LOOK FOR SURGERY.DM*/
 
 /obj/item/weapon/bonesetter
 	name = "bone setter"
-	icon = 'surgery.dmi'
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "bone setter"
 	force = 8.0
 	throwforce = 9.0

code/game/objects/items/weapons/syndie.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/syndie
-	icon = 'syndieweapons.dmi'
+	icon = 'icons/obj/syndieweapons.dmi'
 
 /*C-4 explosive charge and etc, replaces the old syndie transfer valve bomb.*/