Skip to content

Commit

Permalink
Merge pull request #1298 from AlbertNanotracen/Atomized-TG-Drink-Ports
Browse files Browse the repository at this point in the history
[Port] resprites all soda cans, adds wellcheers juice tgstation#77424 + Fix for dirty ice cups
  • Loading branch information
dwasint committed Feb 27, 2024
2 parents 0a5ba6b + b8ee3a7 commit 8fcfbc3
Show file tree
Hide file tree
Showing 26 changed files with 63 additions and 14 deletions.
2 changes: 1 addition & 1 deletion code/datums/greyscale/config_types/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@

/datum/greyscale_config/buckets
name = "Buckets"
icon_file = 'icons/obj/janitor.dmi'
icon_file = 'icons/obj/service/janitor.dmi'
json_config = 'code/datums/greyscale/json_configs/buckets.json'

/datum/greyscale_config/buckets_worn
Expand Down
5 changes: 5 additions & 0 deletions code/datums/mood_events/drink_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@
description = "Amazing taste!"
mood_change = 50
timeout = 10 MINUTES

/datum/mood_event/wellcheers
description = "What a tasty can of Wellcheers! The salty grape taste is a great pick-me-up."
mood_change = 3
timeout = 7 MINUTES
2 changes: 1 addition & 1 deletion code/game/objects/items/broom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/obj/item/pushbroom
name = "push broom"
desc = "This is my BROOMSTICK! It can be used manually or braced with two hands to sweep items as you move. It has a telescopic handle for compact storage."
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
icon_state = "broom0"
base_icon_state = "broom"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/lightreplacer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/obj/item/lightreplacer
name = "light replacer"
desc = "A device to automatically replace lights. Refill with broken or working light bulbs, or sheets of glass."
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
icon_state = "lightreplacer"
inhand_icon_state = "electronic"
worn_icon_state = "light_replacer"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/janitor_key.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
desc = "A key ring with a beeper, allowing the keys to change shape depending on which department it has access to."
icon_state = "access_key"
inhand_icon_state = "access_key"
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
lefthand_file = 'icons/mob/inhands/items/keys_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/keys_righthand.dmi'
hitsound = 'sound/items/rattling_keys_attack.ogg'
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/mop.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/mop
desc = "The world of janitalia wouldn't be complete without a mop."
name = "mop"
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
icon_state = "mop"
inhand_icon_state = "mop"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/bags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/obj/item/storage/bag/trash
name = "trash bag"
desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
icon_state = "trashbag"
inhand_icon_state = "trashbag"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/trash.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Added by Jack Rost
/obj/item/trash
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/food_righthand.dmi'
desc = "This is rubbish."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/janitor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/obj/structure/mop_bucket
name = "mop bucket"
desc = "Fill it with water, but don't forget a mop!"
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
icon_state = "mopbucket"
density = TRUE
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/cone.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/clothing/head/cone
desc = "This cone is trying to warn you of something!"
name = "warning cone"
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
worn_icon = 'icons/mob/clothing/head/utility.dmi'
icon_state = "cone"
inhand_icon_state = null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@
results = list(/datum/reagent/consumable/ethanol/whiskeysoda = 3)
required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/sodawater = 1)

/datum/chemical_reaction/drink/wellcheers
results = list(/datum/reagent/consumable/wellcheers = 5)
required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/watermelonjuice = 1, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/salt = 1, /datum/reagent/consumable/ethanol/absinthe = 1)

/datum/chemical_reaction/drink/black_russian
results = list(/datum/reagent/consumable/ethanol/black_russian = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 3, /datum/reagent/consumable/ethanol/kahlua = 2)
Expand Down
18 changes: 18 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,24 @@
..()
. = TRUE

/datum/reagent/consumable/wellcheers
name = "Wellcheers"
description = "A strange purple drink, smelling of saltwater. Somewhere in the distance, you hear seagulls."
color = "#762399" // rgb: 118, 35, 153
taste_description = "grapes and the fresh open sea"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED

/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)
affected_mob.stamina.adjust(-3 * REM * seconds_per_tick)//Monkestation Edit: custom stamina
if (MOOD_LEVEL_SAD2 to MOOD_LEVEL_HAPPY2)
affected_mob.add_mood_event("wellcheers", /datum/mood_event/wellcheers)
if (MOOD_LEVEL_HAPPY2 to MOOD_LEVEL_HAPPY4)
affected_mob.adjustBruteLoss(-1.5 * REM * seconds_per_tick, 0)
return ..()

/datum/reagent/consumable/monkey_energy
name = "Monkey Energy"
description = "The only drink that will make you unleash the ape."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/reagent_containers/cups/_cup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
/obj/item/reagent_containers/cup/bucket
name = "bucket"
desc = "It's a bucket."
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
worn_icon = 'icons/mob/clothing/head/utility.dmi'
icon_state = "bucket"
inhand_icon_state = "bucket"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/reagent_containers/cups/drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@
desc = "Careful, cold ice, do not chew."
custom_price = PAYCHECK_LOWER * 0.6
icon_state = "icecup"
//list_reagents = list(/datum/reagent/consumable/ice = 30) //Monkestation Removal: Ice was Instantly melting from vending machines
//list_reagents = list(/datum/reagent/consumable/ice = 30) Monkestation Removal: Ice was Instantly melting from vending machines
spillable = TRUE
isGlass = FALSE

/obj/item/reagent_containers/cup/glass/ice/prison
name = "dirty ice cup"
desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones."
list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/consumable/liquidgibs = 5)
//list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/consumable/liquidgibs = 5) Monkestation Removal: Ice was Instantly melting from vending machines

/obj/item/reagent_containers/cup/glass/mug // parent type is literally just so empty mug sprites are a thing
name = "mug"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@
/obj/item/reagent_containers/cup/glass/bottle/pruno
name = "pruno mix"
desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet. Security would love to confiscate this, one of the many things wrong with them."
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
icon_state = "trashbag"
list_reagents = list(/datum/reagent/consumable/prunomix = 50)
var/fermentation_time = 30 SECONDS /// time it takes to ferment
Expand Down
15 changes: 15 additions & 0 deletions code/modules/reagents/reagent_containers/cups/soda.dm
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,21 @@
list_reagents = list(/datum/reagent/consumable/shamblers = 30)
drink_type = SUGAR | JUNKFOOD

/obj/item/reagent_containers/cup/soda_cans/shamblers/eldritch
name = "Shambler's juice Eldritch Energy!"
desc = "~J'I'CE!~"
icon_state = "shamblerseldritch"
volume = 40
list_reagents = list(/datum/reagent/consumable/shamblers = 30, /datum/reagent/eldritch = 5)
drink_type = SUGAR | JUNKFOOD

/obj/item/reagent_containers/cup/soda_cans/wellcheers
name = "Wellcheers Juice"
desc = "A strange purple drink, smelling of saltwater. Somewhere in the distance, you hear seagulls."
icon_state = "wellcheers"
list_reagents = list(/datum/reagent/consumable/wellcheers = 30)
drink_type = SUGAR | JUNKFOOD

/obj/item/reagent_containers/cup/soda_cans/grey_bull
name = "Grey Bull"
desc = "Grey Bull, it gives you gloves!"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/reagent_containers/spray.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/spray
name = "spray bottle"
desc = "A spray bottle, with an unscrewable top."
icon = 'icons/obj/janitor.dmi'
icon = 'icons/obj/service/janitor.dmi'
icon_state = "sprayer_large"
inhand_icon_state = "cleaner"
worn_icon_state = "spraybottle"
Expand Down
2 changes: 2 additions & 0 deletions code/modules/vending/cola.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
contraband = list(
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6,
/obj/item/reagent_containers/cup/soda_cans/shamblers = 6,
/obj/item/reagent_containers/cup/soda_cans/wellcheers = 6,
)
premium = list(
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1,
Expand Down Expand Up @@ -101,6 +102,7 @@
/obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
/obj/item/reagent_containers/cup/soda_cans/sol_dry = 10,
/obj/item/reagent_containers/cup/soda_cans/shamblers = 10,
/obj/item/reagent_containers/cup/soda_cans/wellcheers = 5,
)
product_slogans = "~Shake me up some of that Shambler's Juice!~"
product_ads = "Refreshing!;Thirsty for DNA? Satiate your craving!;Over 1 trillion souls drank!;Made with real DNA!;The hivemind demands your thirst!;Drink up!;Absorb your thirst."
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/drink_effects.dmi
Binary file not shown.
Binary file modified icons/obj/drinks/soda.dmi
Binary file not shown.
Binary file removed icons/obj/janitor.dmi
Binary file not shown.
Binary file added icons/obj/service/janitor.dmi
Binary file not shown.
Binary file modified icons/obj/storage/storage.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/obj/item/reagent_containers/cup/glass/ice/Initialize(mapload, vol)
. = ..()
reagents.add_reagent(reagent = /datum/reagent/consumable/ice, amount = 30, reagtemp = WATER_MATTERSTATE_CHANGE_TEMP)

/obj/item/reagent_containers/cup/glass/ice/prison/Initialize(mapload, vol)
. = ..()
reagents.remove_reagent(reagent = /datum/reagent/consumable/ice, amount = 5)
reagents.add_reagent(reagent = /datum/reagent/consumable/liquidgibs, amount = 5, reagtemp = WATER_MATTERSTATE_CHANGE_TEMP)

0 comments on commit 8fcfbc3

Please sign in to comment.