mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 19:17:50 +01:00
Migrate /obj/item/assembly to the new attack chain. (#31987)
* Migrate /obj/item/assembly to the new attack chain. * Migrate more procs. * Add parent calls to activate_self(). * Add parent call to activate_self() in noise sensor. * Apply CRUNCH's style suggestions. Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Change igniter attack to interact_with_atom(). * Restore assembly UIs. * Ensure assembly interact procs fire, ensure fingerprints. --------- 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:
@@ -43,7 +43,7 @@
|
||||
cooldown = 2
|
||||
pulse(FALSE)
|
||||
if(loc)
|
||||
loc.visible_message("[bicon(src)] *beep* *beep* *beep*", "*beep* *beep* *beep*")
|
||||
loc.audible_message("[bicon(src)] *beep* *beep* *beep*", "*beep* *beep* *beep*")
|
||||
playsound(src, 'sound/machines/triple_beep.ogg', 40, extrarange = -10)
|
||||
addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
if(holder)
|
||||
holder.update_icon()
|
||||
|
||||
/obj/item/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires
|
||||
/obj/item/assembly/timer/interact(mob/user)//TODO: Have this use the wires
|
||||
if(!secured)
|
||||
user.show_message(SPAN_WARNING("[src] is unsecured!"))
|
||||
return FALSE
|
||||
@@ -92,6 +92,7 @@
|
||||
popup.set_content(dat)
|
||||
popup.open(0)
|
||||
onclose(user, "timer")
|
||||
return ..()
|
||||
|
||||
/obj/item/assembly/timer/Topic(href, href_list)
|
||||
..()
|
||||
@@ -125,4 +126,4 @@
|
||||
return
|
||||
|
||||
if(usr)
|
||||
attack_self__legacy__attackchain(usr)
|
||||
activate_self(usr)
|
||||
|
||||
Reference in New Issue
Block a user