From 3f0731fab38e281d50ab601efcd4df1aafd6faab Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Tue, 6 Oct 2015 15:31:01 -0300 Subject: [PATCH] Fixes medborgs injecting mobs without reagents with their hypospray --- code/modules/reagents/reagent_containers/borghydro.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ebd75a0fb4d..9b53ad657f7 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -83,14 +83,14 @@ Borg Hypospray R.cell.use(charge_cost) //Take power from borg... RG.add_reagent(reagent_ids[mode], 5) //And fill hypo with reagent. -/obj/item/weapon/reagent_containers/borghypo/attack(mob/living/M, mob/user) +/obj/item/weapon/reagent_containers/borghypo/attack(mob/living/carbon/M, mob/user) var/datum/reagents/R = reagent_list[mode] if(!R.total_volume) user << "The injector is empty." return - if (!( istype(M) )) + if(!istype(M)) return - if (R.total_volume && M.can_inject(user, 1, penetrate_thick = bypass_protection)) + if(R.total_volume && M.can_inject(user, 1, bypass_protection)) M << "You feel a tiny prick!" user << "You inject [M] with the injector." var/fraction = min(amount_per_transfer_from_this/R.total_volume, 1) @@ -98,7 +98,6 @@ Borg Hypospray if(M.reagents) var/trans = R.trans_to(M, amount_per_transfer_from_this) user << "[trans] unit\s injected. [R.total_volume] unit\s remaining." - return /obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user) var/chosen_reagent = modes[input(user, "What reagent do you want to dispense?") as null|anything in reagent_ids]