From e70d5b7986d79b252696cf7c1b971196d9d1c511 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Fri, 28 Oct 2022 15:41:20 -0800 Subject: [PATCH 1/4] 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 From cec1bbc2868eb0cb6dec6f80c7e11948fbb8cb0e Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sat, 29 Oct 2022 17:11:00 +1000 Subject: [PATCH 2/4] Conflict resolution --- code/defines/procs/AStar.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 316ac06b3ae..c29ffef73fb 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -134,13 +134,7 @@ 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) From 107b75b050e697fb788ba73566a4d9477e315004 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sat, 29 Oct 2022 17:11:37 +1000 Subject: [PATCH 3/4] Conflict resolution --- code/game/objects/items/weapons/storage/belt.dm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 17c152c6374..581b19a4877 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -325,7 +325,6 @@ /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,18 +333,8 @@ ///obj/item/ammo_magazine, //Detectives don't get projectile weapons as standard here ///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/device/holowarrant, /obj/item/reagent_containers/food/drinks/flask ->>>>>>> 5903278048c... Merge pull request #8799 from Doctress/boozycops ) /obj/item/weapon/storage/belt/soulstone From bc4b9ce9dc72154a0506c118faa69b76fd222d43 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sat, 29 Oct 2022 17:16:00 +1000 Subject: [PATCH 4/4] Fix --- code/game/objects/items/weapons/storage/belt.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 581b19a4877..c218e6cc08b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -334,7 +334,7 @@ ///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/food/drinks/flask + /obj/item/weapon/reagent_containers/food/drinks/flask ) /obj/item/weapon/storage/belt/soulstone