Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi

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

@@ -64,10 +64,3 @@
 	desc = "Useful for taking pictures, making friends and flash-frying chips."
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "borg-flash"
-
-//heat vision
-
-/obj/item/borg/sight/thermal/alien
-	name = "thermal module"
-	icon = 'icons/mob/alien.dmi'
-	icon_state = "borg-extra-vision"

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

@@ -107,6 +107,12 @@
 	return
 
 /obj/item/weapon/twohanded/garrote/process()
+	if(!strangling)
+		// Our mark got gibbed or similar
+		update_icon()
+		processing_objects.Remove(src)
+		return
+
 
 	if(!istype(loc, /mob/living/carbon/human))
 		strangling = null

code/game/objects/items/weapons/storage/belt.dm

@@ -175,8 +175,7 @@
 		"/obj/item/clothing/glasses",
 		"/obj/item/ammo_casing/shotgun",
 		"/obj/item/ammo_box",
-		"/obj/item/weapon/reagent_containers/food/snacks/donut/normal",
-		"/obj/item/weapon/reagent_containers/food/snacks/donut/jelly",
+		"/obj/item/weapon/reagent_containers/food/snacks/donut",
 		"/obj/item/weapon/kitchen/knife/combat",
 		"/obj/item/weapon/melee/baton",
 		"/obj/item/weapon/melee/classic_baton",

code/game/objects/items/weapons/storage/fancy.dm

@@ -53,9 +53,8 @@
 
 /obj/item/weapon/storage/fancy/donut_box/New()
 	..()
-	for(var/i=1; i <= storage_slots; i++)
-		new /obj/item/weapon/reagent_containers/food/snacks/donut/normal(src)
-	return
+	for(var/i = 1 to storage_slots)
+		new /obj/item/weapon/reagent_containers/food/snacks/donut(src)
 
 /*
  * Egg Box