diff --git a/code/__defines/_reagents.dm b/code/__defines/_reagents.dm index ab43653eccc..e4d5dbb6dd6 100644 --- a/code/__defines/_reagents.dm +++ b/code/__defines/_reagents.dm @@ -186,6 +186,12 @@ #define REAGENT_ID_POLYMORPH "polymorph" #define REAGENT_GLAMOUR "Glamour" #define REAGENT_ID_GLAMOUR "glamour" +#define REAGENT_GLAMOUR_INVIS "Clear Glamour" +#define REAGENT_ID_GLAMOUR_INVIS "transparent_glamour" +#define REAGENT_GLAMOUR_SCALE "Scaling Glamour" +#define REAGENT_ID_GLAMOUR_SCALE "scaling_glamour" +#define REAGENT_GLAMOUR_TWINKLING "Twinkling Glamour" +#define REAGENT_ID_GLAMOUR_TWINKLING "twinkling_glamour" #define REAGENT_INAPROVALINE "Inaprovaline" #define REAGENT_ID_INAPROVALINE "inaprovaline" #define REAGENT_INAPROVALAZE "Inaprovalaze" diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 69158e84925..e2706b5dc39 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -54,8 +54,8 @@ rtotal += round(potency/reagent_data[2]) if(rid == REAGENT_ID_NUTRIMENT) data[seed.seed_name] = max(1,rtotal) - - reagents.add_reagent(rid,max(1,rtotal),data) + if(rid != REAGENT_ID_GLAMOUR_INVIS) + reagents.add_reagent(rid,max(1,rtotal),data) update_desc() if(reagents.total_volume > 0) bitesize = 1+round(reagents.total_volume / 2, 1) diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm index 29db8b4b779..31c9494181c 100644 --- a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm +++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm @@ -11,11 +11,11 @@ /obj/item/reagent_containers/glass/bottle/potion/invisibility name = "transparent potion" desc = "A small white potion, the clear liquid inside can barely be seen at all." - prefill = list("transparent glamour" = 1) + prefill = list(REAGENT_ID_GLAMOUR_INVIS = 1) /datum/reagent/glamour_transparent - name = "Clear Glamour" - id = "transparent glamour" + name = REAGENT_GLAMOUR_INVIS + id = REAGENT_ID_GLAMOUR_INVIS description = "This material is from somewhere else, it can barely be seen by the naked eye." taste_description = "nothingness" reagent_state = LIQUID @@ -49,11 +49,11 @@ /obj/item/reagent_containers/glass/bottle/potion/scaling name = "scaling potion" desc = "A small white potion, the clear liquid inside can barely be seen at all." - prefill = list("scaling glamour" = 1) + prefill = list(REAGENT_ID_GLAMOUR_SCALE = 1) /datum/reagent/glamour_scaling - name = "Scaling Glamour" - id = "scaling glamour" + name = REAGENT_GLAMOUR_SCALE + id = REAGENT_ID_GLAMOUR_SCALE description = "This material is from somewhere else, it appears to change volumes readily at a glance." taste_description = "difficult to discern" reagent_state = LIQUID @@ -84,11 +84,11 @@ /obj/item/reagent_containers/glass/bottle/potion/darksight name = "twinling potion" desc = "A small white potion, the thin white liquid inside twinkles brightly." - prefill = list("twinkling glamour" = 1) + prefill = list(REAGENT_ID_GLAMOUR_TWINKLING = 1) /datum/reagent/glamour_twinkling - name = "Twinkling Glamour" - id = "twinkling glamour" + name = REAGENT_GLAMOUR_TWINKLING + id = REAGENT_ID_GLAMOUR_TWINKLING description = "This material is from somewhere else, it appears to be twinkling." taste_description = "bright" reagent_state = LIQUID