Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] You can now carry survival and combat knives in your teeth #2050

Merged
merged 1 commit into from
Feb 19, 2024
Merged

[MIRROR] You can now carry survival and combat knives in your teeth #2050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions code/game/objects/items/knives.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,41 @@
name = "combat knife"
icon = 'icons/obj/weapons/stabby.dmi'
icon_state = "buckknife"
worn_icon_state = "buckknife"
desc = "A military combat utility survival knife."
embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
force = 20
throwforce = 20
attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "cuts")
attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "cut")
bayonet = TRUE
slot_flags = ITEM_SLOT_MASK

/obj/item/knife/combat/Initialize(mapload)
. = ..()
AddComponent(/datum/component/knockoff, 90, list(BODY_ZONE_PRECISE_MOUTH), slot_flags) //90% to knock off when wearing a mask

/obj/item/knife/combat/dropped(mob/living/user, slot)
. = ..()
if(user.get_item_by_slot(ITEM_SLOT_MASK) == src && !user.has_status_effect(/datum/status_effect/choke) && prob(20))
user.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
playsound(user, 'sound/weapons/slice.ogg', 50, TRUE)
user.visible_message(span_danger("[user] accidentally cuts [user.p_them()]self while pulling [src] out of [user.p_them()] teeth! What a doofus!"), span_userdanger("You accidentally cut your mouth with [src]!"))
. = ..()

/obj/item/knife/combat/equipped(mob/living/user, slot, initial = FALSE)
. = ..()
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(20))
if(user.get_item_by_slot(ITEM_SLOT_MASK) == src)
user.apply_status_effect(/datum/status_effect/choke, src)
user.visible_message(span_danger("[user] accidentally swallows [src]!"))
playsound(user, 'sound/items/eatfood.ogg', 100, TRUE)

/obj/item/knife/combat/survival
name = "survival knife"
icon = 'icons/obj/weapons/stabby.dmi'
icon_state = "survivalknife"
worn_icon_state = "survivalknife"
embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
desc = "A hunting grade survival knife."
force = 15
Expand All @@ -153,6 +176,7 @@
desc = "A sharpened bone. The bare minimum in survival."
embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
obj_flags = parent_type::obj_flags & ~CONDUCTS_ELECTRICITY
slot_flags = NONE
force = 15
throwforce = 15
custom_materials = null
Expand Down
Binary file modified icons/mob/clothing/mask.dmi
View file
Open in desktop
Binary file not shown.
Loading