Merge pull request #8203 from Cerebulon/food2021

Food Expansion
This commit is contained in:
MistakeNot4892
2021-09-03 11:55:26 +10:00
committed by GitHub
35 changed files with 1022 additions and 169 deletions
+37
View File
@@ -56,6 +56,10 @@
name = "bbq chips bag"
icon_state = "chips_bbq"
/obj/item/trash/chips/snv
name = "salt & vinegar chips bag"
icon_state = "chips_snv"
/obj/item/trash/cookiesnack
name = "\improper Carps Ahoy! miniature cookies packet"
icon_state = "cookiesnack"
@@ -89,10 +93,26 @@
/obj/item/trash/plate
name = "plate"
icon_state = "plate"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/snack_bowl
name = "snack bowl"
icon_state = "snack_bowl"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/small_bowl
name = "small bowl"
icon_state = "small_bowl"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/asian_bowl
name = "decorated bowl"
icon_state = "asian_bowl"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/pistachios
name = "pistachios packet"
@@ -246,6 +266,12 @@
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/ntbeans
name = "empty baked bean can"
icon_state = "ntbeans"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/salo //ADDITION 04/11/2021
name = "salo pack"
icon_state = "pigfat"
@@ -367,3 +393,14 @@
name = "veggie ration bag"
icon_state = "vegration"
/obj/item/trash/smolburger
name = "burger packaging"
icon_state = "smolburger"
/obj/item/trash/smolhotdog
name = "hotdog packaging"
icon_state = "smolhotdog"
/obj/item/trash/smolburrito
name = "burrito packaging"
icon_state = "smolburrito"
@@ -404,23 +404,23 @@
desc = "Drymate brand monkey cubes. Just add water!"
icon = 'icons/obj/food.dmi'
icon_state = "monkeycubebox"
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped = 4)
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube/wrapped = 4)
/obj/item/weapon/storage/box/monkeycubes/farwacubes
name = "farwa cube box"
desc = "Drymate brand farwa cubes, shipped from Meralar. Just add water!"
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube = 4)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube/wrapped/farwacube = 4)
/obj/item/weapon/storage/box/monkeycubes/stokcubes
name = "stok cube box"
desc = "Drymate brand stok cubes, shipped from Moghes. Just add water!"
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube = 4)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube/wrapped/stokcube = 4)
/obj/item/weapon/storage/box/monkeycubes/neaeracubes
name = "neaera cube box"
desc = "Drymate brand neaera cubes, shipped from Qerr'balak. Just add water!"
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube = 4)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube/wrapped/neaeracube = 4)
/obj/item/weapon/storage/box/ids
name = "box of spare IDs"