Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions code/datums/components/crafting/recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@
category = CAT_WEAPONRY
always_availible = FALSE

/datum/crafting_recipe/knifeboxing
name = "Knife-boxing Gloves"
result = /obj/item/clothing/gloves/knifeboxing
reqs = list(/obj/item/clothing/gloves/boxing = 1,
/obj/item/kitchen/knife = 2)
time = 100
category = CAT_WEAPONRY
always_availible = FALSE

//Normal recipes
/datum/crafting_recipe/pin_removal
name = "Pin Removal"
Expand Down
56 changes: 56 additions & 0 deletions code/datums/martial/knifeboxing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/datum/martial_art/knifeboxing
name = "Knife-boxing"

/datum/martial_art/knifeboxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
to_chat(A, "<span class='warning'>Can't disarm while knife-boxing!</span>")
return TRUE

/datum/martial_art/knifeboxing/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
to_chat(A, "<span class='warning'>Can't grab while knife-boxing!</span>")
return TRUE

/datum/martial_art/knifeboxing/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)

A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)

var/atk_verb = pick("left hook","right hook","straight punch")

var/damage = rand(8, 12) + A.dna.species.punchdamagelow
if(!damage)
playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1)
D.visible_message("<span class='warning'>[A] has attempted to [atk_verb] [D]!</span>", \
"<span class='userdanger'>[A] has attempted to [atk_verb] [D]!</span>", null, COMBAT_MESSAGE_RANGE)
log_combat(A, D, "attempted to punch (knifeboxing)")
return FALSE

var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")

playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1)

D.visible_message("<span class='danger'>[A] has [atk_verb]ed [D]!</span>", \
"<span class='userdanger'>[A] has [atk_verb]ed [D]!</span>", null, COMBAT_MESSAGE_RANGE)

D.apply_damage(damage, BRUTE, affecting, armor_block)
log_combat(A, D, "punched (knifeboxing")
return TRUE

/obj/item/clothing/gloves/knifeboxing
var/datum/martial_art/knifeboxing/style = new

/obj/item/clothing/gloves/knifeboxing/equipped(mob/user, slot)
if(!ishuman(user))
return
if(slot == SLOT_GLOVES)
var/mob/living/carbon/human/H = user
style.teach(H,1)
return

/obj/item/clothing/gloves/knifeboxing/dropped(mob/user)
if(!ishuman(user))
return
var/mob/living/carbon/human/H = user
if(H)
if(H.get_item_by_slot(SLOT_GLOVES) == src)
style.remove(H)
return
2 changes: 1 addition & 1 deletion code/game/objects/items/granters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,6 @@
/obj/item/book/granter/crafting_recipe/weapons
name = "makeshift weapons 101"
desc = "A book filled with directions on how to make various weaponry."
crafting_recipe_types = list(/datum/crafting_recipe/baseball_bat, /datum/crafting_recipe/lance, /datum/crafting_recipe/makeshiftlasrifle)
crafting_recipe_types = list(/datum/crafting_recipe/baseball_bat, /datum/crafting_recipe/lance, /datum/crafting_recipe/knifeboxing, /datum/crafting_recipe/makeshiftlasrifle)
icon_state = "bookCrafting"
oneuse = TRUE
7 changes: 7 additions & 0 deletions code/modules/clothing/gloves/knifeboxing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/item/clothing/gloves/knifeboxing
name = "knife gloves"
desc = "I'm here to punch people in the face with knives."
icon = 'icons/obj/clothing/gloves.dmi'
alternate_worn_icon = 'icons/mob/hands.dmi'
icon_state = "knife_boxing"
item_state = "knife_boxing"
Binary file modified icons/mob/hands.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions yogstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@
#include "code\datums\looping_sounds\weather.dm"
#include "code\datums\martial\boxing.dm"
#include "code\datums\martial\cqc.dm"
#include "code\datums\martial\knifeboxing.dm"
#include "code\datums\martial\krav_maga.dm"
#include "code\datums\martial\mushpunch.dm"
#include "code\datums\martial\plasma_fist.dm"
Expand Down Expand Up @@ -1646,6 +1647,7 @@
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\wiz_robe.dm"
#include "code\modules\clothing\under\_under.dm"
#include "code\modules\clothing\gloves\knifeboxing.dm"
#include "code\modules\clothing\under\accessories.dm"
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\miscellaneous.dm"
Expand Down