shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makes everything work

Browse Source
This commit is contained in:
timothyteakettle
2020-03-29 02:44:44 +01:00
parent 5afe5aab3f
commit b89a6b0398
2 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/wrestling.dm
+15 -7
View File
@@ -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!")