From 16469d450149b5e53f9743b2437dd48f67228cf0 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Thu, 9 Jan 2025 21:38:58 +0100 Subject: [PATCH] blacklists borg hypos --- .../food/kitchen/smartfridge/medical.dm | 36 ++++++++++++------- .../food/kitchen/smartfridge/service.dm | 16 ++++----- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/code/modules/food/kitchen/smartfridge/medical.dm b/code/modules/food/kitchen/smartfridge/medical.dm index 1f9091bd366..a2d96e46e63 100644 --- a/code/modules/food/kitchen/smartfridge/medical.dm +++ b/code/modules/food/kitchen/smartfridge/medical.dm @@ -7,9 +7,11 @@ icon_contents = "chem" /obj/machinery/smartfridge/medbay/accept_check(var/obj/item/O as obj) + if(istype(O, /obj/item/reagent_containers/borghypo)) + return FALSE if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/)) - return 1 - return 0 + return TRUE + return FALSE /obj/machinery/smartfridge/secure/medbay name = "\improper Refrigerated Medicine Storage" @@ -18,9 +20,11 @@ req_one_access = list(access_medical,access_chemistry) /obj/machinery/smartfridge/secure/medbay/accept_check(var/obj/item/O as obj) + if(istype(O, /obj/item/reagent_containers/borghypo)) + return FALSE if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/)) - return 1 - return 0 + return TRUE + return FALSE /* * Virology @@ -31,9 +35,11 @@ icon_contents = "viro" /obj/machinery/smartfridge/virology/accept_check(var/obj/item/O as obj) + if(istype(O, /obj/item/reagent_containers/borghypo)) + return FALSE if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/)) - return 1 - return 0 + return TRUE + return FALSE /obj/machinery/smartfridge/secure/virology name = "\improper Refrigerated Virus Storage" @@ -42,9 +48,11 @@ req_access = list(access_virology) /obj/machinery/smartfridge/secure/virology/accept_check(var/obj/item/O as obj) + if(istype(O, /obj/item/reagent_containers/borghypo)) + return FALSE if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/)) - return 1 - return 0 + return TRUE + return FALSE /* * Chemistry @@ -56,9 +64,11 @@ req_one_access = list(access_chemistry) /obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj) + if(istype(O, /obj/item/reagent_containers/borghypo)) + return FALSE if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/)) - return 1 - return 0 + return TRUE + return FALSE /obj/machinery/smartfridge/secure/chemistry name = "\improper Smart Chemical Storage" @@ -67,6 +77,8 @@ req_one_access = list(access_chemistry) /obj/machinery/smartfridge/secure/chemistry/accept_check(var/obj/item/O as obj) + if(istype(O, /obj/item/reagent_containers/borghypo)) + return FALSE if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/)) - return 1 - return 0 + return TRUE + return FALSE diff --git a/code/modules/food/kitchen/smartfridge/service.dm b/code/modules/food/kitchen/smartfridge/service.dm index 56352ffd4a2..7bececc0a64 100644 --- a/code/modules/food/kitchen/smartfridge/service.dm +++ b/code/modules/food/kitchen/smartfridge/service.dm @@ -6,8 +6,8 @@ /obj/machinery/smartfridge/chef/accept_check(var/obj/item/O as obj) if(istype(O,/obj/item/reagent_containers/food/snacks)) - return 1 - return 0 + return TRUE + return FALSE /* * Bartender @@ -19,8 +19,8 @@ /obj/machinery/smartfridge/drinks/accept_check(var/obj/item/O as obj) if(istype(O,/obj/item/reagent_containers/glass) || istype(O,/obj/item/reagent_containers/food/drinks) || istype(O,/obj/item/reagent_containers/food/condiment)) - return 1 - return 0 + return TRUE + return FALSE /obj/machinery/smartfridge/drinks/showcase name = "\improper Drink Showcase" @@ -63,8 +63,8 @@ /obj/machinery/smartfridge/produce/accept_check(var/obj/item/O as obj) if(istype(O,/obj/item/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/)) - return 1 - return 0 + return TRUE + return FALSE /obj/machinery/smartfridge/seeds //I honestly don't know why this exists when you can store seeds in the vendor. It's not even persistent. name = "\improper MegaSeed Servitor" @@ -73,5 +73,5 @@ /obj/machinery/smartfridge/seeds/accept_check(var/obj/item/O as obj) if(istype(O,/obj/item/seeds/)) - return 1 - return 0 \ No newline at end of file + return TRUE + return FALSE