diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 2baf26abae..cb1e5e8177 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -11,6 +11,7 @@ * Candle Box * Cigarette Box * Cigar Case + * Heart Shaped Box w/ Chocolates */ /obj/item/storage/fancy @@ -84,6 +85,7 @@ lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' name = "egg box" + desc = "A carton for containing eggs." storage_slots = 12 can_hold = list(/obj/item/reagent_containers/food/snacks/egg) spawn_type = /obj/item/reagent_containers/food/snacks/egg @@ -279,3 +281,19 @@ name = "\improper premium havanian cigar case" desc = "A case of classy Havanian cigars." spawn_type = /obj/item/clothing/mask/cigarette/cigar/havana + +/* + * Heart Shaped Box w/ Chocolates + */ + +/obj/item/storage/fancy/heart_box + name = "heart-shaped box" + desc = "A heart-shaped box for holding tiny chocolates." + icon = 'icons/obj/food/containers.dmi' + icon_state = "heartbox" + icon_type = "chocolate" + lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + storage_slots = 8 + can_hold = list(/obj/item/reagent_containers/food/snacks/tinychocolate) + spawn_type = /obj/item/reagent_containers/food/snacks/tinychocolate diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 0084cb7ea5..25464ba297 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -18,7 +18,7 @@ H.put_in_hands(new /obj/item/valentine) var/obj/item/storage/backpack/b = locate() in H.contents new /obj/item/reagent_containers/food/snacks/candyheart(b) - + new /obj/item/storage/fancy/heart_box(b) var/list/valentines = list() for(var/mob/living/M in GLOB.player_list) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index a674a20c96..4645993758 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -560,3 +560,12 @@ filling_color = "#F6CB0B" tastes = list("pineapple" = 1) foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/tinychocolate + name = "chocolate" + desc = "A tiny and sweet chocolate." + icon_state = "tiny_chocolate" + list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1) + filling_color = "#A0522D" + tastes = list("chocolate" = 1) + foodtype = JUNKFOOD | SUGAR \ No newline at end of file diff --git a/icons/mob/inhands/misc/food_lefthand.dmi b/icons/mob/inhands/misc/food_lefthand.dmi index 081ac1227a..1cb5b00418 100644 Binary files a/icons/mob/inhands/misc/food_lefthand.dmi and b/icons/mob/inhands/misc/food_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/misc/food_righthand.dmi index d2faffe175..96957de999 100644 Binary files a/icons/mob/inhands/misc/food_righthand.dmi and b/icons/mob/inhands/misc/food_righthand.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index f95ce283d2..dd25181091 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ