From 8f30d5a6864b8c997629b9ada195a00e74510d5d Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Sat, 19 Dec 2020 00:46:04 +1300 Subject: [PATCH 1/2] Update borghydro.dm --- code/modules/reagents/reagent_containers/borghydro.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 170ff64138..3388018280 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -102,6 +102,12 @@ Borg Hypospray if(!istype(M)) return if(R.total_volume && M.can_inject(user, 1, user.zone_selected,bypass_protection)) + if(user.a_intent == INTENT_HELP) //Prevents mediborgs from OD'ing people unless on harm intent + for(var/datum/reagent/RG in R.reagent_list) + if(M.reagents.has_reagent(RG.type) && !RG.overdose_threshold == 0) + if(((M.reagents.get_reagent_amount(RG.type)) + amount_per_transfer_from_this > RG.overdose_threshold)) + to_chat(user, "Injecting [M] with more [RG] would overdose them.") + return to_chat(M, "You feel a tiny prick!") to_chat(user, "You inject [M] with the injector.") var/fraction = min(amount_per_transfer_from_this/R.total_volume, 1) From e50760f641dc08fab01ca8b92c1d54fd24284dc2 Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Sat, 19 Dec 2020 00:59:50 +1300 Subject: [PATCH 2/2] Lilly please that's not funny --- .../reagents/reagent_containers/{borghydro.dm => borghypo.dm} | 0 tgstation.dme | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename code/modules/reagents/reagent_containers/{borghydro.dm => borghypo.dm} (100%) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghypo.dm similarity index 100% rename from code/modules/reagents/reagent_containers/borghydro.dm rename to code/modules/reagents/reagent_containers/borghypo.dm diff --git a/tgstation.dme b/tgstation.dme index efcebe58ea..72ab44c48a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3143,7 +3143,7 @@ #include "code\modules\reagents\chemistry\recipes\special.dm" #include "code\modules\reagents\chemistry\recipes\toxins.dm" #include "code\modules\reagents\reagent_containers\blood_pack.dm" -#include "code\modules\reagents\reagent_containers\borghydro.dm" +#include "code\modules\reagents\reagent_containers\borghypo.dm" #include "code\modules\reagents\reagent_containers\bottle.dm" #include "code\modules\reagents\reagent_containers\chem_pack.dm" #include "code\modules\reagents\reagent_containers\dropper.dm"