TGS Test Merge (#6032)

Citadel-Station-13 · Oct 1, 2023 · d671a25 · d671a25
2 parents 4db5b60 + 28ea167
commit d671a25
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/code/game/atoms/atom.dm b/code/game/atoms/atom.dm
@@ -442,14 +442,21 @@
 		if(reagents.reagents_holder_flags & TRANSPARENT)
 			. += "It contains:"
 			if(length(reagents.reagent_list))
+				var/has_alcohol = FALSE
 				if(user.can_see_reagents()) //Show each individual reagent
 					for(var/datum/reagent/current_reagent as anything in reagents.reagent_list)
+						if(!has_alcohol && istype(current_reagent,/datum/reagent/ethanol))
+							has_alcohol = TRUE
 						. += "&bull; [round(current_reagent.volume, 0.01)] units of [current_reagent.name]"
 				else //Otherwise, just show the total volume
 					var/total_volume = 0
 					for(var/datum/reagent/current_reagent as anything in reagents.reagent_list)
+						if(!has_alcohol && istype(current_reagent,/datum/reagent/ethanol))
+							has_alcohol = TRUE
 						total_volume += current_reagent.volume
 					. += "[total_volume] units of various reagents"
+				if(has_alcohol)
+					. += "It smells of alcohol."
 			else
 				. += "Nothing."
 		else if(reagents.reagents_holder_flags & AMOUNT_VISIBLE)

diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm
@@ -93,6 +93,10 @@
 		. += "<span class='notice'>\The [src] is almost full!</span>"
 	else
 		. += "<span class='notice'>\The [src] is full!</span>"
+	if(reagents)
+		var/datum/reagent/ethanol/R = locate() in reagents
+		if(istype(R))
+			. += "<span class='notice'>It contains alcohol.</span>"
 
 
 ////////////////////////////////////////////////////////////////////////////////