From c90f7ea4c62c8bdffb6306f220ba690fa1157d5b Mon Sep 17 00:00:00 2001 From: skoglol <33292112+kriskog@users.noreply.github.com> Date: Sat, 25 Jul 2020 11:43:48 +0200 Subject: [PATCH] Reduces possible cargo express pod spam. (#52414) --- code/__DEFINES/cooldowns.dm | 1 + code/modules/cargo/expressconsole.dm | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 2510db0fbfe..a6bceddbd73 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -27,6 +27,7 @@ //INDEXES #define COOLDOWN_BORG_SELF_REPAIR "borg_self_repair" +#define COOLDOWN_EXPRESSPOD_CONSOLE "expresspod_console" //TIMER COOLDOWN MACROS diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 866f270c259..5e71e7f7972 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -1,4 +1,4 @@ -#define MAX_EMAG_ROCKETS 8 +#define MAX_EMAG_ROCKETS 5 #define BEACON_COST 500 #define SP_LINKED 1 #define SP_READY 2 @@ -149,6 +149,9 @@ if("add")//Generate Supply Order first + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_EXPRESSPOD_CONSOLE)) + say("Railgun recalibrating. Stand by.") + return var/id = text2path(params["id"]) var/datum/supply_pack/pack = SSshuttle.supply_packs[id] if(!istype(pack)) @@ -189,6 +192,7 @@ if(empty_turfs && empty_turfs.len) LZ = pick(empty_turfs) if (SO.pack.cost <= points_to_check && LZ)//we need to call the cost check again because of the CHECK_TICK call + TIMER_COOLDOWN_START(src, COOLDOWN_EXPRESSPOD_CONSOLE, 5 SECONDS) D.adjust_money(-SO.pack.cost) new /obj/effect/pod_landingzone(LZ, podType, SO) . = TRUE @@ -202,6 +206,7 @@ LAZYADD(empty_turfs, T) CHECK_TICK if(empty_turfs && empty_turfs.len) + TIMER_COOLDOWN_START(src, COOLDOWN_EXPRESSPOD_CONSOLE, 10 SECONDS) D.adjust_money(-(SO.pack.cost * (0.72*MAX_EMAG_ROCKETS))) SO.generateRequisition(get_turf(src))