mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 05:57:24 +01:00
fixes saber spelling (#26766)
This commit is contained in:
@@ -23,11 +23,11 @@
|
||||
to_chat(viewers(user), "<span class='suicide'>[user] is strangling [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||
return OXYLOSS
|
||||
|
||||
/obj/item/melee/sabre
|
||||
name = "captain's sabre"
|
||||
/obj/item/melee/saber
|
||||
name = "captain's saber"
|
||||
desc = "An elegant weapon, for a more civilized age."
|
||||
icon_state = "sabre"
|
||||
item_state = "sabre"
|
||||
icon_state = "saber"
|
||||
item_state = "saber"
|
||||
flags = CONDUCT
|
||||
force = 15
|
||||
throwforce = 10
|
||||
@@ -40,11 +40,11 @@
|
||||
materials = list(MAT_METAL = 1000)
|
||||
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Theft targets should be hard to destroy
|
||||
|
||||
/obj/item/melee/sabre/examine(mob/user)
|
||||
/obj/item/melee/saber/examine(mob/user)
|
||||
. = ..()
|
||||
. += "<span class='notice'>The blade looks very well-suited for piercing armour.</span>"
|
||||
|
||||
/obj/item/melee/sabre/examine_more(mob/user)
|
||||
/obj/item/melee/saber/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."
|
||||
@@ -53,7 +53,7 @@
|
||||
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 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/sabre/Initialize(mapload)
|
||||
/obj/item/melee/saber/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))
|
||||
|
||||
@@ -733,7 +733,7 @@
|
||||
storage_slots = 1
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_BULKY
|
||||
can_hold = list(/obj/item/melee/sabre)
|
||||
can_hold = list(/obj/item/melee/saber)
|
||||
layer_over_suit = TRUE
|
||||
large = TRUE
|
||||
|
||||
@@ -776,15 +776,15 @@
|
||||
var/mob/living/L = loc
|
||||
L.update_inv_belt()
|
||||
|
||||
/obj/item/storage/belt/sheath/sabre
|
||||
name = "sabre sheath"
|
||||
desc = "Can hold sabres."
|
||||
/obj/item/storage/belt/sheath/saber
|
||||
name = "saber sheath"
|
||||
desc = "Can hold sabers."
|
||||
icon_state = "sheath"
|
||||
item_state = "sheath"
|
||||
can_hold = list(/obj/item/melee/sabre)
|
||||
can_hold = list(/obj/item/melee/saber)
|
||||
|
||||
/obj/item/storage/belt/sheath/sabre/populate_contents()
|
||||
new /obj/item/melee/sabre(src)
|
||||
/obj/item/storage/belt/sheath/saber/populate_contents()
|
||||
new /obj/item/melee/saber(src)
|
||||
update_appearance(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/item/storage/belt/sheath/snakesfang
|
||||
|
||||
@@ -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/sabre(src)
|
||||
new /obj/item/storage/belt/sheath/saber(src)
|
||||
new /obj/item/gun/energy/gun(src)
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/door_remote/captain(src)
|
||||
|
||||
Reference in New Issue
Block a user