From f7fcdf2458307ffe9745dd3c1292605dae007c9d Mon Sep 17 00:00:00 2001 From: Rykka Date: Thu, 27 Aug 2020 20:17:24 -0400 Subject: [PATCH] Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs ACTUALLY fixes problems with borgs permanently breaking their syringes and being able to put modules into potted plants, which causes unwanted fuckery. Reverts #7560 --- code/_onclick/cyborg.dm | 2 -- code/game/objects/structures/flora/flora.dm | 3 +++ code/modules/reagents/reagent_containers/syringes.dm | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 613bb0b7f5..33dd70aa98 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -72,8 +72,6 @@ W.attack_self(src) return - if(A.type==/obj/structure/flora/pottedplant || A.parent_type==/obj/structure/flora/pottedplant) - return // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents) if(A == loc || (A in loc) || (A in contents)) 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 402bdeeb4e..f7c1ffc615 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -64,7 +64,7 @@ to_chat(user, "This syringe is broken!") return - if(user.a_intent == I_HURT && ismob(target) && !isrobot(user)) + if(user.a_intent == I_HURT && ismob(target)) if((CLUMSY in user.mutations) && prob(50)) target = user syringestab(target, user) @@ -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."