diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index bd82879bb6..2ee7d52db9 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -3355,7 +3355,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 dc428a3585..9d5635a82d 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1355,16 +1355,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", 8) - reagents.add_reagent("alkysine", 8) - bitesize = 3 - /obj/item/weapon/reagent_containers/food/snacks/mint name = "mint" desc = "it is only wafer thin." @@ -1529,6 +1519,24 @@ 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", 25) + reagents.add_reagent("alkysine", 10) + 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 83ab7f096c..9400190431 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1052,9 +1052,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/html/changelog.html b/html/changelog.html index 3e830351e5..c86d85f0f1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -46,6 +46,15 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

May 22

+

Cheridan updated:

+ +
+ +

Tuesday, May 22

Icarus updated:

diff --git a/icons/mob/screen1_Midnight.dmi b/icons/mob/screen1_Midnight.dmi new file mode 100644 index 0000000000..ccee9d5748 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 0000000000..2a6b44f146 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 2a6b44f146..827bdf1b3a 100644 Binary files a/icons/mob/screen1_old.dmi and b/icons/mob/screen1_old.dmi differ diff --git a/icons/mob/zone_sel.dmi b/icons/mob/zone_sel.dmi index 6b47476ca1..6e34fda580 100644 Binary files a/icons/mob/zone_sel.dmi and b/icons/mob/zone_sel.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 0c5a0a7784..2bbdd2d355 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index a21efd0892..089bf90755 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ