From 77df1b8f59909bf99f0fd421f5f735c8447d7e91 Mon Sep 17 00:00:00 2001 From: Kirus59 <145689588+Kirus59@users.noreply.github.com> Date: Mon, 12 Aug 2024 07:39:06 +0300 Subject: [PATCH] Add new highrisk to quartermaster (#1415) * Add new highrisk to quartermaster * Add Steal objective * moved to SS220 * Fix meta * Add glass case * Some prototype and sprite changes * Sprite update and add to Qm locker * Some fixes * Some fixes 2 * Fix description --- .../WeaponRandom/WeaponRandomComponent.cs | 2 +- .../Weapons/brassKnukles/attributions.yml | 4 + .../Weapons/brassKnukles/critical-hit.ogg | Bin 0 -> 14134 bytes Resources/Locale/ru-RU/ss220/misc/case.ftl | 7 ++ .../ru-RU/ss220/weapons/brass_knuckles.ftl | 2 + .../Catalog/Fills/Lockers/heads.yml | 1 + .../Prototypes/Objectives/objectiveGroups.yml | 1 + .../SS220/Entities/Objects/Misc/case.yml | 87 ++++++++++++++++++ .../Entities/Weapons/Melee/brass_knuckles.yml | 43 +++++++++ .../SS220/Objectives/stealTargetGroups.yml | 9 +- .../Prototypes/SS220/Objectives/traitor.yml | 11 +++ Resources/Prototypes/SS220/tags.yml | 6 +- .../etched_brass_knuckles_case.rsi/base.png | Bin 0 -> 320 bytes .../brassknukles.png | Bin 0 -> 189 bytes .../etched_brass_knuckles_case.rsi/closed.png | Bin 0 -> 298 bytes .../etched_brass_knuckles_case.rsi/icon.png | Bin 0 -> 387 bytes .../etched_brass_knuckles_case.rsi/locked.png | Bin 0 -> 167 bytes .../etched_brass_knuckles_case.rsi/meta.json | 32 +++++++ .../etched_brass_knuckles_case.rsi/open.png | Bin 0 -> 293 bytes .../unlocked.png | Bin 0 -> 165 bytes .../equipped-HAND.png | Bin 0 -> 287 bytes .../Melee/etched_brass_knuckles.rsi/icon.png | Bin 0 -> 369 bytes .../etched_brass_knuckles.rsi/inhand-left.png | Bin 0 -> 271 bytes .../inhand-right.png | Bin 0 -> 287 bytes .../Melee/etched_brass_knuckles.rsi/meta.json | 26 ++++++ 25 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 Resources/Audio/SS220/Weapons/brassKnukles/attributions.yml create mode 100644 Resources/Audio/SS220/Weapons/brassKnukles/critical-hit.ogg create mode 100644 Resources/Locale/ru-RU/ss220/misc/case.ftl create mode 100644 Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml create mode 100644 Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml create mode 100644 Resources/Prototypes/SS220/Objectives/traitor.yml create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/closed.png create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/equipped-HAND.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json diff --git a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs index ef15498a700563..4ee5212ae7176e 100644 --- a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs +++ b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs @@ -16,7 +16,7 @@ internal sealed partial class WeaponRandomComponent : Component /// /// Chance for the damage bonus to occur (1 = 100%). /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField("randomDamageChance"), ViewVariables(VVAccess.ReadWrite)] // SS220 add DataField public float RandomDamageChance = 0.00001f; /// diff --git a/Resources/Audio/SS220/Weapons/brassKnukles/attributions.yml b/Resources/Audio/SS220/Weapons/brassKnukles/attributions.yml new file mode 100644 index 00000000000000..e25fb0f8cb710b --- /dev/null +++ b/Resources/Audio/SS220/Weapons/brassKnukles/attributions.yml @@ -0,0 +1,4 @@ +- files: ["critical-hit.ogg"] + license: "CC-BY-4.0" + copyright: "Modified by kirus59 (Github), converted to OGG." + source: "https://wiki.teamfortress.com/wiki/Category:Sound_cues" diff --git a/Resources/Audio/SS220/Weapons/brassKnukles/critical-hit.ogg b/Resources/Audio/SS220/Weapons/brassKnukles/critical-hit.ogg new file mode 100644 index 0000000000000000000000000000000000000000..49a8585cef4a386377a6fccccc5145ad53b74d45 GIT binary patch literal 14134 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 I2>e(0Ki7r>xBvhE literal 0 HcmV?d00001 diff --git a/Resources/Locale/ru-RU/ss220/misc/case.ftl b/Resources/Locale/ru-RU/ss220/misc/case.ftl new file mode 100644 index 00000000000000..cd813ef31fd68a --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/misc/case.ftl @@ -0,0 +1,7 @@ +ent-GlassCaseEtchedBrassKnuckles = стеклянный кейс + .desc = Изготовлен на заказ для хранения ценных предметов. Крышка выполнена из закалённого стекла, а основание из дерева, выращенного на тропических планетах. Коробка украшена бархатной подушкой, чтобы предотвратить возможные царапины. + .suffix = Гравированный кастет + +ent-GlassCaseEtchedBrassKnucklesFilled = стеклянный кейс + .desc = { ent-GlassCase.desc } + .suffix = Гравированный кастет, Заполненый diff --git a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl new file mode 100644 index 00000000000000..5faf431076acc9 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl @@ -0,0 +1,2 @@ +ent-EtchedBrassKnuckles = гравированный кастет + .desc = Гравированный кастет квартирмейстера, изготовленный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями краж личных вещей и материалов из отдела снабжения. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index aff9f0694657b5..1287fbfd593e50 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -22,6 +22,7 @@ - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo - id: ClothingWristWatchGold # SS220 Wrist Watch + - id: GlassCaseEtchedBrassKnucklesFilled # SS220 New Qm highrisk - type: entity id: LockerCaptainFilledHardsuit diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 66f4e66ee9327a..086979ecb5e0a6 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -18,6 +18,7 @@ MagbootsStealObjective: 1 CorgiMeatStealObjective: 1 ClipboardStealObjective: 1 + EtchedBrassKnucklesStealObjective: 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 new file mode 100644 index 00000000000000..91a4886fbd60c4 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml @@ -0,0 +1,87 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +- type: entity + parent: [BaseItem, BaseItemCabinet] + id: GlassCaseEtchedBrassKnuckles + name: glass case + suffix: Etched brass knuckles + 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 + size: Large + - type: Lock + - type: LockVisuals + - type: Sprite + sprite: SS220/Misc/etched_brass_knuckles_case.rsi + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + - state: brassknukles + map: ["enum.ItemCabinetVisuals.Layer"] + visible: true + - state: closed + map: ["enum.OpenableVisuals.Layer"] + - state: locked + shader: unshaded + map: ["enum.LockVisualLayers.Lock"] + - type: Appearance + - type: ItemSlots + slots: + ItemCabinet: + ejectOnInteract: true + whitelist: + tags: + - EtchedBrassKnuckles + ejectSound: /Audio/Machines/machine_switch.ogg + - type: GenericVisualizer + visuals: + enum.ItemCabinetVisuals.ContainsItem: + enum.ItemCabinetVisuals.Layer: + True: { visible: true } + False: { visible: false } + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: { state: open } + False: { state: closed } + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: MeleeSound + soundGroups: + Brute: + collection: GlassSmash + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:PlaySoundBehavior + sound: + collection: WindowShatter + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassReinforced: + min: 1 + max: 2 + MaterialWoodPlank1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: StaticPrice + price: 200 + +- type: entity + parent: GlassCaseEtchedBrassKnuckles + id: GlassCaseEtchedBrassKnucklesFilled + name: glass case + suffix: Etched brass knuckles, Filled + components: + - type: AccessReader + access: [["Quartermaster"]] + - type: ContainerFill + containers: + ItemCabinet: + - EtchedBrassKnuckles diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml b/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml new file mode 100644 index 00000000000000..f56e2e24f6d8d9 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml @@ -0,0 +1,43 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +#Quartermaster +- type: entity + name: brass knuckles + parent: BaseItem + id: EtchedBrassKnuckles + description: кастет + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi + state: icon + - type: Clothing + sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi + slots: [gloves] + - type: Item + size: Small + storedRotation: -90 + - type: MeleeWeapon + autoAttack: true + attackRate: 1 + damage: + types: + Blunt: 10 + Stamina: 28 + soundHit: + collection: GenericHit + animation: WeaponArcFist + mustBeEquippedToUse: true + - type: WeaponRandom + damageBonus: + types: + Blunt: 10 + Stamina: 72 # 28 + 72 = 100 => куклу без стаминрезиста сразу ложит в стаминкрит + randomDamageChance: 0.2 + damageSound: /Audio/SS220/Weapons/brassKnukles/critical-hit.ogg + - type: Tag + tags: + - EtchedBrassKnuckles + - type: StaticPrice + price: 1000 + - type: StealTarget + stealGroup: EtchedBrassKnuckles diff --git a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml index 8508c424363e4a..49d5b7616d1362 100644 --- a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml @@ -3,4 +3,11 @@ name: secway sprite: sprite: Objects/Vehicles/secway.rsi - state: icon \ No newline at end of file + state: icon + +- type: stealTargetGroup + id: EtchedBrassKnuckles + name: engraved brass knuckles + sprite: + sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi + state: icon diff --git a/Resources/Prototypes/SS220/Objectives/traitor.yml b/Resources/Prototypes/SS220/Objectives/traitor.yml new file mode 100644 index 00000000000000..330f44d2241efa --- /dev/null +++ b/Resources/Prototypes/SS220/Objectives/traitor.yml @@ -0,0 +1,11 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +- type: entity + parent: BaseTraitorStealObjective + id: EtchedBrassKnucklesStealObjective + components: + - type: NotJobRequirement + job: Quartermaster + - type: StealCondition + stealGroup: EtchedBrassKnuckles + owner: job-name-qm diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml index 3ae51d4e690e18..e4bb91bcc6ef34 100644 --- a/Resources/Prototypes/SS220/tags.yml +++ b/Resources/Prototypes/SS220/tags.yml @@ -86,4 +86,8 @@ id: PowerCellHigh - type: Tag - id: WeaponFlareGun \ No newline at end of file + id: WeaponFlareGun + +# New Qm highrisk +- type: Tag + id: EtchedBrassKnuckles diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..2d2606c115910f6ddc7367e31cee5d01e8251795 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-RJY5_^BHWWDSQjUV^fUz;TxbyVdd%|fR?z>2K9dffTYa8mmj4uH6FHmY zA3P;&`T?dJzwokZE|NLGvh*X5aH-`jgG>ST4XY?#)d!EW>C z^nnlW&gZMAG^C(C}|6lL=kKZJU&rF2H!H#8P z;Y9<}*XLc046=09Gwd8$m(LdYH@hXm$lybyVZ@Cqj;@8x!tS#qBtR literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png new file mode 100644 index 0000000000000000000000000000000000000000..639254ff4ccc6c0f4c2438bc0f96ff7e13a22067 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6kiU|n}3_;}v*^`6!lvI6%a%kmfikFYyAF=oAui34lbzcJ%=QMD7J!YMhbcj#Ex$~&P z*MPMwjDdU$R28ha&TI+2v%rbv;L6qIWrEVIEV2pmw>F+Xa{t+f+3N2XD77?p^avcD z+3TLeziwSY6W2o)7gt8jY0V6puR6IHH72Jx_;7%n$K`fVLxPo=M?!*Ob8FnTH-Eku j0e!)j8sVAd>&u`8WOD#92wV!D45B<;{an^LB{Ts5LVssc literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..aa63a62dee73e836ce63d2f975c8457b1f908c1e GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6CVJzX3_BHWWDSQjUV^fUz;aJe1qVDAZ#QvdMr9ovw4 zTCC}raEO4+)Nl7)Lnk%*hRtkbJ@KFUNXv`({`W?2cK)4{_;yny%h~j%OBIb>tF4(& ze`e>AZ(tL4ZoVSS-BHBgak1ULUh+oAl1?KLu8uyY-!mjO9Q@xfL!h?cq|lK-QC*q*EPH1omr_yzOr>eDAACZ`E7tWs-ZTgm=f znTcWR19r7vhj{wy3yfp_o;mp8gSGi#S0)n=Sr1zedBcVTfw_4>Kk|i=P98Xrel#I5 zm|gTJub)h2Qo@gto`+{{31UI!pl=Tzsh!o@u_m Z3|c@o2M~k6rQpdR%G1@)Wt~$(697t!lJEck literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..8768a906e462d3e7f5f8d8f707442a47a03f1a2d GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6<$o-U3d5$9`w$p=mo2c-@AH(&61PEy%Bt*qa) zXo~53mZ^n*l|6sS`b?{0Wy&(wwg(!)mm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg! E04S<0bpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json new file mode 100644 index 00000000000000..951196bbfb71c2 --- /dev/null +++ b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by okroshka59 (Discord) for SS220, modified by Bomjojuk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "open" + }, + { + "name": "closed" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "brassknukles" + } + ] +} diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..f0e4e0702a2853145ce1714e8ab4e07439983c72 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;AJzX3_BHWWDSebbx7Ml1a$luz??;*+Xk#z$D=Yt2YxYRX-)fG-L7VYxt z^2w3uUf{&i*wG_!cxJDAPG=#5@Dw=%2LqNz)@G)+W}dG8dFwT&Ln}v9aQOQ-QG37s zn%yc|_ccIqPJ;&f5|a+rA}Bp5C%*X8+sR}|y{zSIcM cG+$o^Eg+i%h(X{|@MI9>>FVdQ&MBb@0RAmtO8@`> literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..93b8c108c62fe84deefe7670165460f4b8471448 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6<0o-U3d5$O zum85eCcS2!;Qj9+liz1w{Iu=P-r8SsuWM)5cy7F``APQoqOE^^-rFsw>RM*HKI7c1 z-(1qkCbP0l+XkKq26I% literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4684d65499e8552742dff70fb29655dfc75fbd95 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFv@wlIEF-Uz76r@J7mD~M!JIW z{;TpIOzCk)*0$f9SmE^E?Qxn?@=UYXJPA%q$$r~&Dp}W`>dShtUurB#XlDMjuiK|N zL#Em>vn4m~6@vd$@?2>=+KnJ54N literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8b89ab1a58655e7b65f775535ad7c409cf39a821 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dpunnLn;{G-rC69V!*>1;FhR+ zZKtTjYb!3b9fB`vy(UgNWhnF^LrL-H@k-6dnV$p|92yuHnOHak;0zDW8vEiUOnzOf zi~P5p{@a(_{bQ}OLX_X>)1@VarTJFhRIgU7mhY_8bpG~X@6A9<+w)%NM!?MiF&d+} z?quaH@Y-R&aKBjc6&t6ktW%$FlWe+vuWsi$UYN!HqCc1)uJLNz_`Pux&>wuM5uRzj az6@GGHU|)cz@^~HAj;F#&t;ucLK6UgD^{TZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2dfed123130ff911d902e904942a61eb389f8a1f GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn;{G-rC69Y#_iI;C3=9 zQe8V`O^N0V1?46CPk7`BoLwl~x759v=f|JFKI!`1-3*LOEF1y~4h?X|frSTN7j_>O zum85eCcS2!;Qj9+liz1w{Iu=P-r8SsuWM)5cy7F``APQoqOE^^-rFsw>RM*HKI7c1 z-(1qkCbP0l+XkKq26I% literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json new file mode 100644 index 00000000000000..776963ab612a4c --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ss220club/Paradise-SS220/blob/master/icons/obj/weapons/knuckleduster.dmi, modifided by okroshka59 (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}