diff --git a/code/datums/elements/bugkiller_reagent.dm b/code/datums/elements/bugkiller_reagent.dm index cbbca1d0790..226e59da332 100644 --- a/code/datums/elements/bugkiller_reagent.dm +++ b/code/datums/elements/bugkiller_reagent.dm @@ -30,7 +30,7 @@ return // capping damage so splashing a beaker on a moth is not an instant crit - var/damage = min(round(0.4 * reac_volume * (1 - touch_protection), 0.1), 12) + var/damage = min(round(reac_volume * (1 - touch_protection), 0.1), 20) if(damage < 1) return diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 2a24a234523..736e5754d73 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -1042,10 +1042,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 w_class = WEIGHT_CLASS_SMALL /// Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. var/static/list/splattable - /// Things in this list which take a lot more damage from the fly swatter, but not be necessarily killed by it. - var/static/list/strong_against - /// How much extra damage the fly swatter does against mobs it is strong against - var/extra_strength_damage = 24 /obj/item/melee/flyswatter/Initialize(mapload) . = ..() @@ -1060,11 +1056,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/effect/decal/cleanable/ants, /obj/item/queen_bee, )) - if (isnull(strong_against)) - strong_against = typecacheof(list( - /mob/living/basic/spider, - )) - + AddElement(/datum/element/bane, mob_biotypes = MOB_BUG, target_type = /mob/living/basic, damage_multiplier = 0, added_damage = 24, requires_combat_mode = FALSE) /obj/item/melee/flyswatter/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers) if(is_type_in_typecache(target, splattable)) @@ -1076,10 +1068,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 bug.gib(DROP_ALL_REMAINS) else qdel(target) - return - if(is_type_in_typecache(target, strong_against) && isliving(target)) - var/mob/living/living_target = target - living_target.adjustBruteLoss(extra_strength_damage) /obj/item/proc/can_trigger_gun(mob/living/user, akimbo_usage) if(!user.can_use_guns(src)) diff --git a/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm b/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm index 34205124db6..5e5d98afb10 100644 --- a/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm +++ b/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm @@ -16,7 +16,7 @@ response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" response_disarm_simple = "gently push aside" - damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, STAMINA = 1, OXY = 1) + damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 4, STAMINA = 1, OXY = 1) basic_mob_flags = FLAMMABLE_MOB status_flags = NONE speed = -0.1 diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider.dm b/code/modules/mob/living/basic/space_fauna/spider/spider.dm index ace8d97bbfb..2e7c5db5276 100644 --- a/code/modules/mob/living/basic/space_fauna/spider/spider.dm +++ b/code/modules/mob/living/basic/space_fauna/spider/spider.dm @@ -14,7 +14,7 @@ response_disarm_simple = "gently push aside" initial_language_holder = /datum/language_holder/spider melee_attack_cooldown = CLICK_CD_MELEE - damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, STAMINA = 1, OXY = 1) + damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 3, STAMINA = 1, OXY = 1) basic_mob_flags = FLAMMABLE_MOB status_flags = NONE unsuitable_cold_damage = 4