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

code/game/objects/items/devices/flashlight.dm

@@ -493,7 +493,7 @@
 	color = null
 
 /obj/item/device/flashlight/glowstick/random/Initialize()
-	. = ..()
+	..()
 	var/T = pick(typesof(/obj/item/device/flashlight/glowstick) - /obj/item/device/flashlight/glowstick/random)
 	new T(loc)
 	return INITIALIZE_HINT_QDEL

code/game/objects/items/devices/radio/intercom.dm

@@ -139,8 +139,8 @@
 		else
 			icon_state = initial(icon_state)
 
-/obj/item/device/radio/intercom/add_blood(list/blood_dna)
-	return 0
+/obj/item/device/radio/intercom/add_blood_DNA(list/blood_dna)
+	return FALSE
 
 //Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!
 /obj/item/wallframe/intercom