Additional August Fixes (#5104)

Fixes #5101
Fixes plants/food being able to be poured into reagent containers.
Fixes server hanging during backpressure surge.

code/modules/custom_ka/cells.dm

@@ -181,7 +181,7 @@
 
 	origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5,TECH_MAGNET = 4,TECH_POWER = 6)
 
-/obj/item/custom_ka_upgrade/cells/cell04/on_update(var/obj/item/weapon/gun/custom_ka/the_gun)
+/obj/item/custom_ka_upgrade/cells/kinetic_charging/on_update(var/obj/item/weapon/gun/custom_ka/the_gun)
 	stored_charge = min(stored_charge + round(stored_charge*0.2),cell_increase)
 
 

code/modules/custom_ka/core.dm

@@ -245,6 +245,8 @@
 /obj/item/weapon/gun/custom_ka/Initialize()
 	. = ..()
 
+	START_PROCESSING(SSprocessing, src)
+
 	if(installed_cell)
 		installed_cell = new installed_cell(src)
 	if(installed_barrel)
@@ -255,8 +257,6 @@
 	update_stats()
 	queue_icon_update()
 
-	START_PROCESSING(SSprocessing, src)
-
 /obj/item/weapon/gun/custom_ka/Destroy()
 	. = ..()
 	STOP_PROCESSING(SSprocessing, src)
@@ -269,8 +269,6 @@
 	if(installed_upgrade_chip)
 		installed_upgrade_chip.on_update(src)
 
-	..()
-
 /obj/item/weapon/gun/custom_ka/update_icon()
 	. = ..()
 	cut_overlays()
@@ -488,11 +486,9 @@
 
 /obj/item/custom_ka_upgrade/proc/on_update(var/obj/item/weapon/gun/custom_ka)
 	//Do update related things here
-	return
 
 /obj/item/custom_ka_upgrade/proc/on_fire(var/obj/item/weapon/gun/custom_ka)
 	//Do fire related things here
-	return
 
 /obj/item/custom_ka_upgrade/cells
 	name = null //Abstract
@@ -556,8 +552,6 @@
 		"<span class='warning'>\The [user] scans \the [target] with \the [src].</span>",
 		"<span class='alert'>You scan \the [target] with \the [src].</span>")
 
-
-
 	if(istype(target,/obj/item/weapon/gun/custom_ka))
 		playsound(src, 'sound/machines/ping.ogg', 10, 1)
 

code/modules/reagents/reagent_containers.dm

@@ -64,15 +64,16 @@
 		return
 	if(is_type_in_list(target,can_be_placed_into))
 		return
-	if(standard_splash_mob(user, target))
-		return
 	if(standard_feed_mob(user,target))
 		return
+	if(standard_splash_mob(user, target))
+		return
 	if(standard_pour_into(user, target))
 		return
 	if(standard_splash_obj(user, target))
 		return
 
+
 /obj/item/weapon/reagent_containers/proc/reagentlist() // For attack logs
 	if(reagents)
 		return reagents.get_reagents()
@@ -106,12 +107,13 @@
 	reagents.splash(target, reagents.total_volume)
 	return
 
-/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack
+// This goes into afterattack
+/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target)
 	if(!istype(target))
 		return
 
 	if(user.a_intent != I_HURT)
-		return
+		return 0
 
 	if(!reagents || !reagents.total_volume)
 		user << "<span class='notice'>[src] is empty.</span>"
@@ -148,9 +150,13 @@
 	playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)
 
 /obj/item/weapon/reagent_containers/proc/standard_feed_mob(var/mob/user, var/mob/target) // This goes into attack
+
 	if(!istype(target))
 		return 0
 
+	if(user.a_intent == I_HURT)
+		return 0
+
 	if(!reagents || !reagents.total_volume)
 		user << "<span class='notice'>\The [src] is empty.</span>"
 		return 1

code/modules/reagents/reagent_containers/food.dm

@@ -37,5 +37,8 @@
 
 	. = ..()
 
+/obj/item/weapon/reagent_containers/food/standard_splash_mob(var/mob/user, var/mob/target)
+	return 1 //Returning 1 will cancel everything else in a long line of things it should do.
+
 #undef CELLS
 #undef CELLSIZE