From aa2e4299e24b872b7e3557a57784b83ff7156ea3 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 1 Feb 2020 18:51:18 +0100 Subject: [PATCH 1/2] my grug brain took more than 10 attempts to get this to work --- code/datums/martial/boxing.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index b98bc4f951..3ea5115b19 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -50,6 +50,11 @@ D.forcesay(GLOB.hit_appends) return 1 +/datum/martial_art/boxing/teach(mob/living/carbon/human/H, make_temporary = TRUE) + if(..()) + if(H.pulling && ismob(H.pulling)) + H.stop_pulling() + /obj/item/clothing/gloves/boxing var/datum/martial_art/boxing/style = new @@ -58,7 +63,7 @@ return if(slot == SLOT_GLOVES) var/mob/living/carbon/human/H = user - style.teach(H,1) + style.teach(H,TRUE) return /obj/item/clothing/gloves/boxing/dropped(mob/user) From d70665a0c378b10af0ed26cfa1780f9843e4e806 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 1 Feb 2020 19:03:35 +0100 Subject: [PATCH 2/2] got asked to do this --- code/datums/martial/boxing.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 3ea5115b19..ea883c5637 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -51,7 +51,8 @@ return 1 /datum/martial_art/boxing/teach(mob/living/carbon/human/H, make_temporary = TRUE) - if(..()) + . = ..() + if(.) if(H.pulling && ismob(H.pulling)) H.stop_pulling()