Merge pull request #5094 from BurgerLUA/SeptemberFixesPart1

Fixes #5093
Fixes #5091
Fixes #5089
Fixes an autoinhaler/autoinjector icon bug

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

@@ -282,6 +282,10 @@
 	force = 3
 	agonyforce = 60
 
+/obj/item/weapon/melee/baton/slime/Initialize()
+	bcell = new/obj/item/weapon/cell/high(src)
+	. = ..()
+
 /obj/item/weapon/melee/baton/slime/update_icon()
 	icon_state = initial(icon_state)
 	item_state = initial(item_state)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -182,7 +182,7 @@
 	var/hotspot = (locate(/obj/fire) in T)
 	if(hotspot && !istype(T, /turf/space))
 		var/datum/gas_mixture/lowertemp = T.remove_air(T:air:total_moles)
-		lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, 0)
+		lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, T0C)
 		lowertemp.react()
 		T.assume_air(lowertemp)
 		qdel(hotspot)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm

@@ -277,7 +277,7 @@
 	var/hotspot = (locate(/obj/fire) in T)
 	if(hotspot && !istype(T, /turf/space))
 		var/datum/gas_mixture/lowertemp = T.return_air()
-		lowertemp.temperature = max(min(lowertemp.temperature-2000, lowertemp.temperature / 2), 0)
+		lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, T0C)
 		lowertemp.react()
 		qdel(hotspot)
 

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -15,20 +15,6 @@
 	center_of_mass = list("x"=16, "y"=6)
 	volume = 50
 
-/obj/item/weapon/reagent_containers/food/condiment/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	return
-
-/obj/item/weapon/reagent_containers/food/condiment/attack_self(var/mob/user as mob)
-	return
-
-/obj/item/weapon/reagent_containers/food/condiment/attack(var/mob/M as mob, var/mob/user as mob, var/def_zone)
-	if(standard_feed_mob(user, M))
-		return
-
-/obj/item/weapon/reagent_containers/food/condiment/afterattack(var/obj/target, var/mob/user, var/proximity)
-	if(!proximity)
-		return
-
 /obj/item/weapon/reagent_containers/food/condiment/self_feed_message(var/mob/user)
 	user << "<span class='notice'>You swallow some of contents of \the [src].</span>"
 

code/modules/reagents/reagent_containers/hypospray.dm

@@ -44,6 +44,8 @@
 		var/trans = reagents.trans_to_mob(M, amount_per_transfer_from_this, CHEM_BLOOD)
 		admin_inject_log(user, M, src, contained, trans)
 		to_chat(user,"<span class='notice'>[trans] units injected. [reagents.total_volume] units remaining in \the [src].</span>")
+		
+	update_icon()
 
 	return
 
@@ -65,7 +67,6 @@
 	..()
 	if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled.
 		flags &= ~OPENCONTAINER
-	update_icon()
 	return
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/update_icon()

code/modules/reagents/reagent_containers/inhaler.dm

@@ -66,13 +66,14 @@
 		playsound(src.loc, 'sound/items/stimpack.ogg', 50, 1)
 		to_chat(user,"<span class='notice'>[trans] units injected. [reagents.total_volume] units remaining in \the [src].</span>")
 
+	update_icon()
+
 	return
 
 /obj/item/weapon/reagent_containers/inhaler/attack(mob/M as mob, mob/user as mob)
 	..()
 	if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled.
 		flags &= ~OPENCONTAINER
-	update_icon()
 	return
 
 /obj/item/weapon/reagent_containers/inhaler/update_icon()

html/changelogs/burgerbb-fixes.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#################################
+
+# Your name.  
+author: BurgerBB
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Fixes condiments, including salt and pepper, not being able to be poured."
+  - bugfix: "Fixes objects getting stuck in xenobiology disposals."
+  - bugfix: "Fixes autoinhalers and autoinjectors refusing to change their icons after use."
+  - bugfix: "Fixes Slime Batons not spawning without a power source."
+  - bugfix: "Fixes miscalculation in heat reduction for fire extinguishers."

maps/aurora/aurora-3_sublevel.dmm

@@ -28255,6 +28255,7 @@
 	name = "Containment Cell Echo"
 	},
 /obj/structure/cable/green,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plating,
 /area/rnd/xenobiology/cells/echo)
 "XE" = (