Skip to content

Commit

Permalink
[MIRROR] [MDB IGNORE] updates martian can sprites, fixes misc text an…
Browse files Browse the repository at this point in the history
…d bugs in wellcheers (#7424)

Original PR: tgstation/tgstation#77757
-----

## About The Pull Request
this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up
with a larger resprite of the new cans that were added with #75988. you
can see everything visually changed (other than inhands) in the image
below

![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051)
and then the inhands here:

![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175)
also changes wellcheers mood event text, and the mood switch to be based
on sanity instead. apparently the mood test allowed for foolproof
traitor testing, which is not ideal. this hopefully fixes that.
## Why It's Good For The Game
the new martian drinks used the previous style of cans, which was
updated in #77424. this makes them consistent with that style.
everything else is minor things i missed or forgot to do in that PR.
also things that enable traitor testing are not great, even if they're
niche and require amputation to pull off.
## Changelog
:cl:
fix: wellcheers is now based on sanity rather than mood
image: resprites martian cans
image: adds inhands for martian cans and wellcheers
image: minor tweaks to other cans
spellcheck: updates wellcheers mood text
/:cl:

---------

Co-authored-by: Lamb <110322848+CoiledLamb@users.noreply.github.com>
  • Loading branch information
TaleStationBot and CoiledLamb committed Aug 27, 2023
1 parent 83131ee commit e9cfe4e
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 6 deletions.
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.

0 comments on commit e9cfe4e

Please sign in to comment.