From e70d5b7986d79b252696cf7c1b971196d9d1c511 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Fri, 28 Oct 2022 15:41:20 -0800
Subject: [PATCH] Adds flasks to the forensic belt allowed items

---
 code/defines/procs/AStar.dm                     |  6 ++++++
 code/game/objects/items/weapons/storage/belt.dm | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm
index c29ffef73fb..316ac06b3ae 100644
--- a/code/defines/procs/AStar.dm
+++ b/code/defines/procs/AStar.dm
@@ -134,7 +134,13 @@ length to avoid portals or something i guess?? Not that they're counted right no
 
 	open.Enqueue(new /PathNode(start, null, 0, call(start, dist)(end), 0))
 
+<<<<<<< HEAD
 	while(!open.IsEmpty() && !path)
+=======
+	var/sanity = 500 // From some local testing, AStar() tends to hit tick check or succeed around the 450 mark.
+	while(!open.IsEmpty() && !path && sanity)
+		sanity--
+>>>>>>> 5903278048c... Merge pull request #8799 from Doctress/boozycops
 		var/PathNode/current = open.Dequeue()
 		closed.Add(current.position)
 
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index dc8f7abb425..17c152c6374 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -325,6 +325,7 @@
 		/obj/item/device/radio/headset,
 		/obj/item/clothing/gloves,
 		/obj/item/taperoll,
+<<<<<<< HEAD
 		/obj/item/weapon/reagent_containers/spray/pepper,
 		/obj/item/weapon/handcuffs,
 		/obj/item/device/flash,
@@ -334,6 +335,17 @@
 		///obj/item/weapon/gun/projectile/colt/detective,	//Detectives don't get projectile weapons as standard here
 		/obj/item/weapon/gun/energy/stunrevolver/detective,	//In keeping with the same vein as above, they can store their special one
 		/obj/item/device/holowarrant
+=======
+		/obj/item/reagent_containers/spray/pepper,
+		/obj/item/handcuffs,
+		/obj/item/flash,
+		/obj/item/flame/lighter,
+		/obj/item/reagent_containers/food/snacks/donut/,
+		/obj/item/ammo_magazine,
+		/obj/item/gun/projectile/colt/detective,
+		/obj/item/holowarrant,
+		/obj/item/reagent_containers/food/drinks/flask
+>>>>>>> 5903278048c... Merge pull request #8799 from Doctress/boozycops
 		)
 
 /obj/item/weapon/storage/belt/soulstone