From b89a6b03984c7bc2a8173a7a8e1131bac757bfa8 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Sun, 29 Mar 2020 02:44:44 +0100
Subject: [PATCH] makes everything work

---
 _maps/map_files/generic/CentCom.dmm | 31 +++++++++++++++++++++++++----
 code/datums/martial/wrestling.dm    | 22 +++++++++++++-------
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index ee76a0fe70..324c944733 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -17960,6 +17960,11 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding)
+"Ui" = (
+/obj/structure/table,
+/obj/item/clothing/mask/luchador/tecnicos,
+/turf/open/floor/holofloor/wood,
+/area/holodeck/rec_center/wrestlingarena)
 "Uj" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Restroom";
@@ -18371,6 +18376,11 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding)
+"Wx" = (
+/obj/structure/table,
+/obj/item/clothing/mask/luchador,
+/turf/open/floor/holofloor/wood,
+/area/holodeck/rec_center/wrestlingarena)
 "Wz" = (
 /obj/structure/table,
 /obj/item/storage/backpack/duffelbag/med/surgery,
@@ -18744,6 +18754,11 @@
 	},
 /turf/open/floor/plasteel/cafeteria,
 /area/centcom/holding)
+"Yv" = (
+/obj/structure/table,
+/obj/item/clothing/mask/luchador/rudos,
+/turf/open/floor/holofloor/wood,
+/area/holodeck/rec_center/wrestlingarena)
 "Yw" = (
 /turf/closed/indestructible/fakedoor{
 	name = "External Access"
@@ -18828,6 +18843,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/supplypod)
+"Zl" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/boxing,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing/green,
+/obj/item/clothing/gloves/boxing/yellow,
+/turf/open/floor/holofloor/wood,
+/area/holodeck/rec_center/wrestlingarena)
 "Zr" = (
 /obj/machinery/light,
 /turf/open/floor/plasteel/dark,
@@ -73246,10 +73269,10 @@ bj
 YC
 YC
 YC
-YC
-YC
-YC
-YC
+Wx
+Yv
+Ui
+Zl
 YC
 YC
 YC
diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index cacf3c03c1..fc87660de2 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -446,9 +446,6 @@
 	..()
 
 /datum/martial_art/wrestling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(A.mind.martial_art == /datum/martial_art/wrestling/holodeck && D.mind.martial_art != /datum/martial_art/wrestling/holodeck)
-		A.visible_message("You cannot put someone into a cinch unless they are wearing a wrestling belt!")
-		return FALSE
 	if(check_streak(A,D))
 		return 1
 	if(A.pulling == D || A == D) // don't stun grab yoursel
@@ -464,10 +461,6 @@
 	name = "Wrestling Belt"
 	var/datum/martial_art/wrestling/style = new
 
-/obj/item/storage/belt/champion/wrestling/holodeck
-	name = "Holodeck Wrestling Belt"
-	var/datum/martial_art/wrestling/holodeck/style = new
-
 /obj/item/storage/belt/champion/wrestling/equipped(mob/user, slot)
 	if(!ishuman(user))
 		return
@@ -483,3 +476,18 @@
 	if(H.get_item_by_slot(SLOT_BELT) == src)
 		style.remove(H)
 	return
+
+//Subtype of wrestling, reserved for the wrestling belts found in the holodeck
+/datum/martial_art/wrestling/holodeck
+	name = "Holodeck Wrestling"
+
+/obj/item/storage/belt/champion/wrestling/holodeck
+	name = "Holodeck Wrestling Belt"
+	style = new /datum/martial_art/wrestling/holodeck
+
+/datum/martial_art/wrestling/holodeck/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(istype(D.mind?.martial_art, /datum/martial_art/wrestling/holodeck))
+		..()
+	else
+		A.visible_message("You can't put people into a cinch unless they are wearing the holodeck wrestling belt!")
+