Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods

code/modules/reagents/reagent_containers/dropper.dm

@@ -6,7 +6,7 @@
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(1, 2, 3, 4, 5)
 	volume = 5
-	container_type = TRANSPARENT
+	reagent_flags = TRANSPARENT
 
 /obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
 	. = ..()

code/modules/reagents/reagent_containers/glass.dm

@@ -3,7 +3,7 @@
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
 	volume = 50
-	container_type = OPENCONTAINER
+	reagent_flags = OPENCONTAINER
 	spillable = TRUE
 	resistance_flags = ACID_PROOF
 
@@ -194,13 +194,10 @@
 		reactions. Can hold up to 50 units."
 	icon_state = "beakernoreact"
 	materials = list(MAT_METAL=3000)
+	reagent_flags = OPENCONTAINER | NO_REACT
 	volume = 50
 	amount_per_transfer_from_this = 10
 
-/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
-	. = ..()
-	reagents.set_reacting(FALSE)
-
 /obj/item/reagent_containers/glass/beaker/bluespace
 	name = "bluespace beaker"
 	desc = "A bluespace beaker, powered by experimental bluespace technology \
@@ -291,11 +288,11 @@
 			to_chat(user, "<span class='userdanger'>[src]'s contents spill all over you!</span>")
 			reagents.reaction(user, TOUCH)
 			reagents.clear_reagents()
-		container_type = NONE
+		reagent_flags = NONE
 
 /obj/item/reagent_containers/glass/bucket/dropped(mob/user)
 	. = ..()
-	container_type = initial(container_type)
+	reagent_flags = initial(reagent_flags)
 
 /obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
 	if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head

code/modules/reagents/reagent_containers/hypospray.dm

@@ -10,7 +10,7 @@
 	volume = 30
 	possible_transfer_amounts = list()
 	resistance_flags = ACID_PROOF
-	container_type = OPENCONTAINER
+	reagent_flags = OPENCONTAINER
 	slot_flags = ITEM_SLOT_BELT
 	var/ignore_flags = 0
 	var/infinite = FALSE
@@ -73,7 +73,7 @@
 	desc = "A modified air-needle autoinjector with a small single-use reservoir. It contains an experimental serum."
 	icon_state = "combat_hypo"
 	volume = 5
-	container_type = NONE
+	reagent_flags = NONE
 	list_reagents = list("magillitis" = 5)
 
 //MediPens
@@ -88,7 +88,7 @@
 	amount_per_transfer_from_this = 10
 	volume = 10
 	ignore_flags = 1 //so you can medipen through hardsuits
-	container_type = DRAWABLE
+	reagent_flags = DRAWABLE
 	flags_1 = null
 	list_reagents = list("epinephrine" = 10)
 
@@ -103,7 +103,7 @@
 	..()
 	if(!iscyborg(user))
 		reagents.maximum_volume = 0 //Makes them useless afterwards
-		container_type = NONE
+		reagent_flags = NONE
 	update_icon()
 	addtimer(CALLBACK(src, .proc/cyborg_recharge, user), 80)
 

code/modules/reagents/reagent_containers/medspray.dm

@@ -8,7 +8,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	item_flags = NOBLUDGEON
 	obj_flags = UNIQUE_RENAME
-	container_type = OPENCONTAINER
+	reagent_flags = OPENCONTAINER
 	slot_flags = ITEM_SLOT_BELT
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL

code/modules/reagents/reagent_containers/pill.dm

@@ -46,6 +46,9 @@
 		M.visible_message("<span class='danger'>[user] forces [M] to [apply_method] [src].</span>", \
 							"<span class='userdanger'>[user] forces [M] to [apply_method] [src].</span>")
 
+	var/makes_me_think = pick(strings("redpill.json", "redpill_questions"))
+	if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes
+		addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, M, "<span class='notice'>[makes_me_think]</span>"), 50)
 
 	log_combat(user, M, "fed", reagents.log_list())
 	if(reagents.total_volume)

code/modules/reagents/reagent_containers/rags.dm

@@ -0,0 +1,177 @@
+/obj/item/reagent_containers/rag
+	name = "damp rag"
+	desc = "For cleaning up messes, you suppose."
+	w_class = WEIGHT_CLASS_TINY
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "rag"
+	item_flags = NOBLUDGEON
+	reagent_flags = OPENCONTAINER
+	amount_per_transfer_from_this = 5
+	possible_transfer_amounts = list()
+	volume = 5
+	spillable = FALSE
+	var/wipe_sound
+	var/soak_efficiency = 1
+	var/extinguish_efficiency = 0
+	var/action_speed = 3 SECONDS
+	var/damp_threshold = 0.5
+
+/obj/item/reagent_containers/rag/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return (OXYLOSS)
+
+/obj/item/reagent_containers/rag/examine(mob/user)
+	. = ..()
+	if(reagents.total_volume)
+		to_chat(user, "<span class='notice'>Alt-Click to squeeze the liquids out of it.</span>")
+
+/obj/item/reagent_containers/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
+	. = ..()
+	if(!proximity)
+		return
+	if(iscarbon(A) && A.reagents && reagents.total_volume)
+		var/mob/living/carbon/C = A
+		var/reagentlist = pretty_string_from_reagent_list(reagents)
+		var/log_object = "a damp rag containing [reagentlist]"
+		if(user.a_intent == INTENT_HARM && !C.is_mouth_covered())
+			reagents.reaction(C, INGEST)
+			reagents.trans_to(C, 5)
+			C.visible_message("<span class='danger'>[user] has smothered \the [C] with \the [src]!</span>", "<span class='userdanger'>[user] has smothered you with \the [src]!</span>", "<span class='italics'>You hear some struggling and muffled cries of surprise.</span>")
+			log_combat(user, C, "smothered", log_object)
+		else
+			reagents.reaction(C, TOUCH)
+			reagents.remove_all(5)
+			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)
+		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)
+	if(istype(M) && user.a_intent == INTENT_HELP)
+		user.changeNext_move(CLICK_CD_MELEE)
+		if(M.on_fire)
+			user.visible_message("<span class='warning'>\The [user] uses \the [src] to pat out [M == user ? "[user.p_their()]" : "\the [M]'s"] flames!</span>")
+			if(hitsound)
+				playsound(M, hitsound, 25, 1)
+			M.adjust_fire_stacks(-min(extinguish_efficiency, M.fire_stacks))
+		else
+			if(reagents.total_volume > (volume * damp_threshold))
+				to_chat(user, "<span class='warning'>\The [src] is too drenched to be used to dry [user == M ? "yourself" : "\the [M]"] off.</span>")
+				return TRUE
+			user.visible_message("<span class='notice'>\The [user] starts drying [M == user ? "[user.p_them()]self" : "\the [M]"] off with \the [src]...</span>")
+			if(do_mob(user, M, action_speed))
+				if(reagents.total_volume > (volume * damp_threshold))
+					return
+				user.visible_message("<span class='notice'>\The [user] dries [M == user ? "[user.p_them()]self" : "\the [M]"] off with \the [src].</span>")
+				if(wipe_sound)
+					playsound(M, wipe_sound, 25, 1)
+				if(M.fire_stacks)
+					var/minus_plus = M.fire_stacks < 0 ? 1 : -1
+					var/amount = min(abs(M.fire_stacks), soak_efficiency)
+					var/r_id = "fuel"
+					if(M.fire_stacks < 0)
+						r_id = "water"
+					reagents.add_reagent(r_id, amount * 0.3)
+					M.adjust_fire_stacks(minus_plus * amount)
+				M.wash_cream()
+		return TRUE
+	return ..()
+
+/obj/item/reagent_containers/rag/AltClick(mob/user)
+	. = ..()
+	if(reagents.total_volume && user.canUseTopic(src, BE_CLOSE))
+		to_chat(user, "<span class='notice'>You start squeezing the liquids out of \the [src]...</span>")
+		if(do_after(user, action_speed, TRUE, src))
+			to_chat(user, "<span class='notice'>You squeeze \the [src] dry.</span>")
+			var/atom/react_loc = get_turf(src)
+			if(ismob(react_loc))
+				react_loc = react_loc.loc
+			if(react_loc)
+				reagents.reaction(react_loc, TOUCH)
+			reagents.clear_reagents()
+
+/obj/item/reagent_containers/rag/towel
+	name = "towel"
+	desc = "A soft cotton towel."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "towel"
+	item_state = "towel"
+	slot_flags = ITEM_SLOT_HEAD | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
+	item_flags = NOBLUDGEON | NO_UNIFORM_REQUIRED //so it can be worn on the belt slot even with no uniform.
+	force = 1
+	w_class = WEIGHT_CLASS_NORMAL
+	attack_verb = list("whipped")
+	hitsound = 'sound/items/towelwhip.ogg'
+	volume = 10
+	total_mass = 2
+	wipe_sound = 'sound/items/towelwipe.ogg'
+	soak_efficiency = 4
+	extinguish_efficiency = 3
+	var/flat_icon = "towel_flat"
+	var/folded_icon = "towel"
+	var/list/possible_colors
+
+/obj/item/reagent_containers/rag/towel/Initialize()
+	. = ..()
+	if(possible_colors)
+		add_atom_colour(pick(possible_colors), FIXED_COLOUR_PRIORITY)
+
+/obj/item/reagent_containers/rag/towel/attack(mob/living/M, mob/living/user)
+	if(user.a_intent == INTENT_HARM)
+		DISABLE_BITFIELD(item_flags, NOBLUDGEON)
+		. = TRUE
+	..()
+	if(.)
+		ENABLE_BITFIELD(item_flags, NOBLUDGEON)
+
+/obj/item/reagent_containers/rag/towel/equipped(mob/living/user, slot)
+	. = ..()
+	switch(slot)
+		if(SLOT_BELT)
+			body_parts_covered = GROIN|LEGS
+		if(SLOT_WEAR_SUIT)
+			body_parts_covered = CHEST|GROIN|LEGS
+		if(SLOT_HEAD)
+			body_parts_covered = HEAD
+			flags_inv = HIDEHAIR
+
+/obj/item/reagent_containers/rag/towel/dropped(mob/user)
+	. = ..()
+	body_parts_covered = NONE
+	flags_inv = NONE
+
+/obj/item/reagent_containers/rag/towel/attack_self(mob/user)
+	if(!user.CanReach(src) || !user.dropItemToGround(src))
+		return
+	to_chat(user, "<span class='notice'>You lay out \the [src] flat on the ground.</span>")
+	icon_state = flat_icon
+	layer = BELOW_OBJ_LAYER
+
+/obj/item/reagent_containers/rag/towel/pickup(mob/living/user)
+	. = ..()
+	icon_state = folded_icon
+	layer = initial(layer)
+
+/obj/item/reagent_containers/rag/towel/on_reagent_change(changetype)
+	force = initial(force) + round(reagents.total_volume * 0.5)
+
+/obj/item/reagent_containers/rag/towel/random
+	possible_colors = list("#FF0000","#FF7F00","#FFFF00","#00FF00","#0000FF","#4B0082","#8F00FF")
+
+/obj/item/reagent_containers/rag/towel/syndicate
+	name = "syndicate towel"
+	desc = "Truly a weapon of mass destruction."
+	possible_colors = list("#DD1A1A", "#DB4325", "#E02700")
+	force = 4
+	armour_penetration = 10
+	volume = 20
+	soak_efficiency = 6
+	extinguish_efficiency = 5
+	action_speed = 15
+	damp_threshold = 0.8
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 50, "acid" = 50) //items don't provide armor to wearers unlike clothing yet.

code/modules/reagents/reagent_containers/spray.dm

@@ -7,7 +7,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
 	item_flags = NOBLUDGEON
-	container_type = OPENCONTAINER
+	reagent_flags = OPENCONTAINER
 	slot_flags = ITEM_SLOT_BELT
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL
@@ -224,7 +224,7 @@
 	return
 
 /obj/item/reagent_containers/spray/waterflower/cyborg
-	container_type = NONE
+	reagent_flags = NONE
 	volume = 100
 	list_reagents = list("water" = 100)
 	var/generate_amount = 5

code/modules/reagents/reagent_containers/syringes.dm

@@ -13,7 +13,7 @@
 	var/busy = FALSE		// needed for delayed drawing of blood
 	var/proj_piercing = 0 //does it pierce through thick clothes when shot with syringe gun
 	materials = list(MAT_METAL=10, MAT_GLASS=20)
-	container_type = TRANSPARENT
+	reagent_flags = TRANSPARENT
 
 /obj/item/reagent_containers/syringe/Initialize()
 	. = ..()
@@ -249,10 +249,7 @@
 	name = "cryo syringe"
 	desc = "An advanced syringe that stops reagents inside from reacting. It can hold up to 20 units."
 	volume = 20
-
-/obj/item/reagent_containers/syringe/noreact/Initialize()
-	. = ..()
-	reagents.set_reacting(FALSE)
+	reagent_flags = TRANSPARENT | NO_REACT
 
 /obj/item/reagent_containers/syringe/piercing
 	name = "piercing syringe"
@@ -262,3 +259,92 @@
 
 /obj/item/reagent_containers/syringe/get_belt_overlay()
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch")
+
+/obj/item/reagent_containers/syringe/dart
+	name = "medicinal smartdart"
+	desc = "A non-harmful dart that can administer medication from a range. Once it hits a patient using it's smart nanofilter technology only medicines contained within the dart are administered to the patient. Additonally, due to capillary action, injection of chemicals past the overdose limit is prevented."
+	volume = 20
+	amount_per_transfer_from_this = 20
+	icon_state = "empty"
+	item_state = "syringe_empty"
+	var/emptrig = FALSE
+
+/obj/item/reagent_containers/syringe/dart/afterattack(atom/target, mob/user , proximity)
+
+	if(busy)
+		return
+	if(!proximity)
+		return
+	if(!target.reagents)
+		return
+
+	var/mob/living/L
+	if(isliving(target))
+		L = target
+		if(!L.can_inject(user, 1))
+			return
+
+	switch(mode)
+		if(SYRINGE_DRAW)
+
+			if(reagents.total_volume >= reagents.maximum_volume)
+				to_chat(user, "<span class='notice'>The dart is full!</span>")
+				return
+
+			if(L) //living mob
+				to_chat(user, "<span class='warning'>You can't draw blood using a dart!</span>")
+				return
+
+			else //if not mob
+				if(!target.reagents.total_volume)
+					to_chat(user, "<span class='warning'>[target] is empty!</span>")
+					return
+
+				if(!target.is_drawable())
+					to_chat(user, "<span class='warning'>You cannot directly remove reagents from [target]!</span>")
+					return
+
+				var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
+
+				to_chat(user, "<span class='notice'>You soak the [src] with [trans] units of the solution. It now contains [reagents.total_volume] units.</span>")
+			if (reagents.total_volume >= reagents.maximum_volume)
+				mode=!mode
+				update_icon()
+
+		if(SYRINGE_INJECT)
+			src.visible_message("<span class='danger'>The smartdart gives a frustrated boop! It's fully saturated; You need to shoot someone with it!</span>")
+
+/obj/item/reagent_containers/syringe/dart/attack_self(mob/user)
+	return
+
+/obj/item/reagent_containers/syringe/dart/update_icon()
+	cut_overlays()
+	var/rounded_vol
+
+	rounded_vol = "empty"
+	if(reagents && reagents.total_volume)
+		if(volume/reagents.total_volume == 1)
+			rounded_vol="full"
+
+	icon_state = "[rounded_vol]"
+	item_state = "syringe_[rounded_vol]"
+	if(ismob(loc))
+		var/mob/M = loc
+		var/injoverlay
+		switch(mode)
+			if (SYRINGE_DRAW)
+				injoverlay = "draw"
+			if (SYRINGE_INJECT)
+				injoverlay = "ready"
+		add_overlay(injoverlay)
+		M.update_inv_hands()
+
+/obj/item/reagent_containers/syringe/dart/emp_act(severity)
+	emptrig = TRUE
+	..()
+
+/obj/item/reagent_containers/syringe/dart/bluespace
+	name = "bluespace smartdart"
+	desc = "A non-harmful dart that can administer medication from a range. Once it hits a patient using it's smart nanofilter technology only medicines contained within the dart are administered to the patient. Additonally, due to capillary action, injection of chemicals past the overdose limit is prevented. Has an extended volume capacity thanks to bluespace foam."
+	amount_per_transfer_from_this = 50
+	volume = 50