diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 8e93aa4fb4..46e2095d0a 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -143,33 +143,61 @@ /obj/item/melee/rapier name = "plastitanium rapier" - desc = "A impossibly thin blade made of plastitanium with a tip made of diamond. It looks to be able to cut through any armor." + desc = "A thin blade made of plastitanium with a diamond tip. It appears to be coated in a persistent layer of an unknown substance." icon = 'icons/obj/items_and_weapons.dmi' icon_state = "rapier" item_state = "rapier" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - force = 25 - throwforce = 35 - block_chance = 0 - armour_penetration = 100 + force = 15 + throwforce = 25 + block_chance = 50 + armour_penetration = 200 //Apparently this gives it the ability to pierce block flags_1 = CONDUCT_1 obj_flags = UNIQUE_RENAME w_class = WEIGHT_CLASS_BULKY sharpness = IS_SHARP_ACCURATE //It cant be sharpend cook -_- - attack_verb = list("slashed", "cut", "pierces", "pokes") - total_mass = 3.4 + attack_verb = list("stabs", "punctures", "pierces", "pokes") + hitsound = 'sound/weapons/rapierhit.ogg' + total_mass = 0.4 /obj/item/melee/rapier/Initialize() . = ..() AddComponent(/datum/component/butchering, 20, 65, 0) +/obj/item/melee/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(attack_type == PROJECTILE_ATTACK) + final_block_chance = 0 + return ..() + +/obj/item/melee/rapier/on_exit_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/rapier/B = S.parent + if(istype(B)) + playsound(B, 'sound/items/unsheath.ogg', 25, 1) + ..() + +/obj/item/melee/rapier/on_enter_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/rapier/B = S.parent + if(istype(B)) + playsound(B, 'sound/items/sheath.ogg', 25, 1) + ..() + /obj/item/melee/rapier/get_belt_overlay() return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "rapier") /obj/item/melee/rapier/get_worn_belt_overlay(icon_file) return mutable_appearance(icon_file, "-rapier") +/obj/item/melee/rapier/attack(mob/living/target, mob/living/user) + . = ..() + if(iscarbon(target)) + var/mob/living/carbon/H = target + var/loss = H.getStaminaLoss() + H.Dizzy(10) + H.adjustStaminaLoss(30) + if((loss > 40) && prob(loss)) // if above 40, roll for sleep using 1% every 1 stamina damage + H.Sleeping(180) + /obj/item/melee/classic_baton name = "police baton" desc = "A wooden truncheon for beating criminal scum." diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 4e03d029a8..0a29562d6b 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -795,18 +795,12 @@ /obj/item/storage/belt/sabre/rapier name = "rapier sheath" - desc = "A black, thin sheath that looks to house only a long thin blade. Feels like its made of metal." + desc = "A sinister, thin sheath, suitable for a rapier." icon_state = "rsheath" item_state = "rsheath" force = 5 throwforce = 15 - block_chance = 30 w_class = WEIGHT_CLASS_BULKY attack_verb = list("bashed", "slashes", "prods", "pokes") fitting_swords = list(/obj/item/melee/rapier) starting_sword = /obj/item/melee/rapier - -/obj/item/storage/belt/sabre/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - if(attack_type == PROJECTILE_ATTACK) - final_block_chance = 0 //To thin to block bullets - return ..() diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm index 56ebda1af7..819ba51623 100644 --- a/code/modules/uplink/uplink_items/uplink_dangerous.dm +++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm @@ -147,9 +147,9 @@ /datum/uplink_item/dangerous/rapier name = "Rapier" - desc = "A fancy rapier with a diamond tip piercing anything that it comes into contack with. \ - The rapier comes with its own sheath, this is rather noticeable as only the captain is known to carry a sheath. \ - The sheath itself can be used to block melee attacks only. Its also jet black colours." + desc = "An elegant plastitanium rapier with a diamond tip and coated in a specialized knockout poison. \ + The rapier comes with its own sheath, and is capable of puncturing through almost any defense. \ + However, due to the size of the blade and obvious nature of the sheath, the weapon stands out as being obviously nefarious." item = /obj/item/storage/belt/sabre/rapier cost = 8 exclude_modes = list(/datum/game_mode/nuclear/clown_ops) diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 070034d778..fd3016ac89 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index 2169b87580..1e48d57ac7 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index f054d8f744..5a5ee6f3db 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi index da8ff0a20b..7e09d425fb 100644 Binary files a/icons/obj/clothing/belt_overlays.dmi and b/icons/obj/clothing/belt_overlays.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 1ff87b26e4..c106bd12fc 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index c1d41591a2..acf6bb4021 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ