Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -254,7 +254,7 @@
 			if(prob(75))
 				new_item = new /obj/item/weapon/pen(src.loc)
 			else
-				new_item = new /obj/item/weapon/pen/sleepypen(src.loc)
+				new_item = new /obj/item/weapon/pen/reagent/sleepy(src.loc)
 			if(prob(30))
 				apply_image_decorations = 1
 		if(16)

code/modules/research/xenoarchaeology/tools/suspension_generator.dm

@@ -159,7 +159,7 @@
 	else if(cell)
 		cell.loc = loc
 		cell.add_fingerprint(user)
-		cell.updateicon()
+		cell.update_icon()
 
 		icon_state = "suspension0"
 		cell = null