diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index ac56d023d08..eb35afea771 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -3608,7 +3608,7 @@ name = "Erika Surprise" desc = "The surprise is, it's green!" if("driestmartini") - icon_state = "driestmartini" + icon_state = "driestmartiniglass" name = "Driest Martini" desc = "Only for the experienced. You think you see sand floating in the glass." else diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index af8363d9951..b820fd6c179 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1411,14 +1411,6 @@ reagents.add_reagent("metroid", 5) bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/braincake - name = "Brain Cake" - desc = "A squishy cake-thing." - icon_state = "braincake" - New() - ..() - reagents.add_reagent("nutriment", 28) - bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup name = "chantrelle soup" @@ -1575,6 +1567,23 @@ trash = "plate" bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake + name = "Brain Cake" + desc = "A squishy cake-thing." + icon_state = "braincake" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/braincakeslice + slices_num = 5 + New() + ..() + reagents.add_reagent("nutriment", 28) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/braincakeslice + name = "Brain Cake slice" + desc = "Lemme tell you something about prions. THEY'RE DELICIOUS." + icon_state = "braincakeslice" + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake name = "Cheese Cake" desc = "DANGEROUSLY cheesy." diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index f89c92f4f2b..9dd974a39cc 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -959,9 +959,9 @@ /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/egg, - /mob/living/carbon/brain, + /obj/item/brain ) - result = /obj/item/weapon/reagent_containers/food/snacks/braincake + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake /datum/recipe/chocolateegg items = list( diff --git a/icons/mob/screen1_Midnight.dmi b/icons/mob/screen1_Midnight.dmi new file mode 100644 index 00000000000..ccee9d5748d Binary files /dev/null and b/icons/mob/screen1_Midnight.dmi differ diff --git a/icons/mob/screen1_Orange.dmi b/icons/mob/screen1_Orange.dmi new file mode 100644 index 00000000000..c8d7e48afe2 Binary files /dev/null and b/icons/mob/screen1_Orange.dmi differ diff --git a/icons/mob/screen1_old.dmi b/icons/mob/screen1_old.dmi index c8d7e48afe2..4827370a329 100644 Binary files a/icons/mob/screen1_old.dmi and b/icons/mob/screen1_old.dmi differ