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.

Sign up for GitHub

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

RILENA 2 #2574

Closed
wants to merge 9 commits into from
Closed

RILENA 2 #2574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
037958a
few plushie
MoonTheBird Dec 6, 2023
a61bb77
yeah
MoonTheBird Dec 8, 2023
4ebeaee
should be the last of it
MoonTheBird Dec 8, 2023
ca72d43
fix oopsies
MoonTheBird Dec 8, 2023
be74326
make stuff obtainable oops
MoonTheBird Dec 8, 2023
f8e7e1d
Merge remote-tracking branch 'upstream/master' into RILENA-2
MoonTheBird Dec 8, 2023
4635371
Merge remote-tracking branch 'upstream/master' into RILENA-2
MoonTheBird Dec 8, 2023
4da0565
linter
MoonTheBird Dec 8, 2023
e1a65f5
oopsy
MoonTheBird Dec 8, 2023
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
24 changes: 24 additions & 0 deletions code/game/objects/effects/contraband.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,30 @@
desc = "A RILENA: LMR poster split in two to represent the series' disregard for conventional timeline aspects."
icon_state = "poster-rilena_timeline"

/obj/structure/sign/poster/rilena/dollmaker
name = "Dollmaker"
desc = "A RILENA: LMR poster portraying a well known character from the games, Kisime."
icon_state = "poster-rilena_dollmaker"

/obj/structure/sign/poster/rilena/dollmarch
name = "Army of Dolls"
desc = "A RILENA: LMR poster featuring Kisime and her minions, the Toki."
icon_state = "poster-rilena_dollmarch"

/obj/structure/sign/poster/rilena/hanging_out
name = "Hanging Out"
desc = "A RILENA: LMR poster featuring Qi-Tirii, an eccentric inventor who claims to be a wizard."
icon_state = "poster-rilena_hanging_out"

/obj/structure/sign/poster/rilena/moonlight
name = "Moons and Starlight"
desc = "A RILENA: LMR poster showing Qi-Tirii sitting on her staff under RILENA's two moons."
icon_state = "poster-rilena_moonlight"

/obj/structure/sign/poster/rilena/shopkeep
name = "Lekera Kalila Sharati"
desc = "A RILENA: LMR poster featuring the iconic shopkeeper, Xader. The name of the poster roughly translates to \"Buy something or die.\""
icon_state = "poster-rilena_shopkeep"


#undef PLACE_SPEED
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/effects/spawners/lootdrop.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,5 +1288,6 @@
/obj/item/storage/ration/blackened_calamari = 5,
/obj/item/storage/ration/elbow_macaroni = 5,
/obj/item/storage/ration/cheese_pizza_slice = 5,
/obj/item/storage/ration/crayons = 2 // :)
/obj/item/storage/ration/crayons = 2, // :)
/obj/item/storage/ration/rilena = 2 //rare
)
57 changes: 57 additions & 0 deletions code/game/objects/items/plushes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,8 @@
lefthand_file = 'icons/mob/inhands/misc/plushes_lefthand.dmi' //todo: sort the god damn plushie inhands
righthand_file = 'icons/mob/inhands/misc/plushes_righthand.dmi'

//RILENA PLSUHESH//

/obj/item/toy/plush/rilena
name = "Ri plushie"
desc = "A plush of the protagonist of the popular combination video game series and webcomic RILENA."// Makes the iconic hurt sound from the game!" //sadly does not :pensive:
Expand Down Expand Up @@ -806,12 +808,67 @@
icon_state = "rilenaplush_mora"
gender = FEMALE

/obj/item/toy/plush/kisime
name = "Kisime plushie"
desc = "A plushie of the iconic 'dollmaker' from the popular webseries RILENA. Somewhat ironic, considering her current situation."
icon_state = "rilenaplush_kisime"
gender = FEMALE

/obj/item/toy/plush/qitirii
name = "Qi-Tirii plushie"
desc = "A plushie of the eccentric wizard inventor from the popular webseries RILENA."
icon_state = "rilenaplush_qitirii"
gender = FEMALE

/obj/item/toy/plush/toki
name = "Toki plushie"
desc = "A plushie of the dollmaker's robotic minions. Hails from RILENA, a popular webseries."
icon_state = "rilenaplush_toki_assistant"
gender = FEMALE
var/random_toki = TRUE //if the toki chosen is random
var/rare_toki = 10 //chance for a rare style

var/static/list/toki_styles = list(\
"toki_assistant",
"toki_agent",
"toki_commander",
)
var/static/list/toki_styles_rare = list(\
"toki_ri" = " This one feels almost... mocking.",
"toki_tali" = " This one's smug look bothers you.",
"toki_kisime" = " This one feels like overkill.",
)

/obj/item/toy/plush/toki/Initialize(mapload)
. = ..()
pick_random_toki(rare_toki)

/obj/item/toy/plush/toki/proc/pick_random_toki(rare_toki)
if(random_toki)
var/toki_type
if(prob(rare_toki))
toki_type = pick(toki_styles_rare)
desc += toki_styles_rare[toki_type]
else
toki_type = pick(toki_styles)
icon_state = "rilenaplush_" + toki_type

//maybe figure this out later

///mob/living/simple_animal/bot/toki
// name = "Toki plushie"
// desc = "A strangely heavy plushie of the dollmaker's robotic minions. Hails from RILENA, a popular webseries."
// icon_state = "rilenaplush_toki"
// gender = FEMALE

/obj/item/toy/plush/kari
name = "knockoff RILENA plushie"
desc = "A plushie of a FBP Kepori. The tag calls it 'Kari' and claims it to be from 'RAYALA: RUNNING FROM EVIL'. The cannon arm does not function."
icon_state = "fbplush"
gender = FEMALE

//RILENA end//

/obj/item/toy/plush/among
name = "amoung pequeño"
desc = "A little pill shaped guy, with a price tag of 3€."
Expand Down
16 changes: 16 additions & 0 deletions code/game/objects/items/storage/ration.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,3 +381,19 @@
/obj/item/toy/crayon/white = 1
)
generate_items_inside(items_inside, src)

/obj/item/storage/ration/rilena
name = "/improper RILENA themed ration"
desc = "Contains dubiously labeled food. You're not sure what these flavors are, but at least it contains a toy."
icon_state = "ration_package_rilena"

/obj/item/storage/ration/rilena/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/cereal = 2,
/obj/item/reagent_containers/food/snacks/ration/side/potato_brick = 1,
/obj/item/reagent_containers/food/snacks/egg = 1, //a single perfectly preserved raw egg. not even a ration, just an actual egg
/obj/item/reagent_containers/food/snacks/ration/pack/milk = 2,
/obj/item/ration_heater = 1, //heats up your potato brick :)
/obj/item/toy/figure/tali = 1 //free toy :pog:
)
generate_items_inside(items_inside, src)
6 changes: 6 additions & 0 deletions code/modules/cargo/packs/costumes_toys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@
/obj/item/toy/plush/sharai,
/obj/item/toy/plush/xader,
/obj/item/toy/plush/mora,
/obj/item/toy/plush/qitirii,
/obj/item/toy/plush/kisime,
/obj/item/toy/plush/toki,
/obj/item/toy/plush/toki,
/obj/item/poster/random_rilena,
/obj/item/poster/random_rilena,
/obj/item/poster/random_rilena,
/obj/item/poster/random_rilena,
/obj/item/poster/random_rilena,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/food.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@

/datum/supply_pack/food/ration
name = "Ration Crate"
desc = "6 standerd issue rations."
desc = "6 standard issue rations."
cost = 2000
contains = list(/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration,
Expand Down
18 changes: 18 additions & 0 deletions code/modules/food_and_drinks/drinks/drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,24 @@
isGlass = FALSE
custom_price = 95

/obj/item/reagent_containers/food/drinks/macaroni_dry
name = "bowl of instant macaroni and cheese"
icon_state = "macaroni_dry"
desc = "Just add 5 units of water! Hot or not, this is what you got. Do not eat raw." //note: does nothing when eaten raw, it's perfectly fine to eat raw lmao
list_reagents = list(/datum/reagent/consumable/macaroni = 15, /datum/reagent/consumable/cheese_spread = 5)
foodtype = GRAIN | DAIRY
isGlass = FALSE
custom_price = 100

/obj/item/reagent_containers/food/drinks/macaroni_curry
name = "bowl of RILENA themed instant macaroni and curry"
icon_state = "macaroni_curry"
desc = "You're not sure if this crossover is even legal, but the taste is something to be experienced. Just add 5 units of water."
list_reagents = list(/datum/reagent/consumable/macaroni = 15, /datum/reagent/consumable/curry_powder = 5)
foodtype = GRAIN | DAIRY
isGlass = FALSE
custom_price = 120

/obj/item/reagent_containers/food/drinks/waterbottle
name = "bottle of water"
desc = "A bottle of water filled at an old Earth bottling facility."
Expand Down
21 changes: 21 additions & 0 deletions code/modules/food_and_drinks/food/ration.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,14 @@
tastes = list("cheese" = 1, "pizza" = 1)
foodtype = GRAIN | DAIRY

/obj/item/reagent_containers/food/snacks/ration/entree/cereal
name = "/improper RILENA flavored cereal"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name = "/improper RILENA flavored cereal"
name = "\improper RILENA flavored cereal"

desc = "A crunchy brick of compressed cereal. Milk comes in another package."
filling_color = "#a0679d"
tastes = list("sugar" = 20, "video games" = 1) //pure sugar.
foodtype = SUGAR | JUNKFOOD | GRAIN | BREAKFAST //technically contains grain. Technically.
cookable = FALSE //probably shouldn't cook cereal

/obj/item/reagent_containers/food/snacks/ration/side/vegan_crackers
name = "vegetable 'crackers'"
desc = "Delicious vegetable-based crackers that are the perfect crunchy and nutritious snack."
Expand Down Expand Up @@ -498,6 +506,14 @@
tastes = list("applesauce" = 1, "mango" = 1, "peach" = 1)
foodtype = FRUIT | SUGAR

/obj/item/reagent_containers/food/snacks/ration/side/potato_brick
name = "potato"
desc = "A solid block of potato. Honestly, you can't tell if this has been cooked or not. The label says it also contains cheese, but you can't see any."
filling_color = "#f3d690"
tastes = list("potato" = 1, "cheese" = 1)
foodtype = DAIRY | GRAIN
cookable = TRUE

/obj/item/reagent_containers/food/snacks/ration/snack/pizza_crackers
name = "pepperoni pizza cheese filled crackers"
desc = "Irresistible cheese-filled crackers with a savory pepperoni pizza flavor. A delicious and addictive snack."
Expand Down Expand Up @@ -813,3 +829,8 @@
/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_hazelnut
name = "freeze-dried coffee flavored with hazelnut pack"
list_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/coco = 3)

/obj/item/reagent_containers/food/snacks/ration/pack/milk
name = "dehydrated milk pack"
desc = "Would go well with cereal, if it wasn't just powder."
list_reagents = list(/datum/reagent/consumable/milk = 10)
9 changes: 9 additions & 0 deletions code/modules/food_and_drinks/food/snacks_frozen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,12 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 1)
foodtype = DAIRY | SUGAR

/obj/item/reagent_containers/food/snacks/popsicle/rilena_gumball
name = "gumball popsicle"
desc = "An admittedly kinda flavorless ice cream treat shaped like T4L1's head. The gumballs have the most flavor in them, but can you, in good conscience, eat them?"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/berryjuice = 2, /datum/reagent/consumable/sugar = 6)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/berryjuice = 2, /datum/reagent/consumable/sugar = 6)
tastes = list("gumballs", "offbrand ice cream")
overlay_state = "rilena_gumball"
foodtype = FRUIT | DAIRY | SUGAR
8 changes: 8 additions & 0 deletions code/modules/food_and_drinks/recipes/food_mixtures.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,11 @@
/datum/chemical_reaction/bbqsauce
results = list(/datum/reagent/consumable/bbqsauce = 5)
required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/medicine/salglu_solution = 3, /datum/reagent/consumable/blackpepper = 1)

/datum/chemical_reaction/mac_cheese
results = list(/datum/reagent/consumable/mac_cheese = 3)
required_reagents = list(/datum/reagent/consumable/macaroni = 3, /datum/reagent/consumable/cheese_spread = 1, /datum/reagent/water = 1)

/datum/chemical_reaction/curry_mac
results = list(/datum/reagent/consumable/curry_mac = 3)
required_reagents = list(/datum/reagent/consumable/macaroni = 3, /datum/reagent/consumable/curry_powder = 1, /datum/reagent/water = 1)
12 changes: 12 additions & 0 deletions code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,15 @@
)
result = /obj/item/reagent_containers/food/snacks/popsicle/licorice
subcategory = CAT_ICE

/datum/crafting_recipe/food/rilena_gumball
name = "RILENA gumball popsicle"
reqs = list(
/obj/item/popsicle_stick = 1,
/obj/item/reagent_containers/food/snacks/gumball = 3, //bit pricey
/datum/reagent/consumable/berryjuice = 4,
/datum/reagent/consumable/ice = 4,
/datum/reagent/consumable/cream = 2
)
result = /obj/item/reagent_containers/food/snacks/popsicle/rilena_gumball
subcategory = CAT_ICE
35 changes: 35 additions & 0 deletions code/modules/reagents/chemistry/reagents/food_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,3 +863,38 @@
nutriment_factor = 1 * REAGENTS_METABOLISM
taste_description = "peanut"
reagent_state = SOLID

/datum/reagent/consumable/macaroni
name = "Macaroni"
description = "A key ingredient in the iconic recipe \"Macaroni and Cheese\"."
nutriment_factor = 1 * REAGENTS_METABOLISM
taste_description = "raw noodles"
color = "#302000" // rgb: 48, 32, 0
reagent_state = SOLID

/datum/reagent/consumable/curry_powder
name = "Black Curry Powder"
description = "A gross looking curry powder with blue and white flecks mixed in."
nutriment_factor = 2 * REAGENTS_METABOLISM
taste_mult = 2
taste_description = "video games and despair"
color = "#000000"

/datum/reagent/consumable/mac_cheese
name = "Macaroni and Cheese"
description = "A successful attempt at an ancient and iconic recipe."
nutriment_factor = 6 * REAGENTS_METABOLISM
taste_description = "noodles and cheese"
color = "#FBDB65"

/datum/reagent/consumable/curry_mac
name = "Blackaroni and Curry"
description = "Why is it black. What did you do."
nutriment_factor = 4 * REAGENTS_METABOLISM
taste_description = "video games, despair, and noodles"
color = "#000000"
reagent_state = SOLID

/datum/reagent/consumable/curry_mac/on_mob_life(mob/living/carbon/M) //heats you up like ramen
M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
..()
4 changes: 3 additions & 1 deletion code/modules/vending/snack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/obj/item/reagent_containers/food/snacks/no_raisin = 6,
/obj/item/reagent_containers/food/drinks/dry_ramen = 3,
/obj/item/storage/box/gum = 3,
/obj/item/reagent_containers/food/snacks/energybar = 6)
/obj/item/reagent_containers/food/snacks/energybar = 6,
/obj/item/reagent_containers/food/drinks/macaroni_dry = 3,
/obj/item/reagent_containers/food/drinks/macaroni_curry = 2)
contraband = list(
/obj/item/reagent_containers/food/snacks/syndicake = 6,
/obj/item/reagent_containers/food/snacks/candy/bronx = 1)
Expand Down
Binary file modified icons/obj/contraband.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drinks.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/food/frozen_treats.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/food/ration.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/plushes.dmi
View file
Open in desktop
Binary file not shown.