Fixes-Tweakes

code/modules/reagents/reagent_containers/drugs.dm

@@ -59,6 +59,13 @@
 				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 << "<span class='warning'>A chemical in [src] is far too dangerous to transfer to [RC]!</span>"
+						return
+
 			// /vg/: Logging transfers of bad things
 			if(target.reagents_to_log.len)
 				var/list/badshit=list()

code/modules/reagents/reagent_containers/glass.dm

@@ -121,6 +121,13 @@
 
 			usr << "<span class = 'notice'>You put the lid on \the [src]."
 
+			flags ^= OPENCONTAINER
+
+		else
+
+			usr << "<span class = 'notice'>You take the lid off \the [src]."
+
+			flags |= OPENCONTAINER
 
 		update_icon()
 

code/modules/reagents/reagent_containers/spray.dm

@@ -6,13 +6,16 @@
 	item_state = "cleaner"
 	flags = TABLEPASS|OPENCONTAINER|FPRINT|NOBLUDGEON
 	slot_flags = SLOT_BELT
-	throwforce = 3
+	throwforce = 0
 	w_class = 2.0
-	throw_speed = 2
-	throw_range = 10
-	amount_per_transfer_from_this = 10
+	throw_speed = 3
+	throw_range = 7
+	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
+	banned_reagents = list("pacid","sacid")
 
 
 /obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob)
@@ -40,31 +43,7 @@
 		user << "<span class='notice'>\The [src] is empty!</span>"
 		return
 
-	var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
-	D.create_reagents(amount_per_transfer_from_this)
-	reagents.trans_to(D, amount_per_transfer_from_this, 1/3)
-
-	D.name = "chemicals"
-	D.icon = 'icons/obj/chempuff.dmi'
-
-	D.icon += mix_color_from_reagents(D.reagents.reagent_list)
-
-	var/turf/A_turf = get_turf(A)
-
-	spawn(0)
-		for(var/i=0, i<3, i++)
-			step_towards(D,A)
-			D.reagents.reaction(get_turf(D))
-			for(var/atom/T in get_turf(D))
-				D.reagents.reaction(T)
-
-				// When spraying against the wall, also react with the wall, but
-				// not its contents.
-				if(get_dist(D, A_turf) == 1 && A_turf.density)
-					D.reagents.reaction(A_turf)
-				sleep(2)
-			sleep(3)
-		del(D)
+	spray(A)
 
 	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
 
@@ -79,34 +58,52 @@
 		log_game("[key_name(user)] fired Space lube from \a [src].")
 	return
 
+
+/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)
+	D.icon += mix_color_from_reagents(D.reagents.reagent_list)
+	spawn(0)
+		for(var/i=0, i<spray_currentrange, i++)
+			step_towards(D,A)
+			D.reagents.reaction(get_turf(D))
+			for(var/atom/T in get_turf(D))
+				D.reagents.reaction(T)
+			sleep(3)
+		del(D)
+
+
 /obj/item/weapon/reagent_containers/spray/attack_self(var/mob/user)
 
 	amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
-	user << "<span class='notice'>You switched [amount_per_transfer_from_this == 10 ? "on" : "off"] the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>"
-
-
-/obj/item/weapon/reagent_containers/spray/examine()
-	set src in usr
-	..()
-	usr << "[round(src.reagents.total_volume)] units left."
-	return
+	spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1)
+	user << "<span class='notice'>You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>"
 
 /obj/item/weapon/reagent_containers/spray/verb/empty()
 
 	set name = "Empty Spray Bottle"
 	set category = "Object"
 	set src in usr
-
-	if(isturf(usr.loc))
+	if(usr.stat || !usr.canmove || usr.restrained())
+		return
+	if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
+		return
+	if(isturf(usr.loc) && src.loc == usr)
 		usr << "<span class='notice'>You empty \the [src] onto the floor.</span>"
 		reagents.reaction(usr.loc)
-		spawn(5) src.reagents.clear_reagents()
+		src.reagents.clear_reagents()
 
 //space cleaner
 /obj/item/weapon/reagent_containers/spray/cleaner
 	name = "space cleaner"
 	desc = "BLAM!-brand non-foaming space cleaner!"
 
+
+/obj/item/weapon/reagent_containers/spray/cleaner/New()
+	..()
+	reagents.add_reagent("cleaner", 250)
+
 /obj/item/weapon/reagent_containers/spray/cleaner/drone
 	name = "space cleaner"
 	desc = "BLAM!-brand non-foaming space cleaner!"
@@ -115,6 +112,7 @@
 /obj/item/weapon/reagent_containers/spray/cleaner/New()
 	..()
 	reagents.add_reagent("cleaner", src.volume)
+
 //pepperspray
 /obj/item/weapon/reagent_containers/spray/pepper
 	name = "pepperspray"
@@ -123,7 +121,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()
@@ -147,56 +146,32 @@
 /obj/item/weapon/reagent_containers/spray/waterflower/attack_self(var/mob/user) //Don't allow changing how much the flower sprays
 	return
 
-
 //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 = 3
+	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"
+	banned_reagents = list()//the safeties are off, spray and pay!
 
 
-//this is a big copypasta clusterfuck, but it's still better than it used to be!
-/obj/item/weapon/reagent_containers/spray/chemsprayer/afterattack(atom/A as mob|obj, mob/user as mob)
-	if(istype(A, /obj/item/weapon/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack) || istype(A, /obj/structure/closet) \
-	|| istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink))
-		return
-
-	if(istype(A, /obj/effect/proc_holder/spell))
-		return
-
-	if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution
-		if(!A.reagents.total_volume && A.reagents)
-			user << "<span class='notice'>\The [A] is empty.</span>"
-			return
-
-		if(reagents.total_volume >= reagents.maximum_volume)
-			user << "<span class='notice'>\The [src] is full.</span>"
-			return
-
-		var/trans = A.reagents.trans_to(src, A:amount_per_transfer_from_this)
-		user << "<span class='notice'>You fill \the [src] with [trans] units of the contents of \the [A].</span>"
-		return
-
-	if(reagents.total_volume < amount_per_transfer_from_this)
-		user << "<span class='notice'>\The [src] is empty!</span>"
-		return
-
+/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(var/atom/A)
 	var/Sprays[3]
 	for(var/i=1, i<=3, i++) // intialize sprays
 		if(src.reagents.total_volume < 1) break
-		var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
-		D.name = "chemicals"
-		D.icon = 'icons/obj/chempuff.dmi'
+		var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src))
 		D.create_reagents(amount_per_transfer_from_this)
 		src.reagents.trans_to(D, amount_per_transfer_from_this)
 
-		D.icon += mix_color_from_reagents(D.reagents.reagent_list)
+		D.color = mix_color_from_reagents(D.reagents.reagent_list)
 
 		Sprays[i] = D
 
@@ -208,14 +183,14 @@
 
 	for(var/i=1, i<=Sprays.len, i++)
 		spawn()
-			var/obj/effect/decal/D = Sprays[i]
+			var/obj/effect/decal/chempuff/D = Sprays[i]
 			if(!D) continue
 
 			// Spreads the sprays a little bit
 			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))
@@ -223,18 +198,12 @@
 				sleep(2)
 			del(D)
 
-	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
 
-	if(reagents.has_reagent("sacid"))
-		message_admins("[key_name_admin(user)] fired sulphuric acid from a chem sprayer.")
-		log_game("[key_name(user)] fired sulphuric acid from a chem sprayer.")
-	if(reagents.has_reagent("pacid"))
-		message_admins("[key_name_admin(user)] fired Polyacid from a chem sprayer.")
-		log_game("[key_name(user)] fired Polyacid from a chem sprayer.")
-	if(reagents.has_reagent("lube"))
-		message_admins("[key_name_admin(user)] fired Space lube from a chem sprayer.")
-		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 << "<span class='notice'>You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray.</span>"
 
 /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror/New()
 	..()
@@ -268,4 +237,4 @@
 	if (istype(A, /obj/effect/blob)) // blob damage in blob code
 		return
 
-	..()
+	..()