Martial arts improvements and additions (#6094)

-adds framework for weapons based martial arts, implementing a very basic swordsmanship
-makes the martial art books more modular
-fixes some minor issues with some of the martial art code
-adds amohdan swordsmen gear, to be used in a future event/sold by the merchant
- fixes #6083
This commit is contained in:
Alberyk
2019-03-10 23:38:00 +02:00
committed by Erki
parent 7934515c6a
commit 15bfb052d7
21 changed files with 187 additions and 166 deletions
+4 -16
View File
@@ -78,22 +78,6 @@ datum/martial_art/karak_virul/grab_act(var/mob/living/carbon/human/A, var/mob/li
basic_hit(A,D)
return 1
/obj/item/karak_virul_manual
name = "karak virul manual"
desc = "A manual designated to teach the user about the skrellian martial art of Karak Virul."
icon = 'icons/obj/library.dmi'
icon_state ="cqcmanual"
/obj/item/karak_virul_manual/attack_self(mob/user as mob)
if(!ishuman(user))
return
var/mob/living/carbon/human/H = user
var/datum/martial_art/karak_virul/F = new/datum/martial_art/karak_virul(null)
F.teach(H)
to_chat(H, "<span class='notice'>You have learned the martial art of Karak Virul.</span>")
qdel(src)
/datum/martial_art/karak_virul/proc/karak_virul_help()
set name = "Recall Teachings"
set desc = "Remember the martial techniques of the Karak Virul."
@@ -104,3 +88,7 @@ datum/martial_art/karak_virul/grab_act(var/mob/living/carbon/human/A, var/mob/li
to_chat(usr, "<span class='notice'>Leg Sweep</span>: Disarm Harm Disarm.. Trips the victim, rendering them prone and unable to move for a short time.")
to_chat(usr, "<span class='notice'>Dislocating Strike</span>: Harm Disarm Disarm Disarm. Delivers a strong punch that can dislocate your target's limb.")
/obj/item/martial_manual/skrell
name = "karak virul manual"
desc = "A manual designated to teach the user about the skrellian martial art of Karak Virul."
martial_art = /datum/martial_art/karak_virul