Hydroponics change and general QOL (#998)

* hydroponics change

* tgstation/tgstation#84006

* gdi

Author: Kapu1178

code/__HELPERS/game.dm

@@ -316,16 +316,29 @@
 
 ///Recursively checks if an item is inside a given type, even through layers of storage. Returns the atom if it finds it.
 /proc/recursive_loc_check(atom/movable/target, type)
-	var/atom/atom_to_find = target
-	if(istype(atom_to_find, type))
-		return atom_to_find
+	var/atom/atom_to_find = null
 
-	while(!istype(atom_to_find.loc, type))
-		if(!atom_to_find.loc)
-			return
-		atom_to_find = atom_to_find.loc
+	if(ispath(type))
+		atom_to_find = target
+		if(istype(atom_to_find, type))
+			return atom_to_find
 
-	return atom_to_find.loc
+		while(!istype(atom_to_find.loc, type))
+			if(!atom_to_find.loc)
+				return
+			atom_to_find = atom_to_find.loc
+
+	else if(isatom(type))
+		atom_to_find = target
+		if(atom_to_find.loc == type)
+			return atom_to_find
+
+		while(atom_to_find.loc != type)
+			if(!atom_to_find.loc)
+				return
+			atom_to_find = atom_to_find.loc
+
+	return atom_to_find
 
 ///Send a message in common radio when a player arrives
 /proc/announce_arrival(mob/living/carbon/human/character, rank)

code/modules/hydroponics/hydroponics.dm

@@ -295,7 +295,7 @@
 
 //Water//////////////////////////////////////////////////////////////////
 			// Drink random amount of water
-			adjust_waterlevel(-rand(1,6) / rating)
+			adjust_waterlevel(-0.4 / rating)
 
 			// If the plant is dry, it loses health pretty fast, unless mushroom
 			if(waterlevel <= 10 && !myseed.get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism))
@@ -815,13 +815,17 @@
 				var/water_amt = reagent_source.reagents.get_reagent_amount(/datum/reagent/water) * split / reagent_source.reagents.total_volume
 				H.adjust_waterlevel(round(water_amt))
 				reagent_source.reagents.remove_reagent(/datum/reagent/water, water_amt)
+
 			reagent_source.reagents.trans_to(H.reagents, split, transfered_by = user)
 			lastuser = WEAKREF(user)
+
 			if(IS_EDIBLE(reagent_source) || istype(reagent_source, /obj/item/reagent_containers/pill))
 				qdel(reagent_source)
 				H.update_appearance()
 				return 1
+
 			H.update_appearance()
+
 		if(reagent_source) // If the source wasn't composted and destroyed
 			reagent_source.update_appearance()
 		return 1

code/modules/mob/living/living.dm

@@ -1034,51 +1034,54 @@
 /mob/living/can_hold_items(obj/item/I)
 	return usable_hands && ..()
 
-/mob/living/canUseTopic(atom/movable/target, flags)
+/mob/living/canUseTopic(atom/target, flags)
+	if(stat != CONSCIOUS)
+		to_chat(src, span_warning("You cannot do that while unconscious."))
+		return FALSE
 
 	// If the MOBILITY_UI bitflag is not set it indicates the mob's hands are cutoff, blocked, or handcuffed
 	// Note - AI's and borgs have the MOBILITY_UI bitflag set even though they don't have hands
 	// Also if it is not set, the mob could be incapcitated, knocked out, unconscious, asleep, EMP'd, etc.
 	if(!(mobility_flags & MOBILITY_UI) && !(flags & USE_RESTING))
-		to_chat(src, span_warning("You can't do that right now!"))
+		to_chat(src, span_warning("You cannot do that right now."))
 		return FALSE
 
 	// NEED_HANDS is already checked by MOBILITY_UI for humans so this is for silicons
 	if((flags & USE_NEED_HANDS) && !can_hold_items(isitem(target) ? target : null)) //almost redundant if it weren't for mobs,
-		to_chat(src, span_warning("You don't have the physical ability to do this!"))
+		to_chat(src, span_warning("You are not physically capable of doing that."))
 		return FALSE
 
-	if((flags & USE_CLOSE) && !Adjacent(target) && (target.loc != src))
+	if((flags & USE_CLOSE) && !CanReach(target) && (recursive_loc_check(src, target)))
 		if(issilicon(src) && !ispAI(src))
 			if(!(flags & USE_SILICON_REACH)) // silicons can ignore range checks (except pAIs)
-				to_chat(src, span_warning("You are too far away!"))
+				to_chat(src, span_warning("You are too far away."))
 				return FALSE
 
 		else if(flags & USE_IGNORE_TK)
-			to_chat(src, span_warning("You are too far away!"))
+			to_chat(src, span_warning("You are too far away."))
 			return FALSE
 
 		else
 			var/datum/dna/D = has_dna()
 			if(!D || !D.check_mutation(/datum/mutation/human/telekinesis) || !tkMaxRangeCheck(src, target))
-				to_chat(src, span_warning("You are too far away!"))
+				to_chat(src, span_warning("You are too far away."))
 				return FALSE
 
 	if((flags & USE_DEXTERITY) && !ISADVANCEDTOOLUSER(src))
-		to_chat(src, span_warning("You don't have the dexterity to do this!"))
+		to_chat(src, span_warning("You do not have the dexterity required to do that."))
 		return FALSE
 
 	if((flags & USE_LITERACY) && !is_literate())
-		to_chat(src, span_warning("You can't comprehend any of this!"))
+		to_chat(src, span_warning("You cannot comprehend this."))
 		return FALSE
 	return TRUE
 
 /mob/living/proc/can_use_guns(obj/item/G)//actually used for more than guns!
 	if(G.trigger_guard == TRIGGER_GUARD_NONE)
-		to_chat(src, span_warning("You are unable to fire this!"))
+		to_chat(src, span_warning("You are unable to fire that."))
 		return FALSE
 	if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && (!ISADVANCEDTOOLUSER(src) && !HAS_TRAIT(src, TRAIT_GUN_NATURAL)))
-		to_chat(src, span_warning("You try to fire [G], but can't use the trigger!"))
+		to_chat(src, span_warning("You attempt to fire [G], but cannot pull the trigger."))
 		return FALSE
 	return TRUE