Skip to content

Commit

Permalink
fixes saber spelling (#26766)
Browse files Browse the repository at this point in the history
  • Loading branch information
Coolrune206 committed Sep 19, 2024
1 parent 23b4f28 commit fb199c8
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions code/game/gamemodes/steal_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
protected_jobs = list("Captain")
location_override = "the Captain's Office"

/datum/theft_objective/captains_sabre
name = "the captain's sabre"
typepath = /obj/item/melee/sabre
/datum/theft_objective/captains_saber
name = "the captain's saber"
typepath = /obj/item/melee/saber
protected_jobs = list("Captain")
location_override = "the Captain's Office"

Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/cryopod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@
/obj/item/mod/control,
/obj/item/stamp,
/obj/item/melee/knuckleduster/nanotrasen,
/obj/item/melee/sabre,
/obj/item/storage/belt/sheath/sabre,
/obj/item/melee/saber,
/obj/item/storage/belt/sheath/saber,
/obj/item/nuke_core,
/obj/item/nuke_core_container,
/obj/item/documents,
Expand Down
14 changes: 7 additions & 7 deletions code/game/objects/items/weapons/melee/melee_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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."
Expand All @@ -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))
Expand Down
14 changes: 7 additions & 7 deletions code/game/objects/items/weapons/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions code/modules/antagonists/antag_org/antag_org_syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
Clean kills, clean thefts, clean getaway. Get it done, operative."
focus = 50 // Don't bully sec too hard
targeted_departments = list(DEPARTMENT_COMMAND, DEPARTMENT_SECURITY)
theft_targets = list(
/datum/theft_objective/antique_laser_gun,
/datum/theft_objective/nukedisc,
/datum/theft_objective/hoslaser,
/datum/theft_objective/captains_sabre,
theft_targets = list(
/datum/theft_objective/antique_laser_gun,
/datum/theft_objective/nukedisc,
/datum/theft_objective/hoslaser,
/datum/theft_objective/captains_saber,
/datum/theft_objective/capmedal
)
)

/datum/antag_org/syndicate/interdyne // Mostly target Medical
name = "Interdyne Pharmaceuticals"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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/sabre
- /obj/item/storage/belt/saber
- /obj/item/defibrillator/compact/..
- /obj/item/nullrod/..
- /obj/item/claymore/..
Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/guns/projectile/automatic.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* CONTENTS:
* 1. SABRE SMG
* 1. SABER SMG
* 2. C-20R SMG
* 3. WT-550 PDW
* 4. TYPE U3 UZI
Expand Down Expand Up @@ -89,10 +89,10 @@
alarmed = 1

//////////////////////////////
// MARK: SABRE SMG
// MARK: SABER SMG
//////////////////////////////
/obj/item/gun/projectile/automatic/proto
name = "\improper NF10 'Sabre' SMG"
name = "\improper NF10 'Saber' SMG"
desc = "A rejected prototype three-round burst 9mm submachine gun, designated 'SABR'. Surplus of this model are bouncing around armories of Nanotrasen Space Stations. Has a threaded barrel for suppressors."
icon_state = "saber"
item_state = "saber"
Expand Down
Binary file modified icons/mob/inhands/weapons_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/weapons/melee.dmi
Binary file not shown.

0 comments on commit fb199c8

Please sign in to comment.