diff --git a/code/modules/Martial Arts/adminfu.dm b/code/modules/Martial Arts/adminfu.dm index 585c4d7aef9..20c2dd8d5cd 100644 --- a/code/modules/Martial Arts/adminfu.dm +++ b/code/modules/Martial Arts/adminfu.dm @@ -95,3 +95,23 @@ to_chat(usr, "Harm: Death.") to_chat(usr, "Healing Palm::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, "You have learned the ancient martial art of the Admins.") + used = 1 + desc = "It's completely blank." + name = "empty scroll" + icon_state = "blankscroll" diff --git a/paradise.dme b/paradise.dme index 9eb3ec350a1..88ab3cfe35f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -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" diff --git a/sound/effects/hit_kick.ogg b/sound/effects/hit_kick.ogg new file mode 100644 index 00000000000..850642de699 Binary files /dev/null and b/sound/effects/hit_kick.ogg differ diff --git a/sound/effects/hit_punch.ogg b/sound/effects/hit_punch.ogg new file mode 100644 index 00000000000..e4b38e9627a Binary files /dev/null and b/sound/effects/hit_punch.ogg differ