Migrate data disks to the new attack chain. (#32235)

* Migrate data disks to the new attack chain.

* Call parent in activate_self()

* Migrate plant disks too.

* Call parent in activate_self() in gene_modder.dm.

* Prevent runtime on examine.

* Add fingerprints.
This commit is contained in:
Alan
2026-07-24 19:44:04 +00:00
committed by GitHub
parent fe04a981da
commit 9c8f096c97
2 changed files with 23 additions and 10 deletions
+15 -7
View File
@@ -601,10 +601,13 @@
QDEL_NULL(gene)
return ..()
/obj/item/disk/plantgene/attackby__legacy__attackchain(obj/item/W, mob/user, params)
..()
if(is_pen(W))
rename_interactive(user, W)
/obj/item/disk/plantgene/item_interaction(mob/living/user, obj/item/used, list/modifiers)
if(..())
return ITEM_INTERACT_COMPLETE
if(is_pen(used))
rename_interactive(user, used)
add_fingerprint(user)
return ITEM_INTERACT_COMPLETE
/obj/item/disk/plantgene/update_name()
. = ..()
@@ -662,11 +665,15 @@
icon_state = "datadisk_hydro"
/obj/item/disk/plantgene/attack_self__legacy__attackchain(mob/user)
/obj/item/disk/plantgene/activate_self(mob/user)
if(..())
return ITEM_INTERACT_COMPLETE
if(HAS_TRAIT(src, TRAIT_CMAGGED))
return
return ITEM_INTERACT_COMPLETE
read_only = !read_only
to_chat(user, SPAN_NOTICE("You flip the write-protect tab to [read_only ? "protected" : "unprotected"]."))
add_fingerprint(user)
return ITEM_INTERACT_COMPLETE
/obj/item/disk/plantgene/cmag_act(mob/user)
if(!HAS_TRAIT(src, TRAIT_CMAGGED))
@@ -694,7 +701,8 @@
. = ..()
if(!HAS_TRAIT(src, TRAIT_CMAGGED))
return
if(!user) // Prevents a runtime when examine is called. Yes, regular examine().
user = usr
if((user.mind.assigned_role == "Captain" || user.mind.special_role == SPECIAL_ROLE_NUKEOPS) && user.Adjacent(src))
. += SPAN_DANGER("Yes, even closer examination confirms it's not a trick of the light, it really is just a regular plant disk.")
. += SPAN_USERDANGER("Now stop staring at this worthless fake and FIND THE REAL ONE!")