diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm index 82e5a5718b..89e93d3361 100644 --- a/code/datums/mood_events/drug_events.dm +++ b/code/datums/mood_events/drug_events.dm @@ -46,10 +46,10 @@ description = "YES! YES!! YES!!!\n" mood_change = 100 timeout = 300 - //special_screen_obj = "mood_happiness_good" uncomment when added from tg + //special_screen_obj = "mood_happiness_good" Originally in tg, but I personally think they look dumb /datum/mood_event/happiness_drug_bad_od description = "NO! NO!! NO!!!\n" mood_change = -100 timeout = 300 - //special_screen_obj = "mood_happiness_bad" uncomment when added from tg + //special_screen_obj = "mood_happiness_bad" Originally in tg \ No newline at end of file diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi index 14f5540f38..756dcfa981 100644 Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 401fd8473d..b3662e5703 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -41,10 +41,8 @@ var/datum/effect_system/smoke_spread/chem/s = new() for (var/datum/reagent/reagent in my_atom.reagents.reagent_list) //make gas for reagents - if (istype(reagent, /datum/reagent/fermi)) - R.add_reagent(reagent.id, reagent.volume) - else if (istype(reagent, /datum/reagent/toxin/plasma)) - R.add_reagent(reagent.id, reagent.volume/2.5) //for !FUN! (am I doing this right?) reduced to half so it's less punishing. This is mostly for astrogen failures. + R.add_reagent(reagent.id, reagent.volume/3) //Seems fine? I think I fixed the infinite explosion bug. + if (reagent.purity < 0.6) ImpureTot = (ImpureTot + (1-reagent.purity)) / 2