Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates martian can sprites, fixes misc text and bugs in wellcheers #77757

Merged
merged 6 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/mood_events/drink_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@
timeout = 10 MINUTES

/datum/mood_event/wellcheers
description = "What a tasty can of Wellcheers! The salty grape taste is a great pick-me-up."
description = "What a tasty can of Wellcheers! The salty grape flavor is a great pick-me-up."
mood_change = 3
timeout = 7 MINUTES
Original file line number Diff line number Diff line change
Expand Up @@ -615,12 +615,12 @@

/datum/reagent/consumable/wellcheers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
affected_mob.adjust_drowsiness(3 SECONDS * REM * seconds_per_tick)
switch(affected_mob.mob_mood.mood_level)
if (MOOD_LEVEL_SAD4 to MOOD_LEVEL_SAD2)
switch(affected_mob.mob_mood.sanity_level)
if (SANITY_INSANE to SANITY_CRAZY)
affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, 0)
if (MOOD_LEVEL_SAD2 to MOOD_LEVEL_HAPPY2)
if (SANITY_UNSTABLE to SANITY_DISTURBED)
affected_mob.add_mood_event("wellcheers", /datum/mood_event/wellcheers)
if (MOOD_LEVEL_HAPPY2 to MOOD_LEVEL_HAPPY4)
if (SANITY_NEUTRAL to SANITY_GREAT)
affected_mob.adjustBruteLoss(-1.5 * REM * seconds_per_tick, 0)
return ..()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/reagent_containers/cups/soda.dm
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
/obj/item/reagent_containers/cup/soda_cans/beer
name = "space beer"
desc = "Canned beer. In space."
icon_state = "beer"
icon_state = "space_beer"
volume = 40
list_reagents = list(/datum/reagent/consumable/ethanol/beer = 40)
drink_type = GRAIN
Expand Down
Binary file modified icons/mob/inhands/items/drinks_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/items/drinks_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/drinks/soda.dmi
Binary file not shown.
Binary file modified icons/obj/service/janitor.dmi
Binary file not shown.
Loading