cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

First Course; Soups, Salads, Sandwiches! Splits food.dmi in preparation for future PRs. (#22866)

Browse Source 
* ORDER UP

* whoops

* slimes ur jelly sammich

* whoops 2

* prettier pretty patties

* whoops 3

* the splittening

* Henri review

* contra review + repathening

* salad bowl

* contra review 3.0

* renamed plain burger to burger, clarified need for abstract item

* DG Review
This commit is contained in:
Mitchs98
2023-10-28 21:28:56 +02:00
committed by GitHub
parent 7480179907
commit e8ab249eda
19 changed files with 977 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/lootdrop.dm
+5 -5
View File
@@ -412,14 +412,14 @@
/obj/item/reagent_containers/food/snacks/soup/nettlesoup,
/obj/item/reagent_containers/food/snacks/soup/meatballsoup)
var/salads = list(
/obj/item/reagent_containers/food/snacks/herbsalad,
/obj/item/reagent_containers/food/snacks/validsalad,
/obj/item/reagent_containers/food/snacks/aesirsalad)
/obj/item/reagent_containers/food/snacks/salad/herb,
/obj/item/reagent_containers/food/snacks/salad/valid,
/obj/item/reagent_containers/food/snacks/salad/aesir)
var/mains = list(
/obj/item/reagent_containers/food/snacks/enchiladas,
/obj/item/reagent_containers/food/snacks/stewedsoymeat,
/obj/item/reagent_containers/food/snacks/bigbiteburger,
/obj/item/reagent_containers/food/snacks/superbiteburger)
/obj/item/reagent_containers/food/snacks/burger/bigbite,
/obj/item/reagent_containers/food/snacks/burger/superbite)
/obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload)
loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
code/game/objects/items/weapons/RSF.dm
+1 -1
View File
@@ -30,7 +30,7 @@
"Newdles" = /obj/item/reagent_containers/food/snacks/chinese/newdles,
"Donut" = /obj/item/reagent_containers/food/snacks/donut,
"Chicken Soup" = /obj/item/reagent_containers/food/drinks/chicken_soup,
"Tofu Burger" = /obj/item/reagent_containers/food/snacks/tofuburger)
"Tofu Burger" = /obj/item/reagent_containers/food/snacks/burger/tofu)
var/static/list/rsf_icons = list("Drinking Glass" = image(icon = 'icons/obj/drinks.dmi', icon_state = "glass_empty"),
"Paper" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper"),
"Pen" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "pen"),
code/game/objects/items/weapons/storage/backpack.dm
+1
View File
@@ -781,6 +781,7 @@
/obj/item/reagent_containers/food/snacks/plum_pie
name = "perfect plum pie"
desc = "The Jack Horner brand of pie. 2 big thumbs up."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "plump_pie"
filling_color = "#B8279B"
bitesize = 10