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

fixes the map, adds subtype of martial art

Browse Source
This commit is contained in:
timothyteakettle
2020-03-29 00:46:18 +00:00
parent 818d7b2ebf
commit 5afe5aab3f
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/wrestling.dm
+7
View File
@@ -446,6 +446,9 @@
..()
/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
@@ -461,6 +464,10 @@
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