From c579248a1ccafe34c19030d2f6c53065e4b26436 Mon Sep 17 00:00:00 2001 From: RandomMarine Date: Wed, 2 Apr 2014 18:18:17 -0700 Subject: [PATCH 1/3] Adds variables for spray ranges. --- .../reagents/reagent_containers/spray.dm | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index a1de1580f42..3d4424b59b6 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -10,7 +10,9 @@ w_class = 2.0 throw_speed = 3 throw_range = 7 - amount_per_transfer_from_this = 10 + var/spray_maxrange = 3 + var/spray_currentrange = 3 + amount_per_transfer_from_this = 5 volume = 250 possible_transfer_amounts = null @@ -41,17 +43,13 @@ return var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src)) - var/tiles =1 D.create_reagents(amount_per_transfer_from_this) - if(amount_per_transfer_from_this >=10) - tiles =1 - else - tiles =3 + user.changeNext_move(4) - reagents.trans_to(D, amount_per_transfer_from_this, 1/tiles) + reagents.trans_to(D, amount_per_transfer_from_this, 1/spray_currentrange) D.color = 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." @@ -116,7 +115,8 @@ icon_state = "pepperspray" item_state = "pepperspray" volume = 40 - amount_per_transfer_from_this = 10 + spray_maxrange = 4 + amount_per_transfer_from_this = 5 /obj/item/weapon/reagent_containers/spray/pepper/New() @@ -143,12 +143,15 @@ //chemsprayer /obj/item/weapon/reagent_containers/spray/chemsprayer name = "chem sprayer" - desc = "A utility used to spray large amounts of reagent in a given area." + desc = "A utility used to spray large amounts of reagents in a given area." icon = 'icons/obj/gun.dmi' icon_state = "chemsprayer" item_state = "chemsprayer" throwforce = 0 w_class = 3.0 + spray_maxrange = 7 + spray_currentrange = 7 + amount_per_transfer_from_this = 10 volume = 600 origin_tech = "combat=3;materials=3;engineering=3" @@ -205,7 +208,7 @@ var/turf/my_target = pick(the_targets) the_targets -= my_target - for(var/j=1, j<=rand(6,8), j++) + for(var/j=0, j<=spray_currentrange, j++) step_towards(D, my_target) D.reagents.reaction(get_turf(D)) for(var/atom/t in get_turf(D)) @@ -226,6 +229,11 @@ log_game("[key_name(user)] fired Space lube from a chem sprayer.") return +/obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(var/mob/user) + + amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) + user << "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray." + /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror/New() ..() reagents.add_reagent("spore", 150) From 31f2f6924f1cbfad30e286c15ed9999b9ed13d47 Mon Sep 17 00:00:00 2001 From: RandomMarine Date: Wed, 2 Apr 2014 18:27:47 -0700 Subject: [PATCH 2/3] Click cooldowns! --- code/modules/reagents/reagent_containers/spray.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 3d4424b59b6..fe860d92df7 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -44,7 +44,6 @@ var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src)) D.create_reagents(amount_per_transfer_from_this) - user.changeNext_move(4) reagents.trans_to(D, amount_per_transfer_from_this, 1/spray_currentrange) D.color = mix_color_from_reagents(D.reagents.reagent_list) @@ -58,6 +57,7 @@ qdel(D) playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) + user.changeNext_move(4) if(reagents.has_reagent("sacid")) message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].") @@ -217,6 +217,7 @@ qdel(D) playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) + user.changeNext_move(4) if(reagents.has_reagent("sacid")) message_admins("[key_name_admin(user)] fired sulphuric acid from a chem sprayer.") From 6b3b014ee8898e6184324f8973a5256e6e8acb55 Mon Sep 17 00:00:00 2001 From: RandomMarine Date: Wed, 2 Apr 2014 18:30:11 -0700 Subject: [PATCH 3/3] Added comments. --- code/modules/reagents/reagent_containers/spray.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index fe860d92df7..03d610af63f 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -10,8 +10,8 @@ w_class = 2.0 throw_speed = 3 throw_range = 7 - var/spray_maxrange = 3 - var/spray_currentrange = 3 + var/spray_maxrange = 3 //what the sprayer will set spray_currentrange to in the attack_self. + var/spray_currentrange = 3 //the range of tiles the sprayer will reach when in fixed mode. amount_per_transfer_from_this = 5 volume = 250 possible_transfer_amounts = null