Bevy of newhydro fixes.

Conflicts:
	code/game/machinery/vending.dm
	code/modules/projectiles/guns/energy/special.dm
	icons/obj/hydroponics.dmi

code/modules/projectiles/guns/energy/special.dm

@@ -38,42 +38,52 @@
 	var/charge_tick = 0
 	var/mode = 0 //0 = mutate, 1 = yield boost
 
-	New()
-		..()
-		processing_objects.Add(src)
+/obj/item/weapon/gun/energy/floragun/New()
+	..()
+	processing_objects.Add(src)
+
+/obj/item/weapon/gun/energy/floragun/Del()
+	processing_objects.Remove(src)
+	..()
+
+/obj/item/weapon/gun/energy/floragun/process()
+	charge_tick++
+	if(charge_tick < 4) return 0
+	charge_tick = 0
+	if(!power_supply) return 0
+	power_supply.give(1000)
+	update_icon()
+	return 1
+
+/obj/item/weapon/gun/energy/floragun/attack_self(mob/living/user as mob)
+	switch(mode)
+		if(0)
+			mode = 1
+			charge_cost = 1000
+			user << "\red The [src.name] is now set to increase yield."
+			projectile_type = "/obj/item/projectile/energy/florayield"
+			modifystate = "florayield"
+		if(1)
+			mode = 0
+			charge_cost = 1000
+			user << "\red The [src.name] is now set to induce mutations."
+			projectile_type = "/obj/item/projectile/energy/floramut"
+			modifystate = "floramut"
+	update_icon()
+	return
 
 
-	Destroy()
-		processing_objects.Remove(src)
-		..()
+/obj/item/weapon/gun/energy/floragun/afterattack(obj/target, mob/user, flag)
 
-
-	process()
-		charge_tick++
-		if(charge_tick < 4) return 0
-		charge_tick = 0
-		if(!power_supply) return 0
-		power_supply.give(1000)
-		update_icon()
-		return 1
-
-	attack_self(mob/living/user as mob)
-		switch(mode)
-			if(0)
-				mode = 1
-				charge_cost = 1000
-				user << "\red The [src.name] is now set to increase yield."
-				projectile_type = "/obj/item/projectile/energy/florayield"
-				modifystate = "florayield"
-			if(1)
-				mode = 0
-				charge_cost = 1000
-				user << "\red The [src.name] is now set to induce mutations."
-				projectile_type = "/obj/item/projectile/energy/floramut"
-				modifystate = "floramut"
-		update_icon()
+	if(flag && istype(target,/obj/machinery/portable_atmospherics/hydroponics))
+		var/obj/machinery/portable_atmospherics/hydroponics/tray = target
+		if(process_chambered())
+			user.visible_message("\red <b> \The [user] fires \the [src] into \the [tray]!</b>")
+			Fire(target,user)
 		return
 
+	..()
+
 /obj/item/weapon/gun/energy/meteorgun
 	name = "meteor gun"
 	desc = "For the love of god, make sure you're aiming this the right way!"
@@ -176,6 +186,14 @@ obj/item/weapon/gun/energy/staff/focus
 /obj/item/weapon/gun/energy/sniperrifle/dropped(mob/user)
 	user.client.view = world.view
 
+
+
+/*
+This is called from
+modules/mob/mob_movement.dm if you move you will be zoomed out
+modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
+*/
+
 /obj/item/weapon/gun/energy/sniperrifle/verb/zoom()
 	set category = "Object"
 	set name = "Use Sniper Scope"