From 5a9b16405f31fcacf09066e25ce289215c42274c Mon Sep 17 00:00:00 2001 From: Kirus59 <145689588+Kirus59@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:36:51 +0300 Subject: [PATCH] Engraved knukleduster hot fix (#1577) --- Resources/Locale/ru-RU/ss220/misc/case.ftl | 6 +++--- .../{brass_knuckles.ftl => knuckleduster.ftl} | 2 +- .../Catalog/Fills/Lockers/heads.yml | 2 +- .../Prototypes/Objectives/objectiveGroups.yml | 2 +- .../SS220/Entities/Objects/Misc/case.yml | 18 +++++++++--------- .../{brass_knuckles.yml => knuckleduster.yml} | 14 +++++++------- .../SS220/Objectives/stealTargetGroups.yml | 6 +++--- .../Prototypes/SS220/Objectives/traitor.yml | 4 ++-- Resources/Prototypes/SS220/tags.yml | 2 +- .../base.png | Bin .../closed.png | Bin .../icon.png | Bin .../knuckleduster.png} | Bin .../locked.png | Bin .../meta.json | 2 +- .../open.png | Bin .../unlocked.png | Bin .../equipped-HAND.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 22 files changed, 29 insertions(+), 29 deletions(-) rename Resources/Locale/ru-RU/ss220/weapons/{brass_knuckles.ftl => knuckleduster.ftl} (84%) rename Resources/Prototypes/SS220/Entities/Weapons/Melee/{brass_knuckles.yml => knuckleduster.yml} (66%) rename Resources/Textures/SS220/Misc/{etched_brass_knuckles_case.rsi => engraved_knuckleduster_case.rsi}/base.png (100%) rename Resources/Textures/SS220/Misc/{etched_brass_knuckles_case.rsi => engraved_knuckleduster_case.rsi}/closed.png (100%) rename Resources/Textures/SS220/Misc/{etched_brass_knuckles_case.rsi => engraved_knuckleduster_case.rsi}/icon.png (100%) rename Resources/Textures/SS220/Misc/{etched_brass_knuckles_case.rsi/brassknukles.png => engraved_knuckleduster_case.rsi/knuckleduster.png} (100%) rename Resources/Textures/SS220/Misc/{etched_brass_knuckles_case.rsi => engraved_knuckleduster_case.rsi}/locked.png (100%) rename Resources/Textures/SS220/Misc/{etched_brass_knuckles_case.rsi => engraved_knuckleduster_case.rsi}/meta.json (94%) rename Resources/Textures/SS220/Misc/{etched_brass_knuckles_case.rsi => engraved_knuckleduster_case.rsi}/open.png (100%) rename Resources/Textures/SS220/Misc/{etched_brass_knuckles_case.rsi => engraved_knuckleduster_case.rsi}/unlocked.png (100%) rename Resources/Textures/SS220/Objects/Weapons/Melee/{etched_brass_knuckles.rsi => engraved_knuckleduster.rsi}/equipped-HAND.png (100%) rename Resources/Textures/SS220/Objects/Weapons/Melee/{etched_brass_knuckles.rsi => engraved_knuckleduster.rsi}/icon.png (100%) rename Resources/Textures/SS220/Objects/Weapons/Melee/{etched_brass_knuckles.rsi => engraved_knuckleduster.rsi}/inhand-left.png (100%) rename Resources/Textures/SS220/Objects/Weapons/Melee/{etched_brass_knuckles.rsi => engraved_knuckleduster.rsi}/inhand-right.png (100%) rename Resources/Textures/SS220/Objects/Weapons/Melee/{etched_brass_knuckles.rsi => engraved_knuckleduster.rsi}/meta.json (100%) diff --git a/Resources/Locale/ru-RU/ss220/misc/case.ftl b/Resources/Locale/ru-RU/ss220/misc/case.ftl index cd813ef31fd6..3fdd6dce4730 100644 --- a/Resources/Locale/ru-RU/ss220/misc/case.ftl +++ b/Resources/Locale/ru-RU/ss220/misc/case.ftl @@ -1,7 +1,7 @@ -ent-GlassCaseEtchedBrassKnuckles = стеклянный кейс +ent-GlassCaseEngravedKnuckleduster = стеклянный кейс .desc = Изготовлен на заказ для хранения ценных предметов. Крышка выполнена из закалённого стекла, а основание из дерева, выращенного на тропических планетах. Коробка украшена бархатной подушкой, чтобы предотвратить возможные царапины. .suffix = Гравированный кастет -ent-GlassCaseEtchedBrassKnucklesFilled = стеклянный кейс - .desc = { ent-GlassCase.desc } +ent-GlassCaseEngravedKnuckledusterFilled = стеклянный кейс + .desc = { ent-GlassCaseEngravedKnuckleduster.desc } .suffix = Гравированный кастет, Заполненый diff --git a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl b/Resources/Locale/ru-RU/ss220/weapons/knuckleduster.ftl similarity index 84% rename from Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl rename to Resources/Locale/ru-RU/ss220/weapons/knuckleduster.ftl index 5faf431076ac..a8888b0e5c5f 100644 --- a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl +++ b/Resources/Locale/ru-RU/ss220/weapons/knuckleduster.ftl @@ -1,2 +1,2 @@ -ent-EtchedBrassKnuckles = гравированный кастет +ent-EngravedKnuckleduster = гравированный кастет .desc = Гравированный кастет квартирмейстера, изготовленный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями краж личных вещей и материалов из отдела снабжения. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 1287fbfd593e..40cc309e6db1 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -22,7 +22,7 @@ - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo - id: ClothingWristWatchGold # SS220 Wrist Watch - - id: GlassCaseEtchedBrassKnucklesFilled # SS220 New Qm highrisk + - id: GlassCaseEngravedKnuckledusterFilled # SS220 New Qm highrisk - type: entity id: LockerCaptainFilledHardsuit diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 086979ecb5e0..f173131fd759 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -18,7 +18,7 @@ MagbootsStealObjective: 1 CorgiMeatStealObjective: 1 ClipboardStealObjective: 1 - EtchedBrassKnucklesStealObjective: 1 #SS220 New Qm highrisk + EngravedKnuckledusterStealObjective: 1 #SS220 New Qm highrisk CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml index 91a4886fbd60..c6b948147efc 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml @@ -2,9 +2,9 @@ - type: entity parent: [BaseItem, BaseItemCabinet] - id: GlassCaseEtchedBrassKnuckles + id: GlassCaseEngravedKnuckleduster name: glass case - suffix: Etched brass knuckles + suffix: Engraved knuckleduster description: Made to order for storing valuables. The lid is made of tempered glass, and the base is made of wood grown on tropical planets and decorated with a velvet pad to prevent possible scratches. components: - type: Item @@ -12,11 +12,11 @@ - type: Lock - type: LockVisuals - type: Sprite - sprite: SS220/Misc/etched_brass_knuckles_case.rsi + sprite: SS220/Misc/engraved_knuckleduster_case.rsi layers: - state: base map: ["enum.StorageVisualLayers.Base"] - - state: brassknukles + - state: knuckleduster map: ["enum.ItemCabinetVisuals.Layer"] visible: true - state: closed @@ -31,7 +31,7 @@ ejectOnInteract: true whitelist: tags: - - EtchedBrassKnuckles + - EngravedKnuckleduster ejectSound: /Audio/Machines/machine_switch.ogg - type: GenericVisualizer visuals: @@ -74,14 +74,14 @@ price: 200 - type: entity - parent: GlassCaseEtchedBrassKnuckles - id: GlassCaseEtchedBrassKnucklesFilled + parent: GlassCaseEngravedKnuckleduster + id: GlassCaseEngravedKnuckledusterFilled name: glass case - suffix: Etched brass knuckles, Filled + suffix: Engraved knuckleduster, Filled components: - type: AccessReader access: [["Quartermaster"]] - type: ContainerFill containers: ItemCabinet: - - EtchedBrassKnuckles + - EngravedKnuckleduster diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml b/Resources/Prototypes/SS220/Entities/Weapons/Melee/knuckleduster.yml similarity index 66% rename from Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml rename to Resources/Prototypes/SS220/Entities/Weapons/Melee/knuckleduster.yml index f56e2e24f6d8..982e80e955ab 100644 --- a/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml +++ b/Resources/Prototypes/SS220/Entities/Weapons/Melee/knuckleduster.yml @@ -2,16 +2,16 @@ #Quartermaster - type: entity - name: brass knuckles + name: engraved knuckleduster parent: BaseItem - id: EtchedBrassKnuckles - description: кастет + id: EngravedKnuckleduster + description: The quartermaster's engraved knuckleduster, made by special order. It was issued as a means of combating the increased cases of theft of personal belongings and materials from the supply department. components: - type: Sprite - sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi + sprite: SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi state: icon - type: Clothing - sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi + sprite: SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi slots: [gloves] - type: Item size: Small @@ -36,8 +36,8 @@ damageSound: /Audio/SS220/Weapons/brassKnukles/critical-hit.ogg - type: Tag tags: - - EtchedBrassKnuckles + - EngravedKnuckleduster - type: StaticPrice price: 1000 - type: StealTarget - stealGroup: EtchedBrassKnuckles + stealGroup: EngravedKnuckleduster diff --git a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml index 49d5b7616d13..2c6887b4f211 100644 --- a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml @@ -6,8 +6,8 @@ state: icon - type: stealTargetGroup - id: EtchedBrassKnuckles - name: engraved brass knuckles + id: EngravedKnuckleduster + name: engraved knuckleduster sprite: - sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi + sprite: SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi state: icon diff --git a/Resources/Prototypes/SS220/Objectives/traitor.yml b/Resources/Prototypes/SS220/Objectives/traitor.yml index 330f44d2241e..62fbb5c639d5 100644 --- a/Resources/Prototypes/SS220/Objectives/traitor.yml +++ b/Resources/Prototypes/SS220/Objectives/traitor.yml @@ -2,10 +2,10 @@ - type: entity parent: BaseTraitorStealObjective - id: EtchedBrassKnucklesStealObjective + id: EngravedKnuckledusterStealObjective components: - type: NotJobRequirement job: Quartermaster - type: StealCondition - stealGroup: EtchedBrassKnuckles + stealGroup: EngravedKnuckleduster owner: job-name-qm diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml index e4bb91bcc6ef..81a0cac86b1f 100644 --- a/Resources/Prototypes/SS220/tags.yml +++ b/Resources/Prototypes/SS220/tags.yml @@ -90,4 +90,4 @@ # New Qm highrisk - type: Tag - id: EtchedBrassKnuckles + id: EngravedKnuckleduster diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/base.png similarity index 100% rename from Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png rename to Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/base.png diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/closed.png b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/closed.png similarity index 100% rename from Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/closed.png rename to Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/closed.png diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/icon.png similarity index 100% rename from Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png rename to Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/icon.png diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/knuckleduster.png similarity index 100% rename from Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png rename to Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/knuckleduster.png diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/locked.png similarity index 100% rename from Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png rename to Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/locked.png diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/meta.json similarity index 94% rename from Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json rename to Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/meta.json index 951196bbfb71..db695e50f3ad 100644 --- a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json +++ b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/meta.json @@ -26,7 +26,7 @@ "name": "unlocked" }, { - "name": "brassknukles" + "name": "knuckleduster" } ] } diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/open.png similarity index 100% rename from Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png rename to Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/open.png diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png b/Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/unlocked.png similarity index 100% rename from Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png rename to Resources/Textures/SS220/Misc/engraved_knuckleduster_case.rsi/unlocked.png diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/equipped-HAND.png b/Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/equipped-HAND.png rename to Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/equipped-HAND.png diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/icon.png similarity index 100% rename from Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png rename to Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/icon.png diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png rename to Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/inhand-left.png diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png rename to Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/inhand-right.png diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/meta.json similarity index 100% rename from Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json rename to Resources/Textures/SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi/meta.json