Skip to content

Commit

Permalink
beagle mug (#3667)
Browse files Browse the repository at this point in the history
## About The Pull Request
Adds the beagle mug, sprited by ryan180602

> from pull: Baystation12/Baystation12#32695


![image](https://github.com/user-attachments/assets/ba38237e-48b7-4b06-8399-3d47849caca1)

## Why It's Good For The Game
The Atlas was looking very lonely so I gave them a mug to brighten their
day.

## Changelog

:cl: rye-rice, Jedi Toothpaste
add: adds Beagle Mug
add: adds Beagle Mug to Atlas Class
/:cl:

---------

Co-authored-by: rye-rice <58402542+rye-rice@users.noreply.github.com>
  • Loading branch information
Jedi-Toothpaste and rye-rice authored Oct 29, 2024
1 parent 1426ea9 commit c7974b3
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
3 changes: 3 additions & 0 deletions _maps/shuttles/minutemen/minutemen_atlas.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2103,6 +2103,9 @@
/obj/structure/dresser{
dir = 1
},
/obj/item/reagent_containers/food/drinks/beaglemug{
pixel_y = 8
},
/turf/open/floor/carpet/blue,
/area/ship/crew)
"vW" = (
Expand Down
26 changes: 26 additions & 0 deletions code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,32 @@
icon_state = "glass_empty"
renamedByPlayer = FALSE //so new drinks can rename the glass

/obj/item/reagent_containers/food/drinks/beaglemug
name = "beagle mug"
desc = "A beloved edifice of a Dog, now as a mug!"
icon_state = "beaglemug"
amount_per_transfer_from_this = 10
volume = 30
custom_materials = list(/datum/material/glass=500)
max_integrity = 20
spillable = TRUE
resistance_flags = ACID_PROOF
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
custom_price = 25

/obj/item/reagent_containers/food/drinks/beaglemug/on_reagent_change(changetype)
cut_overlays()
if(reagents.reagent_list.len)
var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "beaglemug_overlay")
icon_state = "beaglemug"
reagent_overlay.color = mix_color_from_reagents(reagents.reagent_list)
add_overlay(reagent_overlay)
else
icon_state = "beaglemug"
renamedByPlayer = FALSE

//Shot glasses!//
// This lets us add shots in here instead of lumping them in with drinks because >logic //
// The format for shots is the exact same as iconstates for the drinking glass, except you use a shot glass instead. //
Expand Down
Binary file modified icons/obj/drinks/drinks.dmi
Binary file not shown.

0 comments on commit c7974b3

Please sign in to comment.