diff --git a/Resources/Locale/en-US/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/en-US/ADT/prototypes/Catalog/store/uplink-catalog.ftl new file mode 100644 index 00000000000..56f9d7bf618 --- /dev/null +++ b/Resources/Locale/en-US/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -0,0 +1,2 @@ +uplink-adt-rapier-name = Rapier +uplink-adt-rapier-desc = A thin syndicate blade that pierces armor with precise thrusts. diff --git a/Resources/Locale/en-US/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl b/Resources/Locale/en-US/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl new file mode 100644 index 00000000000..801ce14c1a7 --- /dev/null +++ b/Resources/Locale/en-US/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl @@ -0,0 +1,8 @@ +ent-ADTRapier = rapier + .desc = A thin syndicate rapier, its blade designed to pierce through armor with precise thrusts. + +ent-ADTStraightRazor = straight razor + .desc = Easy to cut a throat with it. + +ent-ADTGladius = gladius + .desc = The old sword of the Roman Empire, it is still good for campaigns against the barbarians in the technical corridors. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index dda7166b205..4db71a73b22 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -257,3 +257,6 @@ uplink-box-music-disks-desc = Тихо выполнять цели - не ваш uplink-code-speak-implanter-name = Имплантер Кодового языка uplink-code-speak-implanter-desc = Каждый уважающий себя ядерный оперативник знает этот язык. Имплантер замаскирован под обычный имплантер Общегалактического языка. + +uplink-adt-rapier-name = Рапира +uplink-adt-rapier-desc = Тонкий клинок синдиката, пробивающий броню точными уколами. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl index b56db4df137..2ab8e9e7e8d 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl @@ -9,3 +9,6 @@ ent-ADTStraightRazor = опасная бритва ent-ADTGladius = гладиус .desc = Старый меч Римской империи, он все еще хорош для кампаний против варваров в технических помещениях. + +ent-ADTRapier = рапира + .desc = Тонкая рапира синдиката, созданная для пробивания брони точными уколами. diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index e5c78925830..c62c19a9d85 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -1,5 +1,25 @@ #UplinkWeaponry +- type: listing + id: ADTUplinkRapier + name: uplink-adt-rapier-name + description: uplink-adt-rapier-desc + icon: { sprite: /Textures/ADT/Objects/Weapons/Melee/rapier.rsi, state: icon } + productEntity: ADTRapier + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 5 + cost: + Telecrystal: 8 + categories: + - UplinkWeaponry + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + - LoneOpsUplink + - type: listing id: ADTUplinkAdvancedHristov name: uplink-hristov-bundle-name diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index 6a53850c156..e4563934332 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml @@ -411,3 +411,25 @@ - type: Construction graph: ADTBBattleaxe node: ADTBoneCompBattleaxe + +- type: entity + parent: [ BaseSword, BaseSyndicateContraband ] + id: ADTRapier + name: rapier + description: A thin syndicate rapier, its blade designed to pierce through armor with precise thrusts. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/rapier.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 17 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: ArmorPenetration + penetration: 0.3 + - type: Reflect + reflectProb: .1 + spread: 90 + - type: DisarmMalus diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/icon.png new file mode 100644 index 00000000000..eb0476a5c1f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-left.png new file mode 100644 index 00000000000..d2e03668a2d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-right.png new file mode 100644 index 00000000000..6ff5e7e9ba3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/meta.json new file mode 100644 index 00000000000..ceed3b19a7d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441. Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}