Fixes breakout cooldown of lewd restraining items (#2166)

* lewd restraining cd fix * fix 1 Co-authored-by: Bloop <[email protected]> * fix 2 --------- Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Apr 26, 2024 · 8e69047 · 8e69047
1 parent 0cfd747
commit 8e69047
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/modular_nova/master_files/code/modules/mob/living/carbon/human/human.dm b/modular_nova/master_files/code/modules/mob/living/carbon/human/human.dm
@@ -9,3 +9,12 @@
 		verbs -= /mob/living/carbon/human/verb/climax_verb
 	if(CONFIG_GET(flag/disable_lewd_items))
 		verbs -= /mob/living/carbon/human/verb/safeword
+
+// so the lewd straight jacket behaves (and because the reason behind this is /too/ lewd for upstream) - also allows for more downstream freedom
+/mob/living/carbon/human/resist_restraints()
+	if(wear_suit?.breakouttime)
+		changeNext_move(wear_suit.resist_cooldown)
+		last_special = world.time + wear_suit.resist_cooldown
+		cuff_resist(wear_suit)
+	else
+		return ..()
diff --git a/modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/latex_straight_jacket.dm b/modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/latex_straight_jacket.dm
@@ -17,6 +17,7 @@
 	equip_delay_self = NONE
 	strip_delay = 12 SECONDS
 	breakouttime = 1 SECONDS
+	resist_cooldown = CLICK_CD_SLOW
 
 /obj/item/clothing/suit/straight_jacket/latex_straight_jacket/attackby(obj/item/attacking_item, mob/user, params) //That part allows reinforcing this item with normal straightjacket
 	if(!istype(attacking_item, /obj/item/clothing/suit/straight_jacket))

diff --git a/modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/lewd_gloves.dm b/modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/lewd_gloves.dm
@@ -7,6 +7,7 @@
 	icon = 'modular_nova/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_gloves.dmi'
 	worn_icon = 'modular_nova/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_gloves.dmi'
 	breakouttime = 1 SECONDS
+	resist_cooldown = CLICK_CD_SLOW
 
 //That part allows reinforcing this item with handcuffs
 /obj/item/clothing/gloves/ball_mittens/attackby(obj/item/attacking_item, mob/user, params)

diff --git a/modular_nova/modules/modular_items/lewd_items/code/lewd_helpers/human.dm b/modular_nova/modules/modular_items/lewd_items/code/lewd_helpers/human.dm
@@ -359,11 +359,11 @@
 // Handles breaking out of gloves that restrain people.
 /mob/living/carbon/human/resist_restraints()
 	if(gloves?.breakouttime)
-		changeNext_move(CLICK_CD_BREAKOUT)
-		last_special = world.time + CLICK_CD_BREAKOUT
+		changeNext_move(gloves.resist_cooldown)
+		last_special = world.time + gloves.resist_cooldown
 		cuff_resist(gloves)
 	else
-		..()
+		return ..()
 
 /// Checks if the human is wearing a condom, and also hasn't broken it.
 /mob/living/carbon/human/proc/is_wearing_condom()