[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
This commit is contained in:
committed by
kevinz000
parent
19f210f143
commit
ae9c3f4b83
@@ -35,7 +35,7 @@
|
||||
return 0
|
||||
|
||||
if(M == user)
|
||||
to_chat(M, "<span class='notice'>You swallow a gulp of [src].</span>")
|
||||
user.visible_message("<span class='notice'>[user] swallows a gulp of [src].</span>", "<span class='notice'>You swallow a gulp of [src].</span>")
|
||||
if(M.has_trait(TRAIT_VORACIOUS))
|
||||
M.changeNext_move(CLICK_CD_MELEE * 0.5) //chug! chug! chug!
|
||||
|
||||
|
||||
@@ -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 //
|
||||
|
||||
Reference in New Issue
Block a user