From 4acd8a7a87b7bfd9e2445804dab3d3c383601478 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 27 Aug 2020 18:45:20 -0700 Subject: [PATCH] Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs --- code/game/objects/structures/flora/flora.dm | 3 +++ code/modules/reagents/reagent_containers/syringes.dm | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index a0f2c8c307..b4bad46142 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -233,6 +233,9 @@ . += "You can see something in there..." /obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user) + if(issilicon(user)) + return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass. + if(stored_item) to_chat(user, "[I] won't fit in. There already appears to be something in here...") return diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 6d9becfbc6..f1a7d5cc2b 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -298,7 +298,8 @@ var/trans = reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD) if(isnull(trans)) trans = 0 add_attack_logs(user,target,"Stabbed with [src.name] containing [contained], trasferred [trans] units") - break_syringe(target, user) + if(!issilicon(user)) + break_syringe(target, user) /obj/item/weapon/reagent_containers/syringe/proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user) desc += " It is broken."