Skip to content

Commit 9701c76

Browse files
committed
Review fixes
1 parent 6f32849 commit 9701c76

File tree

1 file changed

+36
-9
lines changed

1 file changed

+36
-9
lines changed

code/game/gamemodes/malfunction/Malf_Modules.dm

+36-9
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@
166166
A.playsound_local(A, AM.unlock_sound, 50, 0)
167167
else //Adding uses to an existing module
168168
action.uses += initial(action.uses)
169+
action.desc = "[initial(action.desc)] It has [action.uses] use\s remaining."
170+
action.UpdateButtonIcon()
169171
temp = "Additional use[action.uses > 1 ? "s" : ""] added to [action.name]!"
170172
processing_time -= AM.cost
171173

@@ -460,16 +462,25 @@
460462
desc = "Overheats a machine, causing a small explosion after a short time."
461463
button_icon_state = "overload_machine"
462464
uses = 2
465+
auto_use_uses = FALSE
466+
467+
/datum/action/innate/ai/overload_machine/New()
468+
..()
469+
desc = "[desc] It has [uses] use\s remaining."
470+
button.desc = desc
463471

464472
/datum/action/innate/ai/overload_machine/Activate()
465473
var/select = input("Choose a device to overload", "Overload Machine", null, null) as null|anything in GLOB.machines
466474
if(!select)
467-
uses++
468475
return
469476

470477
var/obj/machinery/M = select
471478
if(istype(M, /obj/machinery))
472479
if(uses > 0)
480+
adjust_uses(-1)
481+
if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe
482+
desc = "[initial(desc)] It has [uses] use\s remaining."
483+
UpdateButtonIcon()
473484
M.audible_message("<span class='italics'>You hear a loud electrical buzzing sound!</span>")
474485
to_chat(owner, "<span class='warning'>Overloading machine circuitry...</span>")
475486
spawn(50)
@@ -480,7 +491,6 @@
480491
to_chat(owner, "<span class='notice'>Out of uses.</span>")
481492
else
482493
to_chat(owner, "<span class='notice'>That's not a machine.</span>")
483-
uses++
484494
return
485495

486496
//Override Machine: Allows the AI to override a machine, animating it into an angry, living version of itself.
@@ -497,20 +507,28 @@
497507
desc = "Animates a targeted machine, causing it to attack anyone nearby."
498508
button_icon_state = "override_machine"
499509
uses = 4
510+
auto_use_uses = FALSE
511+
512+
/datum/action/innate/ai/override_machine/New()
513+
..()
514+
desc = "[desc] It has [uses] use\s remaining."
515+
button.desc = desc
500516

501517
/datum/action/innate/ai/override_machine/Activate()
502518
var/select = input("Choose a device to override", "Override Machine", null, null) as null|anything in GLOB.machines
503519
if(!select)
504-
uses++
505520
return
506521

507522
var/obj/machinery/M = select
508523
if(istype(M, /obj/machinery))
509524
if(!M.can_be_overridden())
510525
to_chat(owner, "Can't override this device.")
511-
uses++
512526
return
513527
else if(uses > 0)
528+
adjust_uses(-1)
529+
if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe
530+
desc = "[initial(desc)] It has [uses] use\s remaining."
531+
UpdateButtonIcon()
514532
M.audible_message("<span class='italics'>You hear a loud electrical buzzing sound!</span>")
515533
to_chat(owner, "<span class='warning'>Reprogramming machine behaviour...</span>")
516534
spawn(50)
@@ -520,7 +538,6 @@
520538
to_chat(owner, "<span class='notice'>Out of uses.</span>")
521539
else
522540
to_chat(owner, "<span class='notice'>That's not a machine.</span>")
523-
uses++
524541
return
525542

526543
//Robotic Factory: Places a large machine that converts humans that go through it into cyborgs. Unlocking this ability removes shunting.
@@ -608,9 +625,15 @@
608625

609626
/datum/action/innate/ai/blackout
610627
name = "Blackout"
611-
desc = "Overloads lights across the station."
628+
desc = "Overloads random lights across the station."
612629
button_icon_state = "blackout"
613630
uses = 3
631+
auto_use_uses = FALSE
632+
633+
/datum/action/innate/ai/blackout/New()
634+
..()
635+
desc = "[desc] It has [uses] use\s remaining."
636+
button.desc = desc
614637

615638
/datum/action/innate/ai/blackout/Activate()
616639
for(var/obj/machinery/power/apc/apc in GLOB.apcs)
@@ -620,6 +643,10 @@
620643
apc.overload++
621644
to_chat(owner, "<span class='notice'>Overcurrent applied to the powernet.</span>")
622645
owner.playsound_local(owner, "sparks", 50, 0)
646+
adjust_uses(-1)
647+
if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe
648+
desc = "[initial(desc)] It has [uses] use\s remaining."
649+
UpdateButtonIcon()
623650

624651
//Reactivate Camera Network: Reactivates up to 30 cameras across the station.
625652
/datum/AI_Module/small/reactivate_cameras
@@ -641,7 +668,7 @@
641668

642669
/datum/action/innate/ai/reactivate_cameras/New()
643670
..()
644-
desc = "[desc] There are 30 reactivations remaining."
671+
desc = "[desc] It has [uses] use\s remaining."
645672
button.desc = desc
646673

647674
/datum/action/innate/ai/reactivate_cameras/Activate()
@@ -659,8 +686,8 @@
659686
owner.playsound_local(owner, 'sound/items/wirecutter.ogg', 50, 0)
660687
adjust_uses(0, TRUE) //Checks the uses remaining
661688
if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe
662-
desc = "[initial(desc)] There are [uses] reactivations remaining."
663-
owner_AI.update_action_buttons()
689+
desc = "[initial(desc)] It has [uses] use\s remaining."
690+
UpdateButtonIcon()
664691

665692
//Upgrade Camera Network: EMP-proofs all cameras, in addition to giving them X-ray vision.
666693
/datum/AI_Module/large/upgrade_cameras

0 commit comments

Comments
 (0)