kick punch

This commit is contained in:
Aurorablade
2016-04-19 16:01:03 -04:00
parent 2d85f582e1
commit d4d7535a1f
4 changed files with 20 additions and 1 deletions
+20
View File
@@ -95,3 +95,23 @@
to_chat(usr, "<span class='notice'>Harm</span>: Death.")
to_chat(usr, "<span class='notice'>Healing Palm:</span>:Combo:Grab,Help intent. Heals or revives a crature.")
/obj/item/weapon/adminfu_scroll
name = "frayed scroll"
desc = "An aged and frayed scrap of paper written in shifting runes. There are hand-drawn illustrations of pugilism."
icon = 'icons/obj/wizard.dmi'
icon_state ="scroll2"
var/used = 0
/obj/item/weapon/plasma_fist_scroll/attack_self(mob/user as mob)
if(!ishuman(user))
return
if(!used)
var/mob/living/carbon/human/H = user
var/datum/martial_art/adminfu/F = new/datum/martial_art/adminfu(null)
F.teach(H)
to_chat(H, "<span class='boldannounce'>You have learned the ancient martial art of the Admins.</span>")
used = 1
desc = "It's completely blank."
name = "empty scroll"
icon_state = "blankscroll"
-1
View File
@@ -1339,7 +1339,6 @@
#include "code\modules\Martial Arts\adminfu.dm"
#include "code\modules\Martial Arts\brawling.dm"
#include "code\modules\Martial Arts\krav_maga.dm"
#include "code\modules\Martial Arts\mimejutsu.dm"
#include "code\modules\Martial Arts\plasma_fist.dm"
#include "code\modules\Martial Arts\sleeping_carp.dm"
#include "code\modules\Martial Arts\wrestleing.dm"
Binary file not shown.
Binary file not shown.