diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 1122ec65ef1..8ee4486f04b 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -47,9 +47,9 @@ protected_jobs = list("Captain") location_override = "the Captain's Office" -/datum/theft_objective/captains_rapier - name = "the captain's rapier" - typepath = /obj/item/melee/rapier +/datum/theft_objective/captains_sabre + name = "the captain's sabre" + typepath = /obj/item/melee/sabre protected_jobs = list("Captain") location_override = "the Captain's Office" diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index c06f30f57e7..c27bfeeb7e3 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -233,8 +233,8 @@ /obj/item/mod/control, /obj/item/stamp, /obj/item/melee/knuckleduster/nanotrasen, - /obj/item/melee/rapier, - /obj/item/storage/belt/sheath/rapier, + /obj/item/melee/sabre, + /obj/item/storage/belt/sheath/sabre, /obj/item/nuke_core, /obj/item/nuke_core_container, /obj/item/documents, diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm index d29fc07c46e..ede849a3d35 100644 --- a/code/game/objects/items/weapons/melee/melee_misc.dm +++ b/code/game/objects/items/weapons/melee/melee_misc.dm @@ -23,11 +23,11 @@ to_chat(viewers(user), "[user] is strangling [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS -/obj/item/melee/rapier - name = "captain's rapier" +/obj/item/melee/sabre + name = "captain's sabre" desc = "An elegant weapon, for a more civilized age." - icon_state = "rapier" - item_state = "rapier" + icon_state = "sabre" + item_state = "sabre" flags = CONDUCT force = 15 throwforce = 10 @@ -40,20 +40,20 @@ materials = list(MAT_METAL = 1000) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Theft targets should be hard to destroy -/obj/item/melee/rapier/examine(mob/user) +/obj/item/melee/sabre/examine(mob/user) . = ..() . += "The blade looks very well-suited for piercing armour." -/obj/item/melee/rapier/examine_more(mob/user) +/obj/item/melee/sabre/examine_more(mob/user) . = ..() . += "Swords are a traditional ceremonial weapon carried by commanding officers of many armies and navies, even long after firearms and laserarms rendered them obsolete. \ Despite having no roots in such traditions, Nanotrasen participates in them, as these trappings of old tradition help to promote the air of authority the company wishes for its captains to possess." . += "" - . += "Whilst not intended to actually be used in combat, these ceremonial rapiers are in-fact quite functional, \ + . += "Whilst not intended to actually be used in combat, the ceremonial blades issued by Nanotrasen are in-fact quite functional, \ able to both inflict grievous wounds on aggressors that get too close, whilst also elegantly parrying their blows (assuming the wielder is skilled with the blade). \ - The thin, sharp point is also quite effective at at defeating even modern body armour, which tends to be designed to deal with ballistic and laser weapons rather than swords..." + The sharp edge is adept at hacking unarmored targets, whilst the rigid tip is also quite effective at at defeating even modern body armor with thrusting attacks, as modern armor is generally designed to defeat ballistic and laser weapons rather than swords..." -/obj/item/melee/rapier/Initialize(mapload) +/obj/item/melee/sabre/Initialize(mapload) . = ..() AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS) RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(alert_admins_on_destroy)) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 4476daa3b96..442420ccc5b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -733,7 +733,7 @@ storage_slots = 1 w_class = WEIGHT_CLASS_BULKY max_w_class = WEIGHT_CLASS_BULKY - can_hold = list(/obj/item/melee/rapier) + can_hold = list(/obj/item/melee/sabre) layer_over_suit = TRUE large = TRUE @@ -776,15 +776,15 @@ var/mob/living/L = loc L.update_inv_belt() -/obj/item/storage/belt/sheath/rapier - name = "rapier sheath" - desc = "Can hold rapiers." +/obj/item/storage/belt/sheath/sabre + name = "sabre sheath" + desc = "Can hold sabres." icon_state = "sheath" item_state = "sheath" - can_hold = list(/obj/item/melee/rapier) + can_hold = list(/obj/item/melee/sabre) -/obj/item/storage/belt/sheath/rapier/populate_contents() - new /obj/item/melee/rapier(src) +/obj/item/storage/belt/sheath/sabre/populate_contents() + new /obj/item/melee/sabre(src) update_appearance(UPDATE_ICON_STATE) /obj/item/storage/belt/sheath/snakesfang diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm index 93d37f5f1fa..9af73b9bf61 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm @@ -14,7 +14,7 @@ new /obj/item/storage/bag/garment/captain(src) new /obj/item/cartridge/captain(src) new /obj/item/radio/headset/heads/captain/alt(src) - new /obj/item/storage/belt/sheath/rapier(src) + new /obj/item/storage/belt/sheath/sabre(src) new /obj/item/gun/energy/gun(src) new /obj/item/flash(src) new /obj/item/door_remote/captain(src) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 88c474d5999..3157ccd5d48 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -884,7 +884,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) - /obj/item/judobelt - /obj/item/storage/belt/chef - /obj/item/storage/belt/mining/.. - - /obj/item/storage/belt/rapier + - /obj/item/storage/belt/sabre - /obj/item/defibrillator/compact/.. - /obj/item/nullrod/.. - /obj/item/claymore/.. diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 932943e3d7d..909a2f22a29 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/inhands/weapons_lefthand.dmi b/icons/mob/inhands/weapons_lefthand.dmi index b6e21f17d70..d92dcdaf128 100644 Binary files a/icons/mob/inhands/weapons_lefthand.dmi and b/icons/mob/inhands/weapons_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons_righthand.dmi b/icons/mob/inhands/weapons_righthand.dmi index 13659103d76..5053d87f160 100644 Binary files a/icons/mob/inhands/weapons_righthand.dmi and b/icons/mob/inhands/weapons_righthand.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index d2160a235f6..06098b65003 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/weapons/melee.dmi b/icons/obj/weapons/melee.dmi index 349d098da84..0cbd48b00b4 100644 Binary files a/icons/obj/weapons/melee.dmi and b/icons/obj/weapons/melee.dmi differ