From 014777b059d2dc150d0f6ccec9db2fba6ad28bbf Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Thu, 29 Jun 2023 11:24:43 -0400 Subject: [PATCH 1/5] Prevents spamming open and close tarps --- code/modules/cm_marines/equipment/gear.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index 98e7dbcf49df..c9746f47aa39 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -53,6 +53,7 @@ anchored = FALSE var/uncloak_time = 3 //in SECONDS, this is how long it takes for the tarp to become fully visible again once it's opened from an invisible state var/cloak_time = 15 //ditto for cloaking + var/delay_time = 0 //in SECONDS, used to implement a delay before tarp can be entered again after opened (anti-exploit) var/closed_alpha = 60 //how much ALPHA the tarp has once it's fully cloaked. var/can_store_dead = FALSE var/is_animating = FALSE @@ -137,10 +138,14 @@ return /obj/structure/closet/bodybag/tarp/open() + delay_time = world.time + 3 SECONDS //3 seconds must past before tarp can be closed again . = ..() handle_cloaking() /obj/structure/closet/bodybag/tarp/close() + if(delay_time > world.time) + to_chat(usr, SPAN_WARNING("It is too soon to close the [src]!")) + return FALSE . = ..() handle_cloaking() From eebafe8d891869acbe893f360cbd51a9ae75792a Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Thu, 29 Jun 2023 12:11:21 -0400 Subject: [PATCH 2/5] Update code/modules/cm_marines/equipment/gear.dm Co-authored-by: harryob --- code/modules/cm_marines/equipment/gear.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index c9746f47aa39..81cf68189cd6 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -144,7 +144,7 @@ /obj/structure/closet/bodybag/tarp/close() if(delay_time > world.time) - to_chat(usr, SPAN_WARNING("It is too soon to close the [src]!")) + to_chat(usr, SPAN_WARNING("It is too soon to close [src]!")) return FALSE . = ..() handle_cloaking() From e5a907b0052fce5e7c3c1700156f040a4e48877b Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Thu, 29 Jun 2023 12:37:55 -0400 Subject: [PATCH 3/5] Harry Changes --- .../objects/structures/crates_lockers/closets.dm | 2 +- code/modules/cm_marines/equipment/gear.dm | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 05355feeb154..e6c215d0208f 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -149,7 +149,7 @@ /obj/structure/closet/proc/toggle(mob/living/user) user.next_move = world.time + 5 - if(!(src.opened ? src.close() : src.open())) + if(!(src.opened ? src.close(user) : src.open())) to_chat(user, SPAN_NOTICE("It won't budge!")) return diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index 81cf68189cd6..147576bea7f8 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -53,12 +53,12 @@ anchored = FALSE var/uncloak_time = 3 //in SECONDS, this is how long it takes for the tarp to become fully visible again once it's opened from an invisible state var/cloak_time = 15 //ditto for cloaking - var/delay_time = 0 //in SECONDS, used to implement a delay before tarp can be entered again after opened (anti-exploit) var/closed_alpha = 60 //how much ALPHA the tarp has once it's fully cloaked. var/can_store_dead = FALSE var/is_animating = FALSE var/first_open = TRUE exit_stun = 0 + COOLDOWN_DECLARE(toggle_delay)//used to implement a delay before tarp can be entered again after opened (anti-exploit) /obj/structure/closet/bodybag/tarp/snow icon_state = "snowtarp_closed" @@ -92,9 +92,9 @@ exit_stun = 1 can_store_dead = TRUE -/obj/structure/closet/bodybag/tarp/reactive/scout/close() +/obj/structure/closet/bodybag/tarp/reactive/scout/close(mob/user) if(!skillcheck(usr, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && usr.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_SCOUT) - to_chat(usr, SPAN_WARNING("You don't seem to know how to use [src]...")) + to_chat(user, SPAN_WARNING("You don't seem to know how to use [src]...")) return . = ..() @@ -138,13 +138,13 @@ return /obj/structure/closet/bodybag/tarp/open() - delay_time = world.time + 3 SECONDS //3 seconds must past before tarp can be closed again + COOLDOWN_START(src,toggle_delay,3 SECONDS) //3 seconds must pass before tarp can be closed . = ..() handle_cloaking() -/obj/structure/closet/bodybag/tarp/close() - if(delay_time > world.time) - to_chat(usr, SPAN_WARNING("It is too soon to close [src]!")) +/obj/structure/closet/bodybag/tarp/close(mob/user) + if(!COOLDOWN_FINISHED(src, toggle_delay)) + to_chat(user, SPAN_WARNING("It is too soon to close [src]!")) return FALSE . = ..() handle_cloaking() From 5256e1beaad49fe2d7cbe2f9edc375ad6f2bce23 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:01:54 -0400 Subject: [PATCH 4/5] Update code/modules/cm_marines/equipment/gear.dm Co-authored-by: harryob --- code/modules/cm_marines/equipment/gear.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index 147576bea7f8..b39b8f283ba4 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -58,7 +58,8 @@ var/is_animating = FALSE var/first_open = TRUE exit_stun = 0 - COOLDOWN_DECLARE(toggle_delay)//used to implement a delay before tarp can be entered again after opened (anti-exploit) + /// used to implement a delay before tarp can be entered again after opened (anti-exploit) + COOLDOWN_DECLARE(toggle_delay) /obj/structure/closet/bodybag/tarp/snow icon_state = "snowtarp_closed" From 6a0c197d822e9cf4654386419eed5491c44f0bca Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Fri, 30 Jun 2023 14:37:37 -0400 Subject: [PATCH 5/5] Update code/modules/cm_marines/equipment/gear.dm Co-authored-by: harryob --- code/modules/cm_marines/equipment/gear.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index b39b8f283ba4..ff6c715b520b 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -139,7 +139,7 @@ return /obj/structure/closet/bodybag/tarp/open() - COOLDOWN_START(src,toggle_delay,3 SECONDS) //3 seconds must pass before tarp can be closed + COOLDOWN_START(src, toggle_delay, 3 SECONDS) //3 seconds must pass before tarp can be closed . = ..() handle_cloaking()