From 7166ead8bd7b8cc798071cd7aebda5257b4cca76 Mon Sep 17 00:00:00 2001 From: shellspeed1 Date: Sun, 31 Oct 2021 01:28:49 -0700 Subject: [PATCH] Uses vial as chem pool. --- code/modules/projectiles/ammunition/special/syringe.dm | 6 +++++- code/modules/projectiles/guns/misc/chem_gun.dm | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/special/syringe.dm b/code/modules/projectiles/ammunition/special/syringe.dm index 074f657e55..0cad21cca4 100644 --- a/code/modules/projectiles/ammunition/special/syringe.dm +++ b/code/modules/projectiles/ammunition/special/syringe.dm @@ -35,7 +35,11 @@ var/obj/item/gun/chem/CG = loc if(CG.syringes_left <= 0) return - CG.reagents.trans_to(BB, 10) + //vial.reagents.trans_to(target, vial.amount_per_transfer_from_this, log = "hypospray fill") + //CG.reagents.trans_to(BB, 10) + if (CG.vial == null) + return + CG.vial.reagents.trans_to(BB,10) BB.name = "chemical dart" CG.syringes_left-- ..() diff --git a/code/modules/projectiles/guns/misc/chem_gun.dm b/code/modules/projectiles/guns/misc/chem_gun.dm index 3cce3c8d79..f3e1638dca 100644 --- a/code/modules/projectiles/guns/misc/chem_gun.dm +++ b/code/modules/projectiles/guns/misc/chem_gun.dm @@ -29,6 +29,7 @@ START_PROCESSING(SSobj, src) create_reagents(100, OPENCONTAINER) + /obj/item/gun/chem/Destroy() . = ..() STOP_PROCESSING(SSobj, src)