Merge pull request #10841 from Kraseo/boxing

Fixes being able to pull after wearing boxing gloves
This commit is contained in:
Ghom
2020-02-01 19:13:30 +01:00
committed by GitHub
+7 -1
View File
@@ -50,6 +50,12 @@
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 +64,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)