mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-16 12:22:42 +00:00
3807930fe6
* broke game while working on update, halp thanks tech support * Update code/modules/reagents/reagent_containers/food/snacks/soup.dm Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com> * Added more foods, still WIP * updating things to see where the bgus are coming from triolade, palfooz and cake pops are lal broken and idk why yet ._. someone said is hould commit changes and see what the checks say. * trying to fix triolade and palfouz * code giving trouble * finally fixed the issues! woo! * Got almost everything done and working! only pitas are left :) * Final update! -Added a whole lot of recipes -Fixed a whole lot of bugs -Fixed V'krexi wraps from a previous update -Updated some icons -Let's submit this thing! * Adding changelog Woo, changelog! * Update Tomixcomics-PR-17759.yml Whoops, missed a typo. * trying to solve issues * fixed bug that was causing runtime errors when recipes were made incorrectly. PR should be good to go now. * Update code/game/objects/items/trash.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/fancy.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/cooking/recipes/cultural/recipes_human.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/food/sandwich.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * small fixes deleted folder that wasn't supposed to be included (still no clue why it was there lol) and deleted unnecessary annotation --------- Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com> Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
320 lines
7.8 KiB
Plaintext
320 lines
7.8 KiB
Plaintext
//Items labled as 'trash' for the trash bag.
|
|
//TODO: Make this an item var or something...
|
|
|
|
//Added by Jack Rost
|
|
/obj/item/trash
|
|
icon = 'icons/obj/trash.dmi'
|
|
w_class = ITEMSIZE_TINY
|
|
contained_sprite = TRUE
|
|
item_state = "candy"
|
|
desc = "General waste material, refuse or litter. Dispose responsibly."
|
|
drop_sound = 'sound/items/drop/wrapper.ogg'
|
|
pickup_sound = 'sound/items/pickup/wrapper.ogg'
|
|
|
|
/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
|
|
return
|
|
|
|
/obj/item/trash/koisbar
|
|
name = "\improper k'ois bar wrapper"
|
|
icon_state = "koisbar"
|
|
|
|
/obj/item/trash/kokobar
|
|
name = "\improper koko bar wrapper"
|
|
icon_state = "kokobar"
|
|
|
|
/obj/item/trash/raisins
|
|
name = "\improper 4no raisins"
|
|
icon_state = "4no_raisins"
|
|
|
|
/obj/item/trash/candy
|
|
name = "candy wrapper"
|
|
icon_state = "candy"
|
|
|
|
/obj/item/trash/cheesie
|
|
name = "\improper Cheesie Honkers"
|
|
icon_state = "cheesie_honkers"
|
|
|
|
/obj/item/trash/chips
|
|
name = "empty chip packet"
|
|
icon_state = "chips"
|
|
item_state = "chips"
|
|
|
|
/obj/item/trash/chips/cucumber
|
|
icon_state = "cucumberchips"
|
|
|
|
/obj/item/trash/chips/chicken
|
|
icon_state = "chickenchips"
|
|
|
|
/obj/item/trash/chips/dirtberry
|
|
icon_state = "dirtberrychips"
|
|
|
|
/obj/item/trash/chips/phoron
|
|
icon_state = "phoronchips"
|
|
|
|
/obj/item/trash/popcorn
|
|
name = "popcorn"
|
|
icon_state = "popcorn"
|
|
|
|
/obj/item/trash/sosjerky
|
|
name = "\improper Scaredy's Private Reserve Beef Jerky"
|
|
icon_state = "sosjerky"
|
|
|
|
/obj/item/trash/syndi_cakes
|
|
name = "\improper Nutri-Cakes"
|
|
icon_state = "syndi_cakes"
|
|
|
|
/obj/item/trash/waffles
|
|
name = "square tray"
|
|
icon_state = "waffles"
|
|
drop_sound = /singleton/sound_category/tray_hit_sound
|
|
|
|
/obj/item/trash/plate
|
|
name = "plate"
|
|
icon_state = "plate"
|
|
drop_sound = 'sound/items/drop/gloves.ogg'
|
|
pickup_sound = 'sound/items/pickup/gloves.ogg'
|
|
|
|
/obj/item/trash/plate/steak
|
|
icon_state = "steak"
|
|
|
|
/obj/item/trash/snack_bowl
|
|
name = "snack bowl"
|
|
icon_state = "snack_bowl"
|
|
drop_sound = 'sound/items/drop/gloves.ogg'
|
|
pickup_sound = 'sound/items/pickup/gloves.ogg'
|
|
|
|
/obj/item/trash/snack_bowl/macandcheese
|
|
name = "empty mac and cheese"
|
|
icon_state = "macandcheese"
|
|
|
|
/obj/item/trash/pistachios
|
|
name = "pistachios pack"
|
|
icon_state = "pistachios_pack"
|
|
|
|
/obj/item/trash/semki
|
|
name = "semki pack"
|
|
icon_state = "semki_pack"
|
|
|
|
/obj/item/trash/tray
|
|
name = "tray"
|
|
icon_state = "tray"
|
|
drop_sound = /singleton/sound_category/tray_hit_sound
|
|
|
|
/obj/item/trash/candle
|
|
name = "candle"
|
|
icon = 'icons/obj/storage/fancy/candle.dmi'
|
|
icon_state = "candle4"
|
|
drop_sound = 'sound/items/drop/gloves.ogg'
|
|
pickup_sound = 'sound/items/pickup/gloves.ogg'
|
|
|
|
/obj/item/trash/liquidfood
|
|
name = "\improper \"LiquidFood\" ration"
|
|
icon_state = "liquidfood"
|
|
|
|
/obj/item/trash/tastybread
|
|
name = "bread tube"
|
|
icon_state = "tastybread"
|
|
|
|
/obj/item/trash/meatsnack
|
|
name = "mo'gunz meat pie"
|
|
icon_state = "meatsnack-used"
|
|
item_state = "chips"
|
|
|
|
/obj/item/trash/maps
|
|
name = "maps salty ham"
|
|
icon_state = "maps-used"
|
|
drop_sound = 'sound/items/drop/shovel.ogg'
|
|
pickup_sound = 'sound/items/pickup/shovel.ogg'
|
|
|
|
/obj/item/trash/nathisnack
|
|
name = "razi-snack corned beef"
|
|
icon_state = "cbeef-used"
|
|
drop_sound = 'sound/items/drop/shovel.ogg'
|
|
pickup_sound = 'sound/items/pickup/shovel.ogg'
|
|
|
|
/obj/item/trash/brownies
|
|
name = "square tray"
|
|
icon_state = "brownies"
|
|
drop_sound = /singleton/sound_category/tray_hit_sound
|
|
|
|
/obj/item/trash/snacktray
|
|
name = "snacktray"
|
|
icon_state = "snacktray"
|
|
|
|
/obj/item/trash/dipbowl
|
|
name = "dip bowl"
|
|
icon_state = "dipbowl"
|
|
|
|
/obj/item/trash/chipbasket
|
|
name = "empty basket"
|
|
icon_state = "chipbasket_empty"
|
|
|
|
/obj/item/trash/uselessplastic
|
|
name = "useless plastic"
|
|
icon_state = "useless_plastic"
|
|
|
|
/obj/item/trash/can
|
|
name = "used can"
|
|
icon_state = "cola"
|
|
drop_sound = 'sound/items/drop/soda.ogg'
|
|
pickup_sound = 'sound/items/pickup/soda.ogg'
|
|
randpixel = 4
|
|
|
|
/obj/item/trash/can/Initialize()
|
|
. = ..()
|
|
randpixel_xy()
|
|
|
|
/obj/item/trash/can/adhomian_can
|
|
icon_state = "can-used"
|
|
|
|
/obj/item/trash/tuna
|
|
name = "\improper Tuna Snax"
|
|
icon_state = "tuna"
|
|
|
|
/obj/item/trash/skrellsnacks
|
|
name = "\improper SkrellSnax"
|
|
icon_state = "skrellsnacks"
|
|
|
|
/obj/item/trash/space_twinkie
|
|
name = "\improper space twinkie"
|
|
icon_state = "space_twinkie"
|
|
|
|
/obj/item/trash/grease //used for generic plattered food. example is lasagna.
|
|
name = "square tray"
|
|
icon_state = "grease"
|
|
drop_sound = /singleton/sound_category/tray_hit_sound
|
|
|
|
/obj/item/trash/cookiesnack
|
|
name = "\improper Carps Ahoy! miniature cookies"
|
|
icon_state = "cookiesnack"
|
|
|
|
/obj/item/trash/admints
|
|
name = "\improper Ad-mints"
|
|
icon_state = "admint_pack"
|
|
|
|
/obj/item/trash/gum
|
|
name = "\improper Chewy Fruit flavored gum"
|
|
icon_state = "gum_pack"
|
|
|
|
/obj/item/trash/stew
|
|
name = "empty pot"
|
|
icon = 'icons/obj/kitchen.dmi'
|
|
icon_state = "stew_empty"
|
|
drop_sound = 'sound/items/drop/shovel.ogg'
|
|
pickup_sound = 'sound/items/pickup/shovel.ogg'
|
|
|
|
/obj/item/trash/coffee
|
|
name = "empty cup"
|
|
icon_state = "coffee_vended"
|
|
drop_sound = 'sound/items/drop/papercup.ogg'
|
|
pickup_sound = 'sound/items/pickup/papercup.ogg'
|
|
|
|
/obj/item/trash/ramen
|
|
name = "cup ramen"
|
|
icon_state = "ramen"
|
|
drop_sound = 'sound/items/drop/papercup.ogg'
|
|
pickup_sound = 'sound/items/pickup/papercup.ogg'
|
|
|
|
/obj/item/trash/candybowl
|
|
name = "empty candy bowl"
|
|
icon_state = "candy_bowl"
|
|
drop_sound = 'sound/items/drop/bottle.ogg'
|
|
pickup_sound = 'sound/items/pickup/bottle.ogg'
|
|
|
|
/obj/item/trash/ricetub
|
|
name = "empty rice tub"
|
|
icon_state = "ricetub"
|
|
var/has_chopsticks = FALSE
|
|
|
|
/obj/item/trash/ricetub/attackby(obj/item/W, mob/living/user)
|
|
if(istype(W, /obj/item/material/kitchen/utensil/fork/chopsticks))
|
|
to_chat(user, SPAN_NOTICE("You reattach the [W] to \the [src]"))
|
|
qdel(W)
|
|
has_chopsticks = TRUE
|
|
update_icon()
|
|
return TRUE
|
|
|
|
/obj/item/trash/ricetub/update_icon()
|
|
if(has_chopsticks)
|
|
icon_state = "ricetub_s"
|
|
else
|
|
icon_state = "ricetub"
|
|
|
|
/obj/item/trash/ricetub/sticks
|
|
has_chopsticks = TRUE
|
|
|
|
/obj/item/trash/seaweed
|
|
name = "empty moss pack"
|
|
icon_state = "seaweed"
|
|
|
|
/obj/item/trash/vkrexitaffy
|
|
name = "V'krexi Snax"
|
|
icon_state = "vkrexitaffy"
|
|
item_state = "vkrexi"
|
|
|
|
/obj/item/trash/broken_electronics
|
|
name = "broken electronics"
|
|
icon_state = "door_electronics_smoked"
|
|
|
|
/obj/item/trash/phoroncandy
|
|
name = "\improper phoron rock candy stick"
|
|
icon_state = "rock_candy"
|
|
|
|
/obj/item/trash/proteinbar
|
|
name = "protein bar wrapper"
|
|
icon_state = "proteinbar"
|
|
|
|
/obj/item/trash/leaf
|
|
name = "dirty leaf"
|
|
icon_state = "leaf"
|
|
desc = "Is... Is that a big old leaf with... are those beans on it? Why?! What kind of situation would lead to this?!"
|
|
|
|
/obj/item/trash/north60squidempty
|
|
name = "empty platter"
|
|
icon_state = "north60squidempty"
|
|
desc = "A deep dish meant to hold a pool of sauce and seafood, but now it only holds delicious memories. Trash it."
|
|
drop_sound = 'sound/items/drop/bottle.ogg'
|
|
pickup_sound = 'sound/items/pickup/bottle.ogg'
|
|
|
|
/obj/item/trash/triolade
|
|
name = "empty dessert dish"
|
|
icon_state = "triolade"
|
|
|
|
/obj/item/trash/board
|
|
name = "dirty board"
|
|
icon_state = "board"
|
|
|
|
/obj/item/trash/icecreamcup
|
|
name = "empty ice cream cup"
|
|
icon_state = "icecreamcup"
|
|
desc = "Oh look, it's one of those prank fake melted ice cream cu- oh, nope. it's real. eugh. Do... Do you have a napkin?"
|
|
|
|
/obj/item/trash/purplebowl
|
|
name = "empty bowl"
|
|
icon_state = "purplebowl"
|
|
drop_sound = 'sound/items/drop/bottle.ogg'
|
|
pickup_sound = 'sound/items/pickup/bottle.ogg'
|
|
|
|
/obj/item/trash/deepdive
|
|
name = "empty deepdive dish"
|
|
icon_state = "deepdive"
|
|
drop_sound = 'sound/items/drop/glass.ogg'
|
|
pickup_sound = 'sound/items/pickup/glass.ogg'
|
|
|
|
/obj/item/trash/bluemoon
|
|
name = "empty blue moon"
|
|
icon_state = "bluemoon"
|
|
drop_sound = 'sound/items/drop/glass.ogg'
|
|
pickup_sound = 'sound/items/pickup/glass.ogg'
|
|
|
|
/obj/item/trash/shakshouka
|
|
name = "empty shakshouka pan"
|
|
icon_state = "shakshouka"
|
|
desc = "It looks like the murder scene... Of a delicious Shakshouka. Trash or recycle."
|
|
drop_sound = 'sound/items/drop/bottle.ogg'
|
|
pickup_sound = 'sound/items/pickup/bottle.ogg'
|
|
|
|
/obj/item/trash/stick
|
|
name = "candy stick"
|
|
icon_state = "rock_candy"
|