diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index ebb7c06f9c0..55dde6175fb 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -315,6 +315,12 @@ color = "#5F3A13" taste_description = "bitter cocoa" +/datum/reagent/consumable/cocoa/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + if(isvulpkanin(M) || istajaran(M) || isfarwa(M) || iswolpin(M)) + update_flags |= M.adjustToxLoss(2, FALSE) + return ..() | update_flags + /datum/reagent/consumable/vanilla name = "Vanilla" id = "vanilla" @@ -336,7 +342,10 @@ /datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M) if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - return ..() + var/update_flags = STATUS_UPDATE_NONE + if(isvulpkanin(M) || istajaran(M) || isfarwa(M) || iswolpin(M)) + update_flags |= M.adjustToxLoss(2, FALSE) + return ..() | update_flags /datum/reagent/consumable/garlic name = "Garlic Juice" @@ -566,7 +575,10 @@ /datum/reagent/consumable/chocolate/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 0.8) - return ..() + var/update_flags = STATUS_UPDATE_NONE + if(isvulpkanin(M) || istajaran(M) || isfarwa(M) || iswolpin(M)) // chocolate is bad for dogs and cats, ya know + update_flags |= M.adjustToxLoss(2, FALSE) + return ..() | update_flags /datum/reagent/consumable/chocolate/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) diff --git a/code/modules/surgery/organs/subtypes/tajaran.dm b/code/modules/surgery/organs/subtypes/tajaran.dm index c6494243334..011cdb09c61 100644 --- a/code/modules/surgery/organs/subtypes/tajaran.dm +++ b/code/modules/surgery/organs/subtypes/tajaran.dm @@ -8,7 +8,7 @@ name = "tajaran eyeballs" colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability. replace_colours = TRITANOPIA_COLOR_REPLACE - see_in_dark = 3 + see_in_dark = 4 /obj/item/organ/internal/eyes/tajaran/farwa //Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness. name = "farwa eyeballs" diff --git a/code/modules/surgery/organs/subtypes/vulpkanin.dm b/code/modules/surgery/organs/subtypes/vulpkanin.dm index b72283e3be6..42a632a37be 100644 --- a/code/modules/surgery/organs/subtypes/vulpkanin.dm +++ b/code/modules/surgery/organs/subtypes/vulpkanin.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/species_organs/vulpkanin.dmi' colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability. replace_colours = PROTANOPIA_COLOR_REPLACE - see_in_dark = 3 + see_in_dark = 4 /obj/item/organ/internal/eyes/vulpkanin/wolpin //Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness. name = "wolpin eyeballs"