cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate scanners and powersink to the new attack chain. (#32259)

Browse Source 
* Migrate scanners and powersink to the new attack chain.

* Call parent in activate_self() of t-ray scanners.

* Apply suggestion from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
This commit is contained in:
Alan
2026-07-24 19:41:03 +00:00
committed by GitHub
co-authored by CRUNCH
parent 6a94bd21ae
commit f8d9136269
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/mining_charges.dm
+8 -6
View File
@@ -163,18 +163,18 @@
. = ..()
. += SPAN_NOTICE("This scanner has an extra port for overriding mining charge safeties.")
/obj/item/t_scanner/adv_mining_scanner/syndicate/afterattack__legacy__attackchain(atom/target, mob/user, proximity_flag, click_parameters)
/obj/item/t_scanner/adv_mining_scanner/syndicate/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(!istype(target, /obj/item/grenade/plastic/miningcharge))
return
return ..()
var/obj/item/grenade/plastic/miningcharge/charge = target
if(charge.hacked)
to_chat(user, SPAN_NOTICE("[src] is already overridden!"))
return
to_chat(user, SPAN_WARNING("[src] is already overridden!"))
return ITEM_INTERACT_COMPLETE
if(charges <= 0)
to_chat(user, SPAN_NOTICE("Its overriding function is depleted."))
return
to_chat(user, SPAN_WARNING("Its overriding function is depleted!"))
return ITEM_INTERACT_COMPLETE
charge.override_safety()
visible_message(SPAN_WARNING("Sparks fly out of [src]!"))
@@ -182,6 +182,8 @@
charges--
if(charges <= 0)
to_chat(user, SPAN_WARNING("[src]'s internal battery for overriding mining charges has run dry!"))
add_fingerprint(user)
return ITEM_INTERACT_COMPLETE
// MINING CHARGES DETONATOR