From 86703dfdf985f375a84cdf589a461234ccd6b6a7 Mon Sep 17 00:00:00 2001
From: Teragen <67575979+Teragenic@users.noreply.github.com>
Date: Sun, 11 Jan 2026 12:58:45 +0800
Subject: [PATCH] Drinkgate: Drinking update + Bush Looting

Ports stuff from https://github.com/Scarlet-Reach/Scarlet-Reach/pull/81 and https://github.com/Azure-Peak/Azure-Peak/pull/2905
---
 .../structures/roguetown/rogueflora.dm        |  3 +++
 code/game/turfs/open/water.dm                 | 25 ++++++++++++-------
 .../reagents/reagent_containers/glass.dm      |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/code/game/objects/structures/roguetown/rogueflora.dm b/code/game/objects/structures/roguetown/rogueflora.dm
index d40d7f4754a..d36510cf9f2 100644
--- a/code/game/objects/structures/roguetown/rogueflora.dm
+++ b/code/game/objects/structures/roguetown/rogueflora.dm
@@ -343,8 +343,11 @@
 					user.visible_message(span_notice("[user] finds [B] in [src]."))
 					return
 			user.visible_message(span_warning("[user] searches through [src]."))
+			if(looty.len)
+				attack_hand(user)
 			if(!looty.len)
 				to_chat(user, span_warning("Picked clean... I should try later."))
+
 /obj/structure/flora/roguegrass/bush/update_icon()
 	icon_state = "bush[rand(1, 4)]"
 
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index 36c24cbd786..ee2fedeb8b5 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -195,18 +195,25 @@
 			var/mob/living/carbon/C = user
 			if(C.is_mouth_covered())
 				return
-		playsound(user, pick('sound/foley/waterwash (1).ogg','sound/foley/waterwash (2).ogg'), 100, FALSE)
 		user.visible_message(span_info("[user] starts to drink from [src]."))
-		if(do_after(L, 25, target = src))
-			var/list/waterl = list()
-			waterl[water_reagent] = 14
-			var/datum/reagents/reagents = new()
-			reagents.add_reagent_list(waterl)
-			reagents.trans_to(L, reagents.total_volume, transfered_by = user, method = INGEST)
-			playsound(user,pick('sound/items/drink_gen (1).ogg','sound/items/drink_gen (2).ogg','sound/items/drink_gen (3).ogg'), 100, TRUE)
+		drink_act(user, L)
 		return
 	..()
 
+/turf/open/water/proc/drink_act(mob/user, mob/living/L)
+	playsound(user, pick('sound/foley/waterwash (1).ogg','sound/foley/waterwash (2).ogg'), 100, FALSE)
+	if(L.stat != CONSCIOUS)
+		return
+	if(do_after(L, 25, target = src))
+		var/list/waterl = list()
+		waterl[water_reagent] = 14
+		var/datum/reagents/reagents = new()
+		reagents.add_reagent_list(waterl)
+		reagents.trans_to(L, reagents.total_volume, transfered_by = user, method = INGEST)
+		playsound(user,pick('sound/items/drink_gen (1).ogg','sound/items/drink_gen (2).ogg','sound/items/drink_gen (3).ogg'), 100, TRUE)
+		drink_act(user, L)
+	return
+
 /turf/open/water/Destroy()
 	. = ..()
 	if(water_overlay)
@@ -411,7 +418,7 @@
 	canSmoothWith = list(/turf/open/floor/rogue)
 	neighborlay_override = null
 	water_color = null
-	
+
 /turf/open/water/ocean/Initialize()
 	icon_state = "Sandy_Water2"
 	dir = pick(GLOB.cardinals)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index a4d13a4d5cc..2f07fac1e4b 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -7,7 +7,7 @@
 	reagent_flags = OPENCONTAINER|REFILLABLE
 	obj_flags = CAN_BE_HIT
 	spillable = TRUE
-	possible_item_intents = list(INTENT_GENERIC, INTENT_FILL, INTENT_POUR, INTENT_SPLASH)
+	possible_item_intents = list(INTENT_POUR, INTENT_FILL, INTENT_SPLASH, INTENT_GENERIC)
 	resistance_flags = ACID_PROOF
 	w_class = WEIGHT_CLASS_SMALL