Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs

code/modules/mob/mob_helpers.dm

@@ -522,10 +522,10 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 //gets ID card object from special clothes slot or null.
 /mob/proc/get_idcard(hand_first = TRUE)
 	var/obj/item/held_item = get_active_held_item()
-	. = held_item?.GetID()
+	. = held_item ? held_item.GetID() : null
 	if(!.) //If so, then check the inactive hand
 		held_item = get_inactive_held_item()
-		. = held_item?.GetID()
+		. = held_item ? held_item.GetID() : null
 
 /mob/proc/get_id_in_hand()
 	var/obj/item/held_item = get_active_held_item()

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -382,9 +382,10 @@
 
 /obj/machinery/chem_dispenser/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
 	if(beaker)
-		beaker.forceMove(drop_location())
+		var/obj/item/reagent_containers/B = beaker
+		B.forceMove(drop_location())
 		if(user && Adjacent(user) && !issiliconoradminghost(user))
-			user.put_in_hands(beaker)
+			user.put_in_hands(B)
 	if(new_beaker)
 		beaker = new_beaker
 	else
@@ -396,7 +397,6 @@
 	cell = null
 	if(beaker)
 		beaker.forceMove(drop_location())
-		beaker = null
 	return ..()
 
 /obj/machinery/chem_dispenser/proc/get_macro_resolution()