Skip to content

Drinkgate: Drinking update + Bush Looting #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Murderfoxen merged 1 commit into from
Feb 19, 2026
+20 −10
Merged

Drinkgate: Drinking update + Bush Looting #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/game/objects/structures/roguetown/rogueflora.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]"

Expand Down
25 changes: 16 additions & 9 deletions code/game/turfs/open/water.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/reagent_containers/glass.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down