This repository was archived by the owner on May 22, 2025. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 457
ports knife boxing gloves and knife boxing martial arts from hippie (port) #8528
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
7e3f1d0
Create knifeboxing.dm
boodaliboo 0e85772
Create knifeboxing.dm
boodaliboo f0c7d36
Update recipes.dm
boodaliboo c5dc152
Add files via upload
boodaliboo 4fa39a3
Add files via upload
boodaliboo 3faf9cd
Update yogstation.dme
boodaliboo 7c4d750
Update knifeboxing.dm
boodaliboo 0eddda1
logging
SomeguyManperson 779697e
Update recipes.dm
boodaliboo 8afa9be
Update granters.dm
boodaliboo 9184f82
Merge branch 'master' into patch-52
Hopekz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.