From 65c8070ec8346cb6224d4a183d633daa55df6a45 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 17 May 2015 18:43:57 -0400 Subject: [PATCH] Spraybottle Changes --- code/modules/reagents/reagent_containers.dm | 1 - code/modules/reagents/reagent_containers/drugs.dm | 7 ------- .../reagents/reagent_containers/glass_containers.dm | 7 ------- code/modules/reagents/reagent_containers/spray.dm | 9 ++++++--- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index f554e9acc4c..e2ae6da9032 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -7,7 +7,6 @@ var/amount_per_transfer_from_this = 5 var/possible_transfer_amounts = list(5,10,15,25,30) var/volume = 30 - var/list/banned_reagents = list() //List of reagent IDs we reject. /obj/item/weapon/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" diff --git a/code/modules/reagents/reagent_containers/drugs.dm b/code/modules/reagents/reagent_containers/drugs.dm index d1c0fe2b449..9d009217036 100644 --- a/code/modules/reagents/reagent_containers/drugs.dm +++ b/code/modules/reagents/reagent_containers/drugs.dm @@ -59,13 +59,6 @@ user << "\red [target] is full." return - if(istype(target, /obj/item/weapon/reagent_containers)) - var/obj/item/weapon/reagent_containers/RC = target - for(var/bad_reg in RC.banned_reagents) - if(reagents.has_reagent(bad_reg, 1)) //Message is a bit "Game-y" but I can't think up a better one. - user << "A chemical in [src] is far too dangerous to transfer to [RC]!" - return - // /vg/: Logging transfers of bad things if(target.reagents_to_log.len) var/list/badshit=list() diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index a469be34254..413f4f16629 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -121,13 +121,6 @@ user << "\red [target] is full." return - if(istype(target, /obj/item/weapon/reagent_containers)) - var/obj/item/weapon/reagent_containers/RC = target - for(var/bad_reg in RC.banned_reagents) - if(reagents.has_reagent(bad_reg, 1)) //Message is a bit "Game-y" but I can't think up a better one. - user << "A chemical in [src] is far too dangerous to transfer to [RC]!" - return - // /vg/: Logging transfers of bad things if(target.reagents_to_log.len) var/list/badshit=list() diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index cd9c8d5056c..b15c03ee984 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -15,7 +15,6 @@ amount_per_transfer_from_this = 5 volume = 250 possible_transfer_amounts = null - banned_reagents = list("facid","sacid") /obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob) @@ -63,7 +62,7 @@ /obj/item/weapon/reagent_containers/spray/proc/spray(var/atom/A) var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src)) D.create_reagents(amount_per_transfer_from_this) - reagents.trans_to(D, amount_per_transfer_from_this, 1/spray_currentrange) + reagents.trans_to(D, amount_per_transfer_from_this) D.icon += mix_color_from_reagents(D.reagents.reagent_list) spawn(0) for(var/i=0, iYou [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray." +/obj/item/weapon/reagent_containers/spray/examine(mob/user) + if(..(user, 0) && user==src.loc) + user << "[round(src.reagents.total_volume)] units left." + return + /obj/item/weapon/reagent_containers/spray/verb/empty() set name = "Empty Spray Bottle" @@ -161,7 +165,6 @@ amount_per_transfer_from_this = 10 volume = 600 origin_tech = "combat=3;materials=3;engineering=3" - banned_reagents = list()//the safeties are off, spray and pay! /obj/item/weapon/reagent_containers/spray/chemsprayer/spray(var/atom/A)