From b644637897f687cc88dccfcc0cb13981fe9456de Mon Sep 17 00:00:00 2001 From: Xaytan <37344638+Xaytan@users.noreply.github.com> Date: Thu, 7 Mar 2024 00:36:15 -0500 Subject: [PATCH] Tames Some Exploits (#5099) * Removed anatomy from heirloom weapon * Capped vig's reduction of environmental sanity Having sanity above 72 will no longer allow you to gain sanity by staring at blood and crayon runes. --- code/datums/perks/backgrounds.dm | 2 +- code/modules/sanity/sanity_mob.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/perks/backgrounds.dm b/code/datums/perks/backgrounds.dm index d51a8962500..a86743f9ddb 100644 --- a/code/datums/perks/backgrounds.dm +++ b/code/datums/perks/backgrounds.dm @@ -172,7 +172,7 @@ This is NOT for racial-specific perks, but rather specifically for general backg W.desc += " It has been inscribed with the \"[holder.name]\" family name." W.name = "[W] of [holder.name]" var/oddities = rand(2,4) //Will boost 2-4 random stats - var/list/stats = ALL_STATS + var/list/stats = ALL_STATS_FOR_LEVEL_UP var/list/final_oddity = list() for(var/i = 1 to oddities) var/stat = pick(stats) diff --git a/code/modules/sanity/sanity_mob.dm b/code/modules/sanity/sanity_mob.dm index 8ef0ef04518..1661becdcaa 100644 --- a/code/modules/sanity/sanity_mob.dm +++ b/code/modules/sanity/sanity_mob.dm @@ -9,7 +9,7 @@ GLOBAL_VAR_INIT(GLOBAL_INSIGHT_MOD, 1) #define SANITY_VIEW_DAMAGE_MOD (0.4 * GLOB.GLOBAL_SANITY_MOD) // Damage received from unpleasant stuff in view -#define SANITY_DAMAGE_VIEW(damage, vig, dist) ((damage) * SANITY_VIEW_DAMAGE_MOD * (1.2 - (vig) / STAT_LEVEL_MAX) * (1 - (dist)/15)) +#define SANITY_DAMAGE_VIEW(damage, vig, dist) ((damage) * SANITY_VIEW_DAMAGE_MOD * max((1.2 - (vig) / STAT_LEVEL_MAX), 0.05) * (1 - (dist)/15)) // Damage received from body damage #define SANITY_DAMAGE_HURT(damage, vig) (min((damage) / 5 * SANITY_DAMAGE_MOD * (1.2 - (vig) / STAT_LEVEL_MAX), 60))