From ae9c3f4b83227d8ca3ccc0ddff7a7d8bd97da1ad Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 13 Jun 2018 22:31:38 -0500 Subject: [PATCH] [MIRROR] You can see what other people eat or drink (#7101) * You can see what other people eat or drink (#38395) * Makes drinking message visible to others * Makes swallow message visible to other people * Adds visible messages for eating * Update snacks.dm * Update snacks.dm * Update objs.dm * Update drinkingglass.dm * Update pen.dm * Update drinkingglass.dm * Update drinkingglass.dm * Update drinkingglass.dm * Update drinks.dm * Update condiment.dm * Update snacks.dm * Adds a few extra reagents to the borg shaker * Update drinkingglass.dm * Update drinkingglass.dm * removes blood as a borg shaker reagent * You can see what other people eat or drink --- code/game/objects/objs.dm | 2 ++ code/modules/food_and_drinks/drinks/drinks.dm | 2 +- .../food_and_drinks/drinks/drinks/drinkingglass.dm | 8 ++++---- code/modules/food_and_drinks/food/condiment.dm | 2 +- code/modules/food_and_drinks/food/snacks.dm | 10 +++++----- code/modules/paperwork/pen.dm | 1 + code/modules/reagents/reagent_containers/borghydro.dm | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 65ed2281f0..02e1cc9bd0 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -27,6 +27,8 @@ var/req_access_txt = "0" var/list/req_one_access var/req_one_access_txt = "0" + + var/renamedByPlayer = FALSE //set when a player uses a pen on a renamable object /obj/vv_edit_var(vname, vval) switch(vname) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 7a0a8f5f5a..29be63a2bb 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -35,7 +35,7 @@ return 0 if(M == user) - to_chat(M, "You swallow a gulp of [src].") + user.visible_message("[user] swallows a gulp of [src].", "You swallow a gulp of [src].") if(M.has_trait(TRAIT_VORACIOUS)) M.changeNext_move(CLICK_CD_MELEE * 0.5) //chug! chug! chug! diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index a91d5a6a7b..faafcdf776 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -16,8 +16,9 @@ cut_overlays() if(reagents.reagent_list.len) var/datum/reagent/R = reagents.get_master_reagent() - name = R.glass_name - desc = R.glass_desc + if(!renamedByPlayer) + name = R.glass_name + desc = R.glass_desc if(R.glass_icon_state) icon_state = R.glass_icon_state else @@ -26,8 +27,7 @@ add_overlay(reagent_overlay) else icon_state = "glass_empty" - name = "drinking glass" - desc = "Your standard drinking glass." + renamedByPlayer = FALSE //so new drinks can rename the glass //Shot glasses!// // This lets us add shots in here instead of lumping them in with drinks because >logic // diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index f5ce5bf782..53a0c2fb5b 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -41,7 +41,7 @@ return 0 if(M == user) - to_chat(M, "You swallow some of contents of \the [src].") + user.visible_message("[user] swallows some of contents of \the [src].", "You swallow some of contents of \the [src].") else user.visible_message("[user] attempts to feed [M] from [src].") if(!do_mob(user, M)) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 7ac53294bc..85371e0875 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -72,15 +72,15 @@ to_chat(M, "You don't feel like eating any more junk food at the moment.") return 0 else if(fullness <= 50) - to_chat(M, "You hungrily [eatverb] some of \the [src] and gobble it down!") + user.visible_message("[user] hungrily takes a [eatverb] from \the [src], gobbling it down!", "You hungrily take a [eatverb] from \the [src], gobbling it down!") else if(fullness > 50 && fullness < 150) - to_chat(M, "You hungrily begin to [eatverb] \the [src].") + user.visible_message("[user] hungrily takes a [eatverb] from \the [src].", "You hungrily take a [eatverb] from \the [src].") else if(fullness > 150 && fullness < 500) - to_chat(M, "You [eatverb] \the [src].") + user.visible_message("[user] takes a [eatverb] from \the [src].", "You take a [eatverb] from \the [src].") else if(fullness > 500 && fullness < 600) - to_chat(M, "You unwillingly [eatverb] a bit of \the [src].") + user.visible_message("[user] unwillingly takes a [eatverb] of a bit of \the [src].", "You unwillingly take a [eatverb] of a bit of \the [src].") else if(fullness > (600 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat - to_chat(M, "You cannot force any more of \the [src] to go down your throat!") + user.visible_message("[user] cannot force any more of \the [src] to go down [user.p_their()] throat!", "You cannot force any more of \the [src] to go down your throat!") return 0 if(M.has_trait(TRAIT_VORACIOUS)) M.changeNext_move(CLICK_CD_MELEE * 0.5) //nom nom nom diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 7f5307f17f..42b3d08c0c 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -143,6 +143,7 @@ else O.name = input to_chat(user, "\The [oldname] has been successfully been renamed to \the [input].") + O.renamedByPlayer = TRUE if(penchoice == "Change description") var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index a2779f5039..cdb476c95a 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -180,7 +180,7 @@ Borg Shaker recharge_time = 3 accepts_reagent_upgrades = FALSE - reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "fernet") + reagent_ids = list("beer", "orangejuice", "grenadine", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "fernet", "milk", "coffee", "banana", "lemonjuice") /obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user) return //Can't inject stuff with a shaker, can we? //not with that attitude