From 93443960ae9889349cb1c945bb06ca0c962ffe50 Mon Sep 17 00:00:00 2001 From: psq95 Date: Sat, 13 May 2023 15:51:26 +0100 Subject: [PATCH] Fix calorite golem Remove BLESSED foodtype. Add blessed flag. Use blessed flag instead of foodtype. --- GainStation13/code/mobs/races/caloritegolem.dm | 10 +++------- code/__DEFINES/food.dm | 1 - code/modules/food_and_drinks/food.dm | 3 ++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/GainStation13/code/mobs/races/caloritegolem.dm b/GainStation13/code/mobs/races/caloritegolem.dm index b8b053d7..761a89ca 100644 --- a/GainStation13/code/mobs/races/caloritegolem.dm +++ b/GainStation13/code/mobs/races/caloritegolem.dm @@ -79,24 +79,20 @@ var/charges = 3 to_chat(owner, "You recharge yourself with magical energy!") - /datum/action/innate/bless/Activate() if(charges != 0) charges -= 1 if(ishuman(owner)) to_chat(owner, "You bless the food around you!") - for(var/obj/item/reagent_containers/food/O in view(1, owner)) - if(O.foodtype != BLESSED) + for(var/obj/item/reagent_containers/food/O in view(1, owner)) + if(!O.blessed) O.reagents.add_reagent(/datum/reagent/consumable/nutriment, 10) O.desc += " It faintly glows with warm, orange energy..." - O.foodtype = BLESSED - + O.blessed = 1 else to_chat(owner, "You need to recharge...") - - /datum/action/innate/unburden/Activate() if(charges != 0) charges -= 1 diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 834e23dc..c04e9406 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -14,7 +14,6 @@ #define BREAKFAST (1<<13) #define CLOTH (1<<14) #define ANTITOXIC (1<<15) -#define BLESSED (1<<16) #define DRINK_NICE 1 #define DRINK_GOOD 2 diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 6d3f007f..62cab832 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -15,6 +15,7 @@ resistance_flags = FLAMMABLE var/foodtype = NONE var/last_check_time + var/blessed = 0 // GS13 /obj/item/reagent_containers/food/Initialize(mapload) . = ..() @@ -47,4 +48,4 @@ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast) last_check_time = world.time -#undef STOP_SERVING_BREAKFAST \ No newline at end of file +#undef STOP_SERVING_BREAKFAST