Skip to content

Commit

Permalink
[MIRROR] You can now carry survival and combat knives in your teeth (#…
Browse files Browse the repository at this point in the history
…2050)

* You can now carry survival and combat knives in your teeth (#81472)

## About The Pull Request

You can now carry combat or survival knife in your mouth, to look like a
pirate or a comando or a moron

![image](https://github.com/tgstation/tgstation/assets/104280915/54ce4243-1e65-489d-99f5-7db8e62f6cee)
It has 20% chance of cutting you when you pull them out, and clumsy
people have 20% chance to accidently swallow the knife and choke when
putting it in a mask slot

## Why It's Good For The Game
Upgrades the coolness of the game


## Changelog
:cl:
add: Your mouth now fits combat or survival knives(it's totally safe)
/:cl:

---------



* You can now carry survival and combat knives in your teeth

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: kawaiinick <[email protected]>
Co-authored-by: Ghom <[email protected]>
  • Loading branch information
4 people authored Feb 19, 2024
1 parent b9bedab commit 5a0fb3c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions code/game/objects/items/knives.dm
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
Binary file not shown.

0 comments on commit 5a0fb3c

Please sign in to comment.