mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 03:51:49 +01:00
New lore foods, Milkshakes, and a bugfix. (#18048)
* New foods, milkshakes, and a bugfix. * changed syrup colors * resolved weird merge conflict * Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * made requested changes * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/Chemistry-Recipes.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/cooking/recipes/cultural/recipes_human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> * made requested changes * more corrections * updating again because it didn't take last time --------- Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
This commit is contained in:
co-authored by
Fluffy
Matt Atlas
parent
fc1c2fcf5d
commit
fec20152b8
@@ -317,3 +317,17 @@
|
||||
/obj/item/trash/stick
|
||||
name = "candy stick"
|
||||
icon_state = "rock_candy"
|
||||
|
||||
/obj/item/trash/imperial_pot_empty
|
||||
name = "imperial pot"
|
||||
desc = "This large wooden pot was probably used to house a grand, elaborate, dominian feast at some point. How majestic it must have been. Oh well, get rid of it now before it draws rats."
|
||||
icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi'
|
||||
icon_state = "imperialpotempty"
|
||||
drop_sound = 'sound/items/drop/shovel.ogg'
|
||||
pickup_sound = 'sound/items/pickup/shovel.ogg'
|
||||
|
||||
/obj/item/trash/wooden_platter
|
||||
name = "wooden platter"
|
||||
icon_state = "woodentray"
|
||||
drop_sound = 'sound/items/drop/bottle.ogg'
|
||||
pickup_sound = 'sound/items/pickup/bottle.ogg'
|
||||
|
||||
Reference in New Issue
Block a user