Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

fuck #8520

Merged
SomeguyManperson merged 2 commits into from
May 16, 2020
Merged

fuck #8520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
affbc3f
gygax can't meme while EMPed
SomeguyManperson May 16, 2020
f7fb255
no mech overload while EMPed
SomeguyManperson May 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/game/mecha/mecha_actions.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@
button_icon_state = "mech_overload_off"

/datum/action/innate/mecha/mech_overload_mode/Activate(forced_state = null)
if(equipment_disabled)
return
if(!owner || !chassis || chassis.occupant != owner)
return
if(!isnull(forced_state))
Expand Down
3 changes: 2 additions & 1 deletion code/game/mecha/mecha_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
occupant?.update_mouse_pointer()
if(!equipment_disabled && occupant) //prevent spamming this message with back-to-back EMPs
to_chat(occupant, "<span=danger>Error -- Connection to equipment control unit has been lost.</span>")
overload_action.Activate(0)
addtimer(CALLBACK(src, /obj/mecha/proc/restore_equipment), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
equipment_disabled = 1

Expand Down Expand Up @@ -375,4 +376,4 @@
WR.crowbar_salvage += internal_tank
internal_tank.forceMove(WR)
cell = null
. = ..()
. = ..()