mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-19 02:50:08 +01:00
Let the Pizza wars begin! (New foods added + some food related tweaks) (#21204)
-Added many new food dishes and ingredients (many of them pizzas). -Added some of the new ingredients to the Cargo order form. - Added 2 new drinks and a drink bottle for one of them. -Nerfed a few dishes that require cooking seafood or frying so that you can no longer make them with the microwave -Created new vending machine that sells microwave/instant foods to make up for it and give Microwaves some variety. -Added shrimp to the required ingredients for North 60 squid. -Renamed empty Shakshouka pan to be something more generic so it can be used for other dishes. -Adjusted the contents of Dyn Pozole so it doesn't take five years to finish eating. -Defined a color for S'th berry juice. -Created new pages and files for microwave foods. If/when suggesting fixes please be mindful that my knowledge of code is very limited and many of the more complicated funcitons have been copy pasted form elsewherein the code and edited to fit, so coommit suggestions are appreciated. --------- Signed-off-by: tomixcomics <11053204+tomixcomics@users.noreply.github.com> Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com> Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
This commit is contained in:
co-authored by
FlamingLily
hazelrat
VMSolidus
Matt Atlas
parent
e19b95c916
commit
aad2e6bbd4
@@ -308,9 +308,9 @@
|
||||
pickup_sound = 'sound/items/pickup/glass.ogg'
|
||||
|
||||
/obj/item/trash/shakshouka
|
||||
name = "empty shakshouka pan"
|
||||
name = "large messy pan"
|
||||
icon_state = "shakshouka"
|
||||
desc = "It looks like the murder scene... Of a delicious Shakshouka. Trash or recycle."
|
||||
desc = "It looks like the murder scene... of a delicious, saucy dish. Trash or recycle."
|
||||
drop_sound = 'sound/items/drop/bottle.ogg'
|
||||
pickup_sound = 'sound/items/pickup/bottle.ogg'
|
||||
|
||||
@@ -413,3 +413,16 @@
|
||||
icon_state = "bowl_brown"
|
||||
drop_sound = 'sound/items/drop/glass.ogg'
|
||||
pickup_sound = 'sound/items/pickup/glass.ogg'
|
||||
|
||||
/obj/item/trash/microwave_package
|
||||
name = "empty microwave food package"
|
||||
icon = 'icons/obj/item/reagent_containers/food/processed.dmi'
|
||||
icon_state = "microwave_trash"
|
||||
|
||||
/obj/item/trash/mac_cheeze
|
||||
name = "empty mac and cheeze container"
|
||||
icon_state = "mac_trash"
|
||||
|
||||
/obj/item/trash/mac_fiery
|
||||
name = "empty fiery hot mac and cheeze container"
|
||||
icon_state = "mac_trash_fiery"
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
var/icon_overlays = TRUE // whether the icon uses the update_icon() or a unique one.
|
||||
var/open_sound = null // if you want to play a special sound if you open it for the first time
|
||||
var/open_message = null // same as above, but a message
|
||||
var/opened_icon_state = null //for items that have unique base icons but look the same opened, such as all the various microwave pizzas.
|
||||
foldable = null // most of this stuff isn't foldable by default, e.g. cig packets and vial boxes
|
||||
contained_sprite = TRUE
|
||||
|
||||
@@ -72,7 +73,7 @@
|
||||
if(icon_overlays) //whether it uses the overlays/uses its own version.
|
||||
src.icon_state = "[src.icon_type][src.storage_type][contents.len - itemremoved]"
|
||||
else
|
||||
icon_state = "[initial(icon_state)][src.opened]"
|
||||
icon_state = opened_icon_state ? opened_icon_state : "[initial(icon_state)][src.opened]"
|
||||
..()
|
||||
else
|
||||
ClearOverlays()
|
||||
@@ -909,3 +910,73 @@
|
||||
else if(contents.len <= 10)
|
||||
item_state = "heartbox_open"
|
||||
icon_state = "heartbox_full"
|
||||
|
||||
/obj/item/storage/box/fancy/food/sliced_bread
|
||||
name = "sliced bread"
|
||||
desc = "The best thing since... ever, basically! This store-bought bread might not have the heart and soul of a fresh loaf of bread baked at home, but it's... uh... Well, at least it's supsiciously square!"
|
||||
icon = 'icons/obj/item/reagent_containers/food/bread.dmi'
|
||||
icon_state = "slicedbread_full"
|
||||
icon_type = "bread slice"
|
||||
use_sound = 'sound/items/storage/wrapper.ogg'
|
||||
drop_sound = 'sound/items/drop/wrapper.ogg'
|
||||
pickup_sound = 'sound/items/pickup/wrapper.ogg'
|
||||
storage_type = "bag"
|
||||
storage_slots = 8
|
||||
max_storage_space = 8
|
||||
can_hold = list(
|
||||
/obj/item/reagent_containers/food/snacks/breadslice/filled
|
||||
)
|
||||
starts_with = list(/obj/item/reagent_containers/food/snacks/breadslice/filled = 8)
|
||||
opened = TRUE
|
||||
closable = FALSE
|
||||
throwforce = 1
|
||||
|
||||
/obj/item/storage/box/fancy/food/sliced_bread/update_icon()
|
||||
. = ..()
|
||||
var/storage_space_used
|
||||
for(var/obj/item/I in contents)
|
||||
storage_space_used += I.get_storage_cost()
|
||||
|
||||
if(!storage_space_used)
|
||||
icon_state = "slicedbread_empty"
|
||||
else if(storage_space_used <= 0.25 * max_storage_space)
|
||||
icon_state = "slicedbread_last"
|
||||
else if(storage_space_used <= 0.5 * max_storage_space)
|
||||
icon_state = "slicedbread_half"
|
||||
else if(storage_space_used <= 0.875 * max_storage_space)
|
||||
icon_state = "slicedbread_nearfull"
|
||||
else if(storage_space_used <= max_storage_space)
|
||||
icon_state = "slicedbread_full"
|
||||
|
||||
|
||||
/obj/item/storage/box/fancy/food/packaged_shrimp
|
||||
name = "packaged shrimp"
|
||||
desc = "A package containing raw shrimp, as fresh as packaged shellfish shipped halfway across the universe can be!"
|
||||
icon = 'icons/obj/item/reagent_containers/food/meat.dmi'
|
||||
icon_state = "shrimp_pack"
|
||||
icon_type = "raw shrimp"
|
||||
use_sound = 'sound/items/storage/wrapper.ogg'
|
||||
drop_sound = 'sound/items/drop/wrapper.ogg'
|
||||
pickup_sound = 'sound/items/pickup/wrapper.ogg'
|
||||
storage_slots = 4
|
||||
max_storage_space = 4
|
||||
can_hold = list(
|
||||
/obj/item/reagent_containers/food/snacks/fish/raw_shrimp
|
||||
)
|
||||
starts_with = list(/obj/item/reagent_containers/food/snacks/fish/raw_shrimp = 4)
|
||||
opened = TRUE
|
||||
closable = FALSE
|
||||
throwforce = 1
|
||||
|
||||
/obj/item/storage/box/fancy/food/packaged_shrimp/update_icon()
|
||||
. = ..()
|
||||
var/storage_space_used
|
||||
for(var/obj/item/I in contents)
|
||||
storage_space_used += I.get_storage_cost()
|
||||
|
||||
if(!storage_space_used)
|
||||
icon_state = "shrimp_pack_empty"
|
||||
else if(storage_space_used <= 0.5 * max_storage_space)
|
||||
icon_state = "shrimp_pack_half"
|
||||
else if(storage_space_used <= max_storage_space)
|
||||
icon_state = "shrimp_pack"
|
||||
|
||||
Reference in New Issue
Block a user