mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 19:13:30 +01:00
Attack chain, initial setup. (pull *immediately* for *any* TM issues) (#26834)
* refactor: Attack chain, initial setup. * migrate curtain to make dreamchecker happy * update thurible * don't call attacked_by separately for legacy attack chain * remove duplicate proc * condense similar code, put allowances for legacy code in new procs * update docs, include diagram source * add comment on how to update diagram * fix admonition * mindflayer updates * remove commented out code * clarify all steps * after_attack should be overridable * whoops * retrofit recent changes * duh, can't restrict this yet because of tool_acts * i hate ore bags with the fire of a thousand suns * return correct value for object attack logic * Various cleanups. We don't want to attempt to pull stuff out of `/obj/item/attackby`, because those pieces are part of the related objects' migrations, not `/obj/item` itself. Attempting to do this causes knockon effects where things expected to call e.g. `/obj/item/storage/attackby` in the call chain were not ferried over to the new item interaction code, because the related objects hadn't actually been migrated over yet. I've used refactoring /obj/vehicle as the example for migrating `attackby` methods instead. * simplify some argument names * fuck it * make it do the thing * Rename CI module call * Prove that CI works * improve test output * aaand fix it again * fix curtain tool interactions * fix compile error * fix compile error * Better docs, introduce migration plan tool.
This commit is contained in:
committed by
GitHub
parent
e9e16645e1
commit
525c68d617
@@ -66,7 +66,7 @@
|
||||
if(!.)
|
||||
return
|
||||
var/obj/item/grenade/mirage/grenade = .
|
||||
grenade.attack_self(mod.wearer)
|
||||
grenade.attack_self__legacy__attackchain(mod.wearer)
|
||||
|
||||
/obj/item/grenade/mirage
|
||||
name = "mirage grenade"
|
||||
@@ -81,7 +81,7 @@
|
||||
thrower = null
|
||||
return ..()
|
||||
|
||||
/obj/item/grenade/mirage/attack_self(mob/user)
|
||||
/obj/item/grenade/mirage/attack_self__legacy__attackchain(mob/user)
|
||||
. = ..()
|
||||
thrower = user
|
||||
|
||||
@@ -191,7 +191,7 @@
|
||||
playsound(src, 'sound/machines/click.ogg', 100, TRUE)
|
||||
drain_power(use_power_cost)
|
||||
var/obj/item/grenade/grenade = dispensed
|
||||
grenade.attack_self(mod.wearer)
|
||||
grenade.attack_self__legacy__attackchain(mod.wearer)
|
||||
return grenade
|
||||
|
||||
/obj/item/mod/module/anomaly_locked/firewall/prebuilt
|
||||
@@ -245,7 +245,7 @@
|
||||
playsound(src, 'sound/machines/click.ogg', 100, TRUE)
|
||||
drain_power(use_power_cost)
|
||||
var/obj/item/grenade/grenade = dispensed
|
||||
grenade.attack_self(mod.wearer)
|
||||
grenade.attack_self__legacy__attackchain(mod.wearer)
|
||||
return grenade
|
||||
|
||||
/obj/item/mod/module/anomaly_locked/cryogrenade/prebuilt
|
||||
@@ -270,7 +270,7 @@
|
||||
thrower = null
|
||||
return ..()
|
||||
|
||||
/obj/item/grenade/cryogrenade_mod/attack_self(mob/user)
|
||||
/obj/item/grenade/cryogrenade_mod/attack_self__legacy__attackchain(mob/user)
|
||||
. = ..()
|
||||
thrower = user
|
||||
|
||||
@@ -304,4 +304,4 @@
|
||||
var/obj/item/grenade/smokebomb/grenade = ..()
|
||||
if(!grenade)
|
||||
return
|
||||
grenade.attack_self(mod.wearer)
|
||||
grenade.attack_self__legacy__attackchain(mod.wearer)
|
||||
|
||||
Reference in New Issue
Block a user