Skip to content

Commit

Permalink
Reflavor drinking amounts, pillows, and maybe ashtrays
Browse files Browse the repository at this point in the history
- Change the clear cut amounts that you 'transfer liquid' from cups to be something like sips, tastes, gulps, etc.

- Todo: add pillows, the files added but not ticked on yet

- Ashtrays todo: sprites exist but no code is written yet.

Placing cig on ashtray should mark cig as yours, clicking it again picks it up.  Should make a sprite for cigs in the ashtray that aren't just burnt out.  Picking up a cig that isn't marked as yours should clearly state 'so and so picks up the whatever left by the whoever' or something.
  • Loading branch information
Tk420634 committed Jul 19, 2024
1 parent fd766a1 commit 7eced99
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
14 changes: 11 additions & 3 deletions code/modules/reagents/reagent_containers.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
#define taste = '1'
#define sip = '3'
#define drink = '6'
#define gulp = '8'
#define chug = '10'


/obj/item/reagent_containers
name = "Container"
desc = "..."
icon = 'icons/obj/chemical.dmi'
icon_state = null
w_class = WEIGHT_CLASS_TINY
var/amount_per_transfer_from_this = 5
var/list/possible_transfer_amounts = list(5,10,15,20,25,30)
var/list/possible_transfer_amounts = list()
var/volume = 30
var/reagent_flags = NONE //used to determine the reagent holder flags on add_initial_reagents()
var/reagent_value = DEFAULT_REAGENTS_VALUE //same as above but for the holder value multiplier.
Expand All @@ -18,6 +25,7 @@
var/cached_icon
var/warped_glass = FALSE


/obj/item/reagent_containers/Initialize(mapload, vol)
. = ..()
if(isnum(vol) && vol > 0)
Expand Down Expand Up @@ -48,10 +56,10 @@
set name = "Set Transfer Amount"
set category = "Object"
set waitfor = FALSE
var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
var/N = input("Amount to drink per quaff:","[src]") as null|anything in possible_transfer_amounts
if(N)
amount_per_transfer_from_this = N
to_chat(usr, span_notice("[src]'s transfer amount is now [amount_per_transfer_from_this] units."))
to_chat(usr, span_notice("[src]'s quaff amount is now [amount_per_transfer_from_this] units."))

/obj/item/reagent_containers/proc/add_initial_reagents()
if(list_reagents)
Expand Down
1 change: 1 addition & 0 deletions modular_coyote/icons/objects/pillow/pillow.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//butts
//Pillow and pillow related items
/obj/item/pillow
name = "pillow"
Expand Down

0 comments on commit 7eced99

Please sign in to comment.