cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +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/game/objects/items/devices/powersink.dm
+1
View File
@@ -23,6 +23,7 @@
var/mode = 0 // 0 = off, 1=clamped (off), 2=operating
var/admins_warned = FALSE // stop spam, only warn the admins once that we are about to boom
var/obj/structure/cable/attached // the attached cable
new_attack_chain = TRUE
/obj/item/powersink/Destroy()
STOP_PROCESSING(SSobj, src)
code/game/objects/items/devices/scanners.dm
+20 -7
View File
@@ -20,6 +20,7 @@ SLIME SCANNER
materials = list(MAT_METAL = 300)
origin_tech = "magnets=1;engineering=1"
var/on = FALSE
new_attack_chain = TRUE
/obj/item/t_scanner/Destroy()
if(on)
@@ -34,8 +35,12 @@ SLIME SCANNER
else
STOP_PROCESSING(SSobj, src)
/obj/item/t_scanner/attack_self__legacy__attackchain(mob/user)
/obj/item/t_scanner/activate_self(mob/user)
if(..())
return ITEM_INTERACT_COMPLETE
toggle_on()
add_fingerprint(user)
return ITEM_INTERACT_COMPLETE
/obj/item/t_scanner/process()
if(!on)
@@ -92,10 +97,12 @@ SLIME SCANNER
/obj/item/reagent_scanner/interact_with_atom(atom/target, mob/living/user, list/modifiers)
. = ..()
do_scan(target, user)
return ITEM_INTERACT_COMPLETE
/obj/item/reagent_scanner/ranged_interact_with_atom(atom/target, mob/living/user, list/modifiers)
. = ..()
do_scan(target, user)
return ITEM_INTERACT_COMPLETE
/obj/item/reagent_scanner/proc/do_scan(atom/target, mob/living/user)
if(user.stat != CONSCIOUS)
@@ -104,6 +111,8 @@ SLIME SCANNER
to_chat(user, SPAN_WARNING("You don't have the dexterity to do this!"))
return
add_fingerprint(user)
if(!target.reagents)
to_chat(user, SPAN_NOTICE("No significant chemical agents found in [target]."))
return
@@ -170,15 +179,19 @@ SLIME SCANNER
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throw_speed = 3
materials = list(MAT_METAL=30, MAT_GLASS=20)
materials = list(MAT_METAL = 30, MAT_GLASS = 20)
new_attack_chain = TRUE
/obj/item/slime_scanner/attack__legacy__attackchain(mob/living/M, mob/living/user)
/obj/item/slime_scanner/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(user.incapacitated() || user.AmountBlinded())
return
if(!isslime(M))
return ..()
if(!isslime(target))
to_chat(user, SPAN_WARNING("This device can only scan slimes!"))
return
slime_scan(M, user)
return ITEM_INTERACT_COMPLETE
slime_scan(target, user)
add_fingerprint(user)
return ITEM_INTERACT_COMPLETE
/proc/slime_scan(mob/living/simple_animal/slime/T, mob/living/user)
to_chat(user, "========================")