explanation text

ss220-space · Oct 30, 2023 · ebce111 · ebce111
1 parent b89bccc
commit ebce111
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
@@ -177,7 +177,7 @@
 
 /obj/item/kitchen/knife/combat/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = INFINITY, dodgeable = TRUE)
 	. = ..()
-	playsound(src, 'sound/weapons/knife_holster/knife_throw.ogg', 50, 1)
+	playsound(src, 'sound/weapons/knife_holster/knife_throw.ogg', 30, 1)
 
 /obj/item/kitchen/knife/combat/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	var/datum/martial_art/throwing/MA = throwingdatum?.thrower?.mind?.martial_art

diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
@@ -157,8 +157,8 @@
 	item_color = "holsterknife"
 	holster_allow = /obj/item/kitchen/knife/combat
 	max_content = 7
-	sound_holster = 'sound/weapons/gun_interactions/knife_holster.ogg'
-	sound_unholster = 'sound/weapons/gun_interactions/knife_unholster.ogg'
+	sound_holster = 'sound/weapons/knife_holster/knife_holster.ogg'
+	sound_unholster = 'sound/weapons/knife_holster/knife_unholster.ogg'
 
 /obj/item/clothing/accessory/holster/knives/can_holster(obj/item/I)
 	if(!istype(I, holster_allow))

diff --git a/code/modules/martial_arts/combos/throwing/remove_embended.dm b/code/modules/martial_arts/combos/throwing/remove_embended.dm
@@ -1,7 +1,7 @@
 /datum/martial_combo/throwing/remove_embended
-	name = "Remove embended"
+	name = "Вытащить нож"
 	steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_GRAB)
-	explaination_text = "Вытаскивает из противника воткнувшийся предмет"
+	explaination_text = "Вытаскивает из противника воткнувшийся предмет. Крайне мучительно для него."
 
 /datum/martial_combo/throwing/remove_embended/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	var/mob/living/carbon/human/H = target

diff --git a/code/modules/martial_arts/throwing_knives.dm b/code/modules/martial_arts/throwing_knives.dm
@@ -2,6 +2,7 @@
 	name = "Knife techniques"
 	combos = list(/datum/martial_combo/throwing/remove_embended)
 	block_chance = 50	//if holding knife in hand
+	has_explaination_verb = TRUE
 	var/knife_embed_chance = 100
 	var/knife_bonus_damage = 5
 
@@ -40,3 +41,11 @@
 			var/sound = pick('sound/weapons/knife_holster/throat_slice.ogg','sound/weapons/knife_holster/throat_slice2.ogg')
 			playsound(defender.loc, sound, 25, 1)
 			attacker.visible_message(span_danger("[attacker] перерезает глотку [defender]! Ахуй."), span_danger("Вы перерезаете глотку [defender]! Ахуй."))
+
+/datum/martial_art/throwing/explaination_footer(user)
+	to_chat(user, "[span_notice("Работает с ножами")]: Боевой, шахтёрский, костяной, метательный")
+	to_chat(user, "[span_notice("Урон")]: +5 урона от бросков и ударов ножей")
+	to_chat(user, "[span_notice("Застревание")]: ножи застревают в жертве со 100% вероятностью")
+	to_chat(user, "[span_notice("Блок")]: 50% блока мили атак, пока в руках есть нож")
+	to_chat(user, "[span_notice("Поймать нож")]: Вы ловите все кинутые в вас ножи")
+	to_chat(user, "[span_notice("Перерезать глотку")]: Атака ножом в харме цели, которая находится в красном грабе уменьшит уровень крови жертвы на 70%")