From b1984e9a1b32821ff373ce76d541d22f743eccee Mon Sep 17 00:00:00 2001
From: gurfan <51427771+gurfan@users.noreply.github.com>
Date: Thu, 27 Aug 2020 16:01:07 -0500
Subject: [PATCH] LOIC spam fix (#27648)
* oopsie
* move that too
---
code/game/objects/items/devices/ioncannon_remote.dm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/code/game/objects/items/devices/ioncannon_remote.dm b/code/game/objects/items/devices/ioncannon_remote.dm
index fae2767c810..89d2a8e487e 100644
--- a/code/game/objects/items/devices/ioncannon_remote.dm
+++ b/code/game/objects/items/devices/ioncannon_remote.dm
@@ -29,13 +29,16 @@
if(cooldown - world.time > 0)
to_chat(user, "The Low Orbit Ion Cannon is still on cooldown.")
return
- if(!is_type_in_list(get_area(src), the_station_areas))
- to_chat(user, "The remote can't establish a connection. You need to be on the station.")
- return
if(alert(user, "A cryptic message appears on the screen: \"Activate the Low Orbit Ion-Cannon?\".", name, "Yes", "No") != "Yes")
return
if(user.incapacitated() || !Adjacent(user))
return
+ if(!is_type_in_list(get_area(src), the_station_areas))
+ to_chat(user, "The remote can't establish a connection. You need to be on the station.")
+ return
+ if(cooldown - world.time > 0) //check again for the cooldown in case people prep a bunch of popups
+ to_chat(user, "The Low Orbit Ion Cannon is still on cooldown.")
+ return
generate_ion_law()
command_alert(/datum/command_alert/ion_storm_malicious)
cooldown = world.time + 15 MINUTES