diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index d45bcfa2ff4..85832153d91 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -49,8 +49,7 @@ /obj/item/radio/beacon/bacon //Probably a better way of doing this, I'm lazy. /obj/item/radio/beacon/bacon/proc/digest_delay() - spawn(600) - qdel(src) + QDEL_IN(src, 600) // SINGULO BEACON SPAWNER /obj/item/radio/beacon/syndicate diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm index fb5ea043839..299b60cc8fa 100644 --- a/code/modules/food_and_drinks/food/foods/candy.dm +++ b/code/modules/food_and_drinks/food/foods/candy.dm @@ -258,7 +258,7 @@ /obj/item/reagent_containers/food/snacks/candy/gummybear/wtf name = "gummy bear" desc = "A small bear. Wait... what?" - icon_state = "gbear_wtf" + icon_state = "gbear_rainbow" filling_color = "#60A584" list_reagents = list("sugar" = 10, "space_drugs" = 2) @@ -318,7 +318,7 @@ /obj/item/reagent_containers/food/snacks/candy/gummyworm/wtf name = "gummy worm" desc = "An edible worm. Did it just move?" - icon_state = "gworm_wtf" + icon_state = "gworm_rainbow" filling_color = "#60A584" list_reagents = list("sugar" = 10, "space_drugs" = 2) @@ -413,7 +413,7 @@ /obj/item/reagent_containers/food/snacks/candy/jellybean/wtf name = "jelly bean" desc = "A candy bean, guarenteed to not give you gas. You aren't sure what color it is." - icon_state = "jbean_wtf" + icon_state = "jbean_rainbow" filling_color = "#60A584" list_reagents = list("sugar" = 10, "space_drugs" = 2) diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index eb9569ad356..d19a88fcea8 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -152,7 +152,7 @@ /obj/item/reagent_containers/food/snacks/bacon name = "bacon" desc = "It looks crispy and tastes amazing! Mmm... Bacon." - icon_state = "bacon2" + icon_state = "bacon" list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4) /obj/item/reagent_containers/food/snacks/telebacon @@ -168,8 +168,9 @@ /obj/item/reagent_containers/food/snacks/telebacon/On_Consume(mob/M, mob/user) if(!reagents.total_volume) - baconbeacon.loc = user + baconbeacon.forceMove(user) baconbeacon.digest_delay() + baconbeacon = null /obj/item/reagent_containers/food/snacks/meatball name = "meatball" diff --git a/icons/obj/food/candy.dmi b/icons/obj/food/candy.dmi index 89714f5b5b3..66795d6ec95 100644 Binary files a/icons/obj/food/candy.dmi and b/icons/obj/food/candy.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index ebabdcf2ef5..aea237f5bed 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ