mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-14 09:35:30 +01:00
Re-refactors batons / Refactors attack chain force modifiers (#90809)
Melee attack chain now has a list passed along with it, `attack_modifiers`, which you can stick force modifiers to change the resulting attack This is basically a soft implementation of damage packets until a more definitive pr, but one that only applies to item attack chain, and not unarmed attacks. This change was done to facilitate a baton refactor - batons no longer hack together their own attack chain, and are now integrated straight into the real attack chain. This refactor itself was done because batons don't send any attack signals, which has been annoying in the past (for swing combat). 🆑 Melbert refactor: Batons have been refactored again. Baton stuns now properly count as an attack, when before it was a nothing. Report any oddities, particularly in regards to harmbatonning vs normal batonning. refactor: The method of adjusting item damage mid-attack has been refactored - some affected items include the Nullblade and knives. Report any strange happenings with damage numbers. refactor: A few objects have been moved to the new interaction chain - records consoles, mawed crucible, alien weeds and space vines, hedges, restaurant portals, and some mobs - to name a few. fix: Spears only deal bonus damage against secure lockers, not all closet types (including crates) /🆑
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
/// Type of shell to create
|
||||
var/shell_type = /obj/effect/mob_spawn/ghost_role/human/golem
|
||||
|
||||
/obj/item/golem_shell/attackby(obj/item/potential_food, mob/user, list/modifiers)
|
||||
/obj/item/golem_shell/attackby(obj/item/potential_food, mob/user, list/modifiers, list/attack_modifiers)
|
||||
. = ..()
|
||||
if(!isstack(potential_food))
|
||||
balloon_alert(user, "not a mineral!")
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
reagents.expose(user, TOUCH, 20) //Covers target in 20u of oil.
|
||||
to_chat(user, span_notice("You touch the pool of oil, only to get oil all over yourself. It would be wise to wash this off with water."))
|
||||
|
||||
/obj/structure/sink/oil_well/attackby(obj/item/O, mob/living/user, list/modifiers)
|
||||
/obj/structure/sink/oil_well/attackby(obj/item/O, mob/living/user, list/modifiers, list/attack_modifiers)
|
||||
flick("puddle-oil-splash",src)
|
||||
if(O.tool_behaviour == TOOL_SHOVEL) //attempt to deconstruct the puddle with a shovel
|
||||
to_chat(user, "You fill in the oil well with soil.")
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
warning_channel = "Syndicate"
|
||||
include_in_cims = FALSE
|
||||
|
||||
/obj/machinery/power/supermatter_crystal/shard/syndicate/attackby(obj/item/item, mob/living/user, list/modifiers)
|
||||
/obj/machinery/power/supermatter_crystal/shard/syndicate/attackby(obj/item/item, mob/living/user, list/modifiers, list/attack_modifiers)
|
||||
if(istype(item, /obj/item/scalpel/supermatter)) //You can already yoink the docs as a free objective win, another would be just gross
|
||||
to_chat(user, span_danger("This shard's already in Syndicate custody, taking it again could cause more harm than good."))
|
||||
return
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
custom_materials = list(/datum/material/bone=SMALL_MATERIAL_AMOUNT)
|
||||
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
||||
|
||||
/obj/item/knife/envy/afterattack(atom/target, mob/living/carbon/human/user, list/modifiers)
|
||||
/obj/item/knife/envy/afterattack(atom/target, mob/living/carbon/human/user, list/modifiers, list/attack_modifiers)
|
||||
if(!istype(user) || !ishuman(target))
|
||||
return
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
. = ..()
|
||||
icon_state = "[base_icon_state][used ? "-used" : ""]"
|
||||
|
||||
/obj/item/eyesnatcher/attack(mob/living/carbon/human/target, mob/living/user, list/modifiers)
|
||||
/obj/item/eyesnatcher/attack(mob/living/carbon/human/target, mob/living/user, list/modifiers, list/attack_modifiers)
|
||||
if(used || !istype(target) || !target.Adjacent(user)) //Works only once, no TK use
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
. = ..()
|
||||
stored_organ = pick_weight(allowed_organs)
|
||||
|
||||
/obj/structure/meateor_fluff/flesh_pod/attackby(obj/item/attacking_item, mob/user, list/modifiers)
|
||||
/obj/structure/meateor_fluff/flesh_pod/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
|
||||
if (attacking_item.get_sharpness() & SHARP_EDGED)
|
||||
cut_open(user)
|
||||
return
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
. += span_notice("Insert [EXAMINE_HINT("Research Notes")] to generate points.")
|
||||
|
||||
/obj/machinery/rnd/server/oldstation/attackby(obj/item/attacking_item, mob/user, list/modifiers)
|
||||
/obj/machinery/rnd/server/oldstation/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
|
||||
if(istype(attacking_item, /obj/item/research_notes) && stored_research)
|
||||
var/obj/item/research_notes/research_notes = attacking_item
|
||||
stored_research.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = research_notes.value))
|
||||
|
||||
Reference in New Issue
Block a user