From 3b24bbdf69e197b0a4b1aeab961c6cb68b6a3b51 Mon Sep 17 00:00:00 2001 From: Morrow Date: Sat, 28 Oct 2023 17:38:29 -0400 Subject: [PATCH] doing it the easier way this time --- code/game/machinery/vending/cm_vending.dm | 5 ++--- code/game/machinery/vending/vendor_types/requisitions.dm | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index d4dfb9b823..18b62b9d77 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -763,10 +763,9 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/structure/machinery/cm_vending/gear/Initialize() . = ..() - if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND))) + if(z in SSmapping.levels_by_trait(ZTRAIT_GROUND)) malfunction() - /obj/structure/machinery/cm_vending/gear/ui_static_data(mob/user) . = ..(user) .["vendor_type"] = "gear" @@ -786,7 +785,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/structure/machinery/cm_vending/clothing/Initialize() . = ..() - if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND))) + if(z in SSmapping.levels_by_trait(ZTRAIT_GROUND)) malfunction() /obj/structure/machinery/cm_vending/clothing/ui_static_data(mob/user) diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index b824e2bb6e..a0be9e2793 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -12,7 +12,7 @@ /obj/structure/machinery/cm_vending/sorted/cargo_guns/Initialize() . = ..() - if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND))) + if(z in SSmapping.levels_by_trait(ZTRAIT_GROUND)) malfunction() /obj/structure/machinery/cm_vending/sorted/cargo_guns/vend_fail() @@ -216,7 +216,7 @@ /obj/structure/machinery/cm_vending/sorted/cargo_ammo/Initialize() . = ..() - if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND))) + if(z in SSmapping.levels_by_trait(ZTRAIT_GROUND)) malfunction() /obj/structure/machinery/cm_vending/sorted/cargo_ammo/vend_fail() @@ -343,7 +343,7 @@ /obj/structure/machinery/cm_vending/sorted/attachments/Initialize() . = ..() - if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND))) + if(z in SSmapping.levels_by_trait(ZTRAIT_GROUND)) malfunction() /obj/structure/machinery/cm_vending/sorted/attachments/vend_fail()