Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

code/modules/reagents/reagent_containers/borghydro.dm

@@ -19,6 +19,7 @@ Borg Hypospray
 	amount_per_transfer_from_this = 5
 	volume = 30
 	possible_transfer_amounts = list()
+	reagent_value = NO_REAGENTS_VALUE
 	var/mode = 1
 	var/charge_cost = 50
 	var/charge_tick = 0

code/modules/reagents/reagent_containers/bottle.dm

@@ -431,4 +431,4 @@
 /obj/item/reagent_containers/glass/bottle/hexacamphor
 	name = "Hexacamphor bottle"
 	desc = "A bottle of strong anaphrodisiac. Reduces libido."
-	list_reagents = list(/datum/reagent/drug/anaphrodisiacplus = 30)
+	list_reagents = list(/datum/reagent/drug/anaphrodisiacplus = 30)

code/modules/reagents/reagent_containers/dropper.dm

@@ -44,7 +44,7 @@
 
 				if(safe_thing)
 					if(!safe_thing.reagents)
-						safe_thing.create_reagents(100)
+						safe_thing.create_reagents(100, NONE, NO_REAGENTS_VALUE)
 
 					reagents.reaction(safe_thing, TOUCH, fraction)
 					trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this)

code/modules/reagents/reagent_containers/hypospray.dm

@@ -85,17 +85,17 @@
 
 /obj/item/reagent_containers/hypospray/medipen
 	name = "epinephrine medipen"
-	desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge."
+	desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Contains a powerful preservative that can delay decomposition when applied to a dead body."
 	icon_state = "medipen"
 	item_state = "medipen"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
-	amount_per_transfer_from_this = 10
-	volume = 10
+	amount_per_transfer_from_this = 13
+	volume = 13
 	ignore_flags = 1 //so you can medipen through hardsuits
 	reagent_flags = DRAWABLE
 	flags_1 = null
-	list_reagents = list(/datum/reagent/medicine/epinephrine = 10)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/preservahyde = 3)
 
 /obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -423,18 +423,21 @@
 		else
 			unload_hypo(vial,user)
 
-/obj/item/hypospray/mkii/verb/modes()
-	set name = "Toggle Application Mode"
-	set category = "Object"
-	set src in usr
-	var/mob/M = usr
-	switch(mode)
-		if(HYPO_SPRAY)
-			mode = HYPO_INJECT
-			to_chat(M, "[src] is now set to inject contents on application.")
-		if(HYPO_INJECT)
-			mode = HYPO_SPRAY
-			to_chat(M, "[src] is now set to spray contents on application.")
+/obj/item/hypospray/mkii/CtrlClick(mob/living/user)
+	. = ..()
+	if(user.canUseTopic(src, FALSE) && user.get_active_held_item(src))
+		switch(mode)
+			if(HYPO_SPRAY)
+				mode = HYPO_INJECT
+				to_chat(user, "[src] is now set to inject contents on application.")
+			if(HYPO_INJECT)
+				mode = HYPO_SPRAY
+				to_chat(user, "[src] is now set to spray contents on application.")
+		return TRUE
+
+/obj/item/hypospray/mkii/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'><b>Ctrl-Click</b> it to toggle its mode from spraying to injecting and vice versa.</span>"
 
 #undef HYPO_SPRAY
 #undef HYPO_INJECT

code/modules/reagents/reagent_containers/rags.dm

@@ -11,6 +11,7 @@
 	container_flags = APTFT_VERB
 	volume = 5
 	spillable = FALSE
+	reagent_value = NO_REAGENTS_VALUE
 	var/wipe_sound
 	var/soak_efficiency = 1
 	var/extinguish_efficiency = 0
@@ -26,7 +27,7 @@
 	if(reagents.total_volume)
 		. += "<span class='notice'>It's soaked. Alt-Click to squeeze it dry, and perhaps gather the liquids into another held open container.</span>"
 
-/obj/item/reagent_containers/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
+/obj/item/reagent_containers/rag/afterattack(atom/A, mob/user,proximity)
 	. = ..()
 	if(!proximity)
 		return
@@ -45,14 +46,14 @@
 			C.visible_message("<span class='notice'>[user] has touched \the [C] with \the [src].</span>")
 			log_combat(user, C, "touched", log_object)
 
-	else if(istype(A) && src in user)
+	else if(istype(A) && (src in user))
 		user.visible_message("[user] starts to wipe down [A] with [src]!", "<span class='notice'>You start to wipe down [A] with [src]...</span>")
 		if(do_after(user, action_speed, target = A))
 			user.visible_message("[user] finishes wiping off [A]!", "<span class='notice'>You finish wiping off [A].</span>")
 			SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
 	return
 
-/obj/item/reagent_containers/rag/pre_altattackby(mob/living/M, mob/living/user, params)
+/obj/item/reagent_containers/rag/alt_pre_attack(mob/living/M, mob/living/user, params)
 	if(istype(M) && user.a_intent == INTENT_HELP)
 		user.changeNext_move(CLICK_CD_MELEE)
 		if(M.on_fire)

code/modules/reagents/reagent_containers/spray.dm

@@ -68,7 +68,7 @@
 /obj/item/reagent_containers/spray/proc/spray(atom/A)
 	var/range = CLAMP(get_dist(src, A), 1, current_range)
 	var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src))
-	D.create_reagents(amount_per_transfer_from_this)
+	D.create_reagents(amount_per_transfer_from_this, NONE, NO_REAGENTS_VALUE)
 	var/puff_reagent_left = range //how many turf, mob or dense objet we can react with before we consider the chem puff consumed
 	if(stream_mode)
 		reagents.trans_to(D, amount_per_transfer_from_this)
@@ -172,6 +172,7 @@
 /obj/item/reagent_containers/spray/drying_agent
 	name = "drying agent spray"
 	desc = "A spray bottle for drying agent."
+	icon_state = "cleaner_drying"
 	volume = 100
 	list_reagents = list(/datum/reagent/drying_agent = 100)
 	amount_per_transfer_from_this = 2