From 7b3d9f981332fb96928fb6b2e1091bcbedbb0e08 Mon Sep 17 00:00:00 2001 From: Sonoida Date: Wed, 9 Nov 2022 22:43:24 +0100 Subject: [PATCH] finished fatchem immunity trait + lipo vent clog event (WIP) - Lipoifier immunity is now mostly tested. It significantly lowers the value of Lipolifier and Corn Oil, making the victim almost completely resistant against its effect - Fiddled a lil more with vent clog events (lipoifier variant). WARNING: this does not work in the current state! --- code/datums/traits/neutral.dm | 2 +- code/modules/events/vent_clog.dm | 36 ++++++++----------- .../chemistry/reagents/food_reagents.dm | 8 ++--- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index e344db06..ed3c3643 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -129,7 +129,7 @@ /datum/quirk/lipoifier_immunity name = "Lipoifier Immunity" - desc = "Your body is mostly immune to widening properties of Lipoifier chemical and its cheaper alternative." + desc = "Your body is mostly immune to widening properties of Lipoifier chemical and its cheaper alternative: corn oil." mob_trait = TRAIT_LIPOIFIER_IMMUNE value = 0 category = CATEGORY_SEXUAL diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 5698fd87..483c0c4d 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -131,29 +131,23 @@ typepath = /datum/round_event/vent_clog/beer max_occurrences = 0 -// WIP, gonna use it later once I fix ingredients not popping into smoke +/datum/round_event_control/vent_clog/lipoifier + name = "Clogged Vents: Lipoifier" + typepath = /datum/round_event/vent_clog/lipoifier + weight = 5 + max_occurrences = 0 + min_players = 5 -// /datum/round_event_control/vent_clog/lipoifier -// name = "Clogged Vents: Lipoifier" -// typepath = /datum/round_event/vent_clog/lipoifier -// weight = 5 -// max_occurrences = 0 -// min_players = 5 +/datum/round_event/vent_clog/lipoifier/start() + for(var/obj/machinery/atmospherics/components/unary/vent in vents) + if(vent && vent.loc && !vent.welded) + var/datum/reagent/consumable/lipoifier = new + smoke.set_up(7, get_turf(vent), 7) + smoke.start() + CHECK_TICK -// /datum/round_event/vent_clog/lipoifier/start() -// for(var/obj/machinery/atmospherics/components/unary/vent in vents) -// if(vent && vent.loc && !vent.welded) -// var/datum/reagents/R = new/datum/reagents(1000) -// R.my_atom = vent -// R.add_reagent(/datum/reagent/consumable/lipoifier, reagentsAmount) - -// var/datum/effect_system/foam_spread/foam = new -// foam.set_up(200, get_turf(vent), R) -// foam.start() -// CHECK_TICK - -// /datum/round_event/vent_clog/lipoifier -// reagentsAmount = 20 +/datum/round_event/vent_clog/lipoifier + reagentsAmount = 20 /datum/round_event/vent_clog/beer diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 8c5ac828..5671ae1c 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -452,11 +452,11 @@ color = "#302000" // rgb: 48, 32, 0 taste_description = "slime" -/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/cornoil/on_mob_life(mob/living/carbon/M) if(M && !HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE)) - target.nutrition += 20 * REAGENTS_METABOLISM - else: - target.nutrition += 1 + M.nutrition += 20 * REAGENTS_METABOLISM + else + M.nutrition += 1 ..() /datum/reagent/consumable/cornoil/reaction_turf(turf/open/T, reac_volume)