From 31cf6cb6bed41de34da4c099a11451ebb659a09b Mon Sep 17 00:00:00 2001 From: CocaColaTastesGood <47264839+CocaColaTastesGood@users.noreply.github.com> Date: Thu, 11 Nov 2021 06:55:40 -0800 Subject: [PATCH] Fixes #62719, exploit that let players order crates marked as special. (#62723) * Update orderconsole.dm * Update orderconsole.dm * Update budgetordering.dm --- code/modules/cargo/orderconsole.dm | 2 +- .../modular_computers/file_system/programs/budgetordering.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 26b4db3d636..7124f621673 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -207,7 +207,7 @@ var/datum/supply_pack/pack = SSshuttle.supply_packs[id] if(!istype(pack)) CRASH("Unknown supply pack id given by order console ui. ID: [params["id"]]") - if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.DropPodOnly) + if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.DropPodOnly || (pack.special && !pack.special_enabled)) return var/name = "*None Provided*" diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 29f4b19c7ae..e47235c8289 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -190,7 +190,7 @@ var/datum/supply_pack/pack = SSshuttle.supply_packs[id] if(!istype(pack)) return - if((pack.hidden && (pack.contraband && !contraband) || pack.DropPodOnly)) + if(pack.hidden || pack.contraband || pack.DropPodOnly || (pack.special && !pack.special_enabled)) return var/name = "*None Provided*"