From 3877f2a70c3ca9322fecae9fe1a3080ffc0d884f Mon Sep 17 00:00:00 2001 From: Azarak Date: Thu, 11 Nov 2021 17:17:41 +0100 Subject: [PATCH] Pollution changes (#9372) * Pollution changes * Define --- code/__DEFINES/~skyrat_defines/pollution.dm | 6 +++++- code/game/objects/items/cigs_lighters.dm | 4 ++-- code/game/objects/structures/bonfire.dm | 5 +++-- modular_skyrat/modules/pollution/code/pollution.dm | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/~skyrat_defines/pollution.dm b/code/__DEFINES/~skyrat_defines/pollution.dm index 99e801ef191..df0e958b4b9 100644 --- a/code/__DEFINES/~skyrat_defines/pollution.dm +++ b/code/__DEFINES/~skyrat_defines/pollution.dm @@ -16,6 +16,8 @@ #define SCENT_DESC_SMELL "smell" #define SCENT_DESC_FRAGRANCE "fragrance" +#define POLLUTION_DISSIPATION_PLANETARY_MULTIPLIER 4 + ///Minimum amount of smell power to be able to sniff a pollutant #define POLLUTANT_SMELL_THRESHOLD 3.5 @@ -34,4 +36,6 @@ #define THICKNESS_ALPHA_COEFFICIENT 0.0025 //Cap for active emitters that can be running for a very long time -#define POLLUTION_ACTIVE_EMITTER_CAP 300 +#define POLLUTION_ACTIVE_EMITTER_CAP 200 +//For things that you dont want to cause too much pollution +#define POLLUTION_PASSIVE_EMITTER_CAP 70 diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 378c801242f..1728fe2fcfd 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -313,7 +313,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM extinguish() return - location.PolluteTurf(pollution_type, 10) //SKYRAT EDIT ADDITION + location.PolluteTurf(pollution_type, 5, POLLUTION_PASSIVE_EMITTER_CAP) //SKYRAT EDIT ADDITION smoketime -= delta_time * (1 SECONDS) if(smoketime <= 0) @@ -1082,7 +1082,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM //SKYRAT EDIT ADDITION //open flame removed because vapes are a closed system, they won't light anything on fire var/turf/my_turf = get_turf(src) - my_turf.PolluteTurf(/datum/pollutant/smoke/vape, 10) + my_turf.PolluteTurf(/datum/pollutant/smoke/vape, 5, POLLUTION_PASSIVE_EMITTER_CAP) //SKYRAT EDIT END if(obj_flags & EMAGGED) diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm index f2962373efa..9ff21e4bcf8 100644 --- a/code/game/objects/structures/bonfire.dm +++ b/code/game/objects/structures/bonfire.dm @@ -146,8 +146,9 @@ extinguish() return //SKYRAT EDIT ADDITION - var/turf/my_turf = get_turf(src) - my_turf.PolluteListTurf(list(/datum/pollutant/smoke = 20, /datum/pollutant/carbon_air_pollution = 5), POLLUTION_ACTIVE_EMITTER_CAP) + var/turf/open/my_turf = get_turf(src) + if(istype(my_turf) && !my_turf.planetary_atmos) //Pollute, but only when we're not on planetary atmos + my_turf.PolluteListTurf(list(/datum/pollutant/smoke = 15, /datum/pollutant/carbon_air_pollution = 5), POLLUTION_ACTIVE_EMITTER_CAP) //SKYRAT EDIT END bonfire_burn(delta_time) diff --git a/modular_skyrat/modules/pollution/code/pollution.dm b/modular_skyrat/modules/pollution/code/pollution.dm index 3a5b96edf33..d4ce2108589 100644 --- a/modular_skyrat/modules/pollution/code/pollution.dm +++ b/modular_skyrat/modules/pollution/code/pollution.dm @@ -82,7 +82,7 @@ qdel(src) return if(planetary_multiplier && my_turf.planetary_atmos) //Dissipate faster on planetary atmos - amount_to_scrub *= 2 + amount_to_scrub *= POLLUTION_DISSIPATION_PLANETARY_MULTIPLIER for(var/type in pollutants) pollutants[type] -= amount_to_scrub * pollutants[type] / total_amount total_amount -= amount_to_scrub