Skip to content

Commit

Permalink
screw you *un-monopolizes your nuka cola (#1249)
Browse files Browse the repository at this point in the history
* screw you *unmoponilises your nuka cola

first atempt at adding sunset sarsparilla

* never let me not google how to spell something again thanks

fixes the spelling on everything spelling of the name

* swear that had a comma i promise

* few minor fixes

tada you opened the description id give you a cookie but i dont have any

* now it heals in TWO FLAVORS

fixed so it heals both brute and burn now

* aaaaaaaaaaaaa

* gah now to fix the soda.dmi and sunsets icon location

* onemoreforfix

* tada

* Update drink_reagents.dm

* fix it so its actually code

* *screams of the tired*

* Update uniform_digi.dmi

* ihatecodeihatecodeihatecode

* whymustcodehateme

* ohboyilovemissingaperiod

* imadrunkenscottishcyclops

* why

* Update sunset_sarsaparilla.dm

* it would be great if i remembered to tick my files

* falloutreferenceachieved
  • Loading branch information
TTNT789 authored Mar 15, 2024
1 parent b66df3b commit 833a493
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/_globalvars/lists/maintenance_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
list(//drinks
/obj/item/reagent_containers/cup/glass/bottle/vodka = 1,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla = 1, //monkestation edit
/obj/item/reagent_containers/cup/soda_cans/grey_bull = 1,
) = 1,
list(//sprayers
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/effects/spawners/random/food_or_drink.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
icon_state = "can"
loot = list(
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 3,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla = 3, //monkestation edit
/obj/item/reagent_containers/cup/soda_cans/grey_bull = 3,
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 2,
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola
name = "Nuka Cola"
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)

1 change: 1 addition & 0 deletions code/modules/vending/cola.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
)
premium = list(
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla = 1, // monkestation edit
/obj/item/reagent_containers/cup/soda_cans/air = 1,
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 1,
/obj/item/reagent_containers/cup/soda_cans/grey_bull = 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@

//Items: Misc
/obj/item/toy/plush/moth/ = list("Bug!", "Found a bug!", "There's a bug here!", "Moth!", "Moth here!", "🐛"),
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla = list("Patroling the lavalands almost makes you wish for an ash storm."),

//Machines
/obj/machinery/mineral/ore_redemption/ = list("ORM! Drop off your rocks and stones!", "It's a mystery to me how all these minerals fit inside!", "Making a deposit!", "Molly!", "Bloody scientists never upgrade this thing..."),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla
name = "Sunset Sarsaparilla"
list_reagents = list(/datum/reagent/consumable/sunset_sarsaparilla = 50,)
4 changes: 4 additions & 0 deletions monkestation/code/modules/reagents/recipes/fun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
results = list(/datum/reagent/shakeium = 5)
required_reagents = list(/datum/reagent/consumable/vanillashake = 1, /datum/reagent/consumable/corn_syrup = 1, /datum/reagent/consumable/pwr_game = 3)
reaction_tags = REACTION_TAG_MODERATE | REACTION_TAG_DRINK
/datum/chemical_reaction/drink/sunset_sarsaparilla
results = list(/datum/reagent/consumable/sunset_sarsaparilla = 5)
required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/sodawater = 1, /datum/reagent/uranium = 1)
reaction_tags = REACTION_TAG_HARD | REACTION_TAG_DRINK
22 changes: 22 additions & 0 deletions monkestation/code/modules/reagents/sunset_sarsaparilla.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//tada modularized now (please merge this back in)

/datum/reagent/consumable/sunset_sarsaparilla
name = "Sunset Sarsaparilla"
description = "Build Mass with Sass!"
color = "#633504" // rgb: 99, 53, 4
quality = DRINK_VERYGOOD
taste_description = "the wild west"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED

/datum/glass_style/drinking_glass/sunset_sarsaparilla
required required_drink_type = /datum/reagent/consumable/sunset_sarsaparilla
name = "glass of Sunset Sarsparilla"
desc = "Locally sourced from your nearest nuclear wasteland."
icon = 'monkestation/icons/obj/drinks/soda.dmi'
icon_state = "sunset_sarsparillaglass"

/datum/reagent/consumable/sunset_sarsaparilla/on_mob_life(mob/living/carbon/drinker)
. = ..()
drinker.heal_bodypart_damage(brute = 2.5)
drinker.heal_bodypart_damage(burn = 2.5)

Binary file added monkestation/icons/obj/drinks/soda.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6623,13 +6623,15 @@
#include "monkestation\code\modules\reagents\misc.dm"
#include "monkestation\code\modules\reagents\reagent_containers.dm"
#include "monkestation\code\modules\reagents\reagents.dm"
#include "monkestation\code\modules\reagents\sunset_sarsaparilla.dm"
#include "monkestation\code\modules\reagents\fun\austrialium.dm"
#include "monkestation\code\modules\reagents\fun\liquid_justice.dm"
#include "monkestation\code\modules\reagents\fun\shakeium.dm"
#include "monkestation\code\modules\reagents\medical\solder.dm"
#include "monkestation\code\modules\reagents\medical\system_cleaner.dm"
#include "monkestation\code\modules\reagents\reagent_containers\blood_pack.dm"
#include "monkestation\code\modules\reagents\reagent_containers\drinks.dm"
#include "monkestation\code\modules\reagents\reagent_containers\sunsetglass.dm"
#include "monkestation\code\modules\reagents\recipes\fun.dm"
#include "monkestation\code\modules\reagents\recipes\medical.dm"
#include "monkestation\code\modules\replays\hooks\generic_hooks.dm"
Expand Down

0 comments on commit 833a493

Please sign in to comment.