Skip to content

Commit

Permalink
Adds a canteen full of literally nothing. (#373)
Browse files Browse the repository at this point in the history
Co-authored-by: KoishiVibe <[email protected]>
  • Loading branch information
KoishiVibe and KoishiVibe committed Aug 17, 2024
1 parent 2f6b21b commit b84ecfd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
8 changes: 7 additions & 1 deletion code/game/objects/items/reagent_containers/food/drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@

/obj/item/reagent_container/food/drinks/flask/canteen
name = "canteen"
desc = "You take a sip from your trusty USCM canteen..."
desc = "A ruggedized metal alloy flask. Can hold a good amount of water... Or other liquids."
icon_state = "canteen"
volume = 60
center_of_mass = "x=17;y=8"
Expand All @@ -362,6 +362,12 @@
. = ..()
reagents.add_reagent("water", 60)

/obj/item/reagent_container/food/drinks/flask/canteen/empty

/obj/item/reagent_container/food/drinks/flask/canteen/empty/Initialize()
. = ..()
reagents.clear_reagents()

/obj/item/reagent_container/food/drinks/flask/detflask
name = "brown leather flask"
desc = "A flask with a leather band around the sides, often seen filled with whiskey and carried by rugged, gritty detectives."
Expand Down
4 changes: 4 additions & 0 deletions code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,10 @@ var/global/list/gear_datums_by_name = list()
display_name = "Canteen"
path = /obj/item/reagent_container/food/drinks/flask/canteen

/datum/gear/flask/canteen/empty
display_name = "Empty canteen"
path = /obj/item/reagent_container/food/drinks/flask/canteen/empty

/datum/gear/flask/leather
display_name = "Leather flask"
path = /obj/item/reagent_container/food/drinks/flask/detflask
Expand Down

0 comments on commit b84ecfd

Please sign in to comment.