From d1ffb4ab29b4484c01490eeeb5a2d081c4281c03 Mon Sep 17 00:00:00 2001 From: Kit0vras Date: Thu, 19 Oct 2023 01:47:04 +0300 Subject: [PATCH] Energy Crossbows --- .../SS220/Weapons/Guns/MagIn/attributions.yml | 4 ++ .../SS220/Weapons/Guns/MagIn/draw_bow2.ogg | Bin 0 -> 22047 bytes .../ru-RU/ss220/store/uplink-catalog.ftl | 3 + .../Locale/ru-RU/ss220/weapons/crossbow.ftl | 5 ++ .../Entities/Structures/Machines/lathe.yml | 2 + .../Prototypes/Recipes/Lathes/devices.yml | 10 +++ Resources/Prototypes/Research/arsenal.yml | 2 + .../SS220/Catalog/uplink_catalog.yml | 10 +++ .../Weapons/Guns/Projectiles/impacts.yml | 18 ++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 55 +++++++++++++++++ .../Objects/Weapons/Guns/crossbow.yml | 57 ++++++++++++++++++ .../Guns/Crossbow/crossbow.rsi/icon.png | Bin 0 -> 340 bytes .../Crossbow/crossbow.rsi/inhand-left.png | Bin 0 -> 2267 bytes .../Crossbow/crossbow.rsi/inhand-right.png | Bin 0 -> 2267 bytes .../Guns/Crossbow/crossbow.rsi/meta.json | 30 +++++++++ .../crossbow.rsi/wielded-inhand-left.png | Bin 0 -> 2267 bytes .../crossbow.rsi/wielded-inhand-right.png | Bin 0 -> 2267 bytes .../Guns/Crossbow/minicrossbow.rsi/icon.png | Bin 0 -> 343 bytes .../Crossbow/minicrossbow.rsi/inhand-left.png | Bin 0 -> 579 bytes .../minicrossbow.rsi/inhand-right.png | Bin 0 -> 611 bytes .../Guns/Crossbow/minicrossbow.rsi/meta.json | 22 +++++++ .../Projectiles/projectiles.rsi/cbbolt.png | Bin 0 -> 242 bytes .../Projectiles/projectiles.rsi/meta.json | 14 +++++ 23 files changed, 232 insertions(+) create mode 100644 Resources/Audio/SS220/Weapons/Guns/MagIn/attributions.yml create mode 100644 Resources/Audio/SS220/Weapons/Guns/MagIn/draw_bow2.ogg create mode 100644 Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl create mode 100644 Resources/Locale/ru-RU/ss220/weapons/crossbow.ftl create mode 100644 Resources/Prototypes/SS220/Catalog/uplink_catalog.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/crossbow.yml create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/projectiles.rsi/cbbolt.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json diff --git a/Resources/Audio/SS220/Weapons/Guns/MagIn/attributions.yml b/Resources/Audio/SS220/Weapons/Guns/MagIn/attributions.yml new file mode 100644 index 000000000000..1b32cc336cfe --- /dev/null +++ b/Resources/Audio/SS220/Weapons/Guns/MagIn/attributions.yml @@ -0,0 +1,4 @@ +- files: ["draw_bow2.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Is taken from tgstation at https://github.com/ss220-space/tgstation/blob/eee5e8ffb539d91a507316abf17839779326aa99/sound/weapons/draw_bow2.ogg" + source: "https://github.com/tgstation/tgstation" \ No newline at end of file diff --git a/Resources/Audio/SS220/Weapons/Guns/MagIn/draw_bow2.ogg b/Resources/Audio/SS220/Weapons/Guns/MagIn/draw_bow2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..9fa5f7cf9fc6212af63e578e1a5e7dd1d8999f7b GIT binary patch literal 22047 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl new file mode 100644 index 000000000000..92f2776637cd --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl @@ -0,0 +1,3 @@ +# Weapons +uplink-ecrossbow-name = { ent-WeaponMiniEnergyCrossbow } +uplink-ecrossbow-desc = { ent-WeaponMiniEnergyCrossbow.desc } diff --git a/Resources/Locale/ru-RU/ss220/weapons/crossbow.ftl b/Resources/Locale/ru-RU/ss220/weapons/crossbow.ftl new file mode 100644 index 000000000000..5fc1e8299805 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/weapons/crossbow.ftl @@ -0,0 +1,5 @@ +ent-WeaponMiniEnergyCrossbow = мини энерго-арбалет + .desc = Оружие, излюбленное специалистами синдиката, предпочитающими работать скрытно. +ent-WeaponEnergyCrossbow = энерго-арбалет + .desc = Оружие, спроектированное методом обратной инженерии с использованием технологий синдиката. Средних размеров и слабее "оригинала". + diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index a7941cac4097..b301e8ff09f6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -276,6 +276,7 @@ - WeaponLaserCannon - WeaponXrayCannon - WeaponTaser + - WeaponEnergyCrossbow #SS220 Energy Crossbow - type: entity id: CircuitImprinter @@ -581,6 +582,7 @@ - WeaponLaserCarbinePractice - WeaponTaser - WeaponXrayCannon + - WeaponEnergyCrossbow #SS220 Energy Crossbow - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 01178b386c39..cedca1196379 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -184,3 +184,13 @@ Steel: 500 Glass: 400 Gold: 100 + +- type: latheRecipe #SS220 Energy crossbow + id: WeaponEnergyCrossbow + result: WeaponEnergyCrossbow + completetime: 5 + materials: + Steel: 2000 + Silver: 750 + Plasma: 1500 + Uranium: 600 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 75107a1b5e9c..215dc3496dcb 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -168,3 +168,5 @@ cost: 15000 recipeUnlocks: - WeaponAdvancedLaser + - WeaponEnergyCrossbow #SS220 Energy crossbow + \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml new file mode 100644 index 000000000000..0db8da5583b5 --- /dev/null +++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml @@ -0,0 +1,10 @@ +- type: listing + id: UplinkEcrossbow + name: uplink-ecrossbow-name + description: uplink-ecrossbow-desc + icon: { sprite: /Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi, state: icon } + productEntity: WeaponMiniEnergyCrossbow + cost: + Telecrystal: 10 + categories: + - UplinkWeapons diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml new file mode 100644 index 000000000000..e93764d25913 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -0,0 +1,18 @@ +- type: entity + id: BulletImpactEffectGreenLaser + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: "#00cb00" + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml new file mode 100644 index 000000000000..880a0658e661 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -0,0 +1,55 @@ +- type: entity + name: mini energy crossbow bolt + id: BulletMiniEnergyCrossbow + parent: BaseBullet + noSpawn: true + components: + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + noRot: false + sprite: SS220/Objects/Weapons/Guns/Projectiles/projectiles.rsi + color: "#00cb00" + layers: + - state: cbbolt + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + hard: false + mask: + - Opaque + - type: StaminaDamageOnCollide + damage: 25 + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectGreenLaser + damage: + types: + Poison: 15 + soundHit: + path: "/Audio/Weapons/tap.ogg" + soundForce: true + - type: StunOnCollide + stunAmount: 1 + knockdownAmount: 1 + +- type: entity + name: energy crossbow bolt + id: BulletEnergyCrossbow + parent: BulletMiniEnergyCrossbow + noSpawn: true + components: + - type: StaminaDamageOnCollide + damage: 20 + - type: Projectile + damage: + types: + Poison: 10 \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/crossbow.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/crossbow.yml new file mode 100644 index 000000000000..61b917a9d470 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/crossbow.yml @@ -0,0 +1,57 @@ +#© SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt +- type: entity + name: crossbow + parent: BaseItem + id: BaseWeaponCrossbow + abstract: true + description: Energy crossbow. + components: + - type: AmmoCounter + - type: UseDelayOnShoot + - type: UseDelay + delay: 4 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 4 + rechargeSound: + path: /Audio/SS220/Weapons/Guns/MagIn/draw_bow2.ogg + - type: Gun + fireRate: 1 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + - type: Item + size: 10 + +- type: entity + name: mini energy crossbow + parent: BaseWeaponCrossbow + id: WeaponMiniEnergyCrossbow + description: A weapon favored by syndicate specialists who prefer to work covertly. + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi + state: icon + - type: BasicEntityAmmoProvider + proto: BulletMiniEnergyCrossbow + capacity: 1 + count: 1 + +- type: entity + name: energy crossbow + parent: WeaponMiniEnergyCrossbow + id: WeaponEnergyCrossbow + description: A weapon designed by reverse engineering using syndicate technology. Medium-sized and weaker than the "original". + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi + state: icon + - type: Item + size: 30 + - type: BasicEntityAmmoProvider + proto: BulletEnergyCrossbow + capacity: 1 + count: 1 + - type: Wieldable + wieldTime: 0.5 + wieldSound: + path: /Audio/Items/bow_pull.ogg + - type: GunRequiresWield diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a4ff0abd4db16923db4d57fd0d3173beee317a00 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyP60k4t_Kbrkdu=O4Gxwulwz0( z6lKuW)vc(gU^rvEZQHhm3m0Z*XIHH$XZUa2(%8swh9NRCGNdig!NI}U*x1m}P)$uO z$07L@P#a@OkY6x^!?PP{K+XYA7sn8b-n|oU3pE+=xCndYvaVTr@c;kN?b9VCFEsG) z+H=8j`P`JwI+3(%mDfvGC4OkinsIMJmJH|2$!T*$?4*0^b#L@0lfSlq@R-HiUz1i8`^{>G4TemA;Dn(fCd7E{kPE$nzW5mcWt^RPL@ZT z_$xhy9wBhngDha zup2c2>?UA0Y693zz-~AzCD3)f^gkAhmA~9ozbJjsu^pheyi@?g!@~e15{Zh0+-^4j zfk1$8I7}!M5`b_xtSV++z}GMgE6FPhP%Q?UCjkgv->Aq7VTt%c6oo1nuLhbYEw9%N z!zin?N?2Gy4qDlybLQ=P}g}$EGt6oD?3rj7asi}!fCd1(1AOMDu zpO=+VA|hoZ)sK{f$1at{6-IS8P7G;9${k6$k{-b)BN| zx~`)-*P%Msfq|$;mH4-9X4kG=!D2Zsmn&NhvCL$=EWi4WGOgrWs=Ka)iUN4OUJS!f zhG8hL*IV{ZDTS`<#JtI3RJ}YU8tVbr4h$@q({EZK)Ya8RA-wXn^U#(MwL}>Q>r?{Fe%gE323TVii*r@Xl<9d;Ek#Apl8d zv;K58OV+g1g2|dD>1>vCHtPpuQ=<(v=q?+z^$EdV)92#3R}yStlcG)jGa{%~kwVq(d% zHf`DjKwDcIB0?&gMiV6tv-IsnB+f;a_7Pa!=C9fz5_2v-_f)1Z9L{@&yY>X-eE)#* z`FwX$e95UYt0mtN$Hl4z80o(Ro$JaY_unY}J>Nf|y1Tn&W@bjgty;E#lJVyrDAe*B zw|(cW8>|*({d%W0<(Y`9C(w=7jorg-@1LWCRmd} z@DD%u<-$h+P)C#i)N9U?Pj_NsVs0f*akHb5W=G>3z`)slpyUsh+kQFu>`&K#`5Lx> z-yVOSTq4Dn|MgWU)Ra1+_(0b~S%BW&UbXGs4nb9PlnS8U*L46O+r#U{cm?o_Z$85Y zPvctAUR4XwV6n&k^IN}I_PqJw-K93{QB91FjxJkZ$EJJns3!Ve?4#$2Eo^>xckcNO zPv>7Y!8bni=u+7lScM&yGq$v};PH6M4oEsXJ5zsp=_NjQ_%KI~9N|k}Kg#c){WUZp zX#077!_xwY`r~0y5hbTj?BtPs?_H@6%jpw4A>Rsa1#N#Zt_)ZH_B&W`_sHw@@`*h@ znwy)gnssMgz~k{?nx=XA@@0np{(_wP%L`na&vA7&NhER}T)ETH@8O7bdkHGjDvp;gdu|nBu z>tE00hEMO)61``+;7l+Tn1O@60Q9`l!#`eqm5UcIvT?%(9_;Q05M9@c2iDf^50ISQlwHToK7b`pO0j+ zbT~^ood!@=E@eU$ExV^Ax7)2mgj_Di*hrLQGO5=4bh$QTD8JudXPRaPK#mFO zyZNbbbb9<8P&_YO7P(~pY}M(mj|1l-@4gJXK#oZZ$8M$5G!4JkBk}ngDwDh^TejSX z!{I)6>(pXHfu=aKD&JD?M9*t(~K!(O!4J%IZrkB5-bbgbUJZ39CHqb z!vMH`Gl{cd`4w5C!tVCBKf24isL{53XqQIPJmNZIRXZi_ZsCNsvVEt p<){f@Hvzj*6Tof)cH^!W;D1Zu$~1-?GrRx*002ovPDHLkV1fp8Kp+4B literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..47087de0bdee589d7cebc6ce5a340110535d2200 GIT binary patch literal 2267 zcmV<12qgE3P)iUz1i8`^{>G4TemA;Dn(fCd7E{kPE$nzW5mcWt^RPL@ZT z_$xhy9wBhngDha zup2c2>?UA0Y693zz-~AzCD3)f^gkAhmA~9ozbJjsu^pheyi@?g!@~e15{Zh0+-^4j zfk1$8I7}!M5`b_xtSV++z}GMgE6FPhP%Q?UCjkgv->Aq7VTt%c6oo1nuLhbYEw9%N z!zin?N?2Gy4qDlybLQ=P}g}$EGt6oD?3rj7asi}!fCd1(1AOMDu zpO=+VA|hoZ)sK{f$1at{6-IS8P7G;9${k6$k{-b)BN| zx~`)-*P%Msfq|$;mH4-9X4kG=!D2Zsmn&NhvCL$=EWi4WGOgrWs=Ka)iUN4OUJS!f zhG8hL*IV{ZDTS`<#JtI3RJ}YU8tVbr4h$@q({EZK)Ya8RA-wXn^U#(MwL}>Q>r?{Fe%gE323TVii*r@Xl<9d;Ek#Apl8d zv;K58OV+g1g2|dD>1>vCHtPpuQ=<(v=q?+z^$EdV)92#3R}yStlcG)jGa{%~kwVq(d% zHf`DjKwDcIB0?&gMiV6tv-IsnB+f;a_7Pa!=C9fz5_2v-_f)1Z9L{@&yY>X-eE)#* z`FwX$e95UYt0mtN$Hl4z80o(Ro$JaY_unY}J>Nf|y1Tn&W@bjgty;E#lJVyrDAe*B zw|(cW8>|*({d%W0<(Y`9C(w=7jorg-@1LWCRmd} z@DD%u<-$h+P)C#i)N9U?Pj_NsVs0f*akHb5W=G>3z`)slpyUsh+kQFu>`&K#`5Lx> z-yVOSTq4Dn|MgWU)Ra1+_(0b~S%BW&UbXGs4nb9PlnS8U*L46O+r#U{cm?o_Z$85Y zPvctAUR4XwV6n&k^IN}I_PqJw-K93{QB91FjxJkZ$EJJns3!Ve?4#$2Eo^>xckcNO zPv>7Y!8bni=u+7lScM&yGq$v};PH6M4oEsXJ5zsp=_NjQ_%KI~9N|k}Kg#c){WUZp zX#077!_xwY`r~0y5hbTj?BtPs?_H@6%jpw4A>Rsa1#N#Zt_)ZH_B&W`_sHw@@`*h@ znwy)gnssMgz~k{?nx=XA@@0np{(_wP%L`na&vA7&NhER}T)ETH@8O7bdkHGjDvp;gdu|nBu z>tE00hEMO)61``+;7l+Tn1O@60Q9`l!#`eqm5UcIvT?%(9_;Q05M9@c2iDf^50ISQlwHToK7b`pO0j+ zbT~^ood!@=E@eU$ExV^Ax7)2mgj_Di*hrLQGO5=4bh$QTD8JudXPRaPK#mFO zyZNbbbb9<8P&_YO7P(~pY}M(mj|1l-@4gJXK#oZZ$8M$5G!4JkBk}ngDwDh^TejSX z!{I)6>(pXHfu=aKD&JD?M9*t(~K!(O!4J%IZrkB5-bbgbUJZ39CHqb z!vMH`Gl{cd`4w5C!tVCBKf24isL{53XqQIPJmNZIRXZi_ZsCNsvVEt p<){f@Hvzj*6Tof)cH^!W;D1Zu$~1-?GrRx*002ovPDHLkV1fp8Kp+4B literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/meta.json new file mode 100644 index 000000000000..0b2569ba9969 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2532911353d63661b735004f2895103d45858b50/icons/obj/weapons/guns/energy.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/wielded-inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..47087de0bdee589d7cebc6ce5a340110535d2200 GIT binary patch literal 2267 zcmV<12qgE3P)iUz1i8`^{>G4TemA;Dn(fCd7E{kPE$nzW5mcWt^RPL@ZT z_$xhy9wBhngDha zup2c2>?UA0Y693zz-~AzCD3)f^gkAhmA~9ozbJjsu^pheyi@?g!@~e15{Zh0+-^4j zfk1$8I7}!M5`b_xtSV++z}GMgE6FPhP%Q?UCjkgv->Aq7VTt%c6oo1nuLhbYEw9%N z!zin?N?2Gy4qDlybLQ=P}g}$EGt6oD?3rj7asi}!fCd1(1AOMDu zpO=+VA|hoZ)sK{f$1at{6-IS8P7G;9${k6$k{-b)BN| zx~`)-*P%Msfq|$;mH4-9X4kG=!D2Zsmn&NhvCL$=EWi4WGOgrWs=Ka)iUN4OUJS!f zhG8hL*IV{ZDTS`<#JtI3RJ}YU8tVbr4h$@q({EZK)Ya8RA-wXn^U#(MwL}>Q>r?{Fe%gE323TVii*r@Xl<9d;Ek#Apl8d zv;K58OV+g1g2|dD>1>vCHtPpuQ=<(v=q?+z^$EdV)92#3R}yStlcG)jGa{%~kwVq(d% zHf`DjKwDcIB0?&gMiV6tv-IsnB+f;a_7Pa!=C9fz5_2v-_f)1Z9L{@&yY>X-eE)#* z`FwX$e95UYt0mtN$Hl4z80o(Ro$JaY_unY}J>Nf|y1Tn&W@bjgty;E#lJVyrDAe*B zw|(cW8>|*({d%W0<(Y`9C(w=7jorg-@1LWCRmd} z@DD%u<-$h+P)C#i)N9U?Pj_NsVs0f*akHb5W=G>3z`)slpyUsh+kQFu>`&K#`5Lx> z-yVOSTq4Dn|MgWU)Ra1+_(0b~S%BW&UbXGs4nb9PlnS8U*L46O+r#U{cm?o_Z$85Y zPvctAUR4XwV6n&k^IN}I_PqJw-K93{QB91FjxJkZ$EJJns3!Ve?4#$2Eo^>xckcNO zPv>7Y!8bni=u+7lScM&yGq$v};PH6M4oEsXJ5zsp=_NjQ_%KI~9N|k}Kg#c){WUZp zX#077!_xwY`r~0y5hbTj?BtPs?_H@6%jpw4A>Rsa1#N#Zt_)ZH_B&W`_sHw@@`*h@ znwy)gnssMgz~k{?nx=XA@@0np{(_wP%L`na&vA7&NhER}T)ETH@8O7bdkHGjDvp;gdu|nBu z>tE00hEMO)61``+;7l+Tn1O@60Q9`l!#`eqm5UcIvT?%(9_;Q05M9@c2iDf^50ISQlwHToK7b`pO0j+ zbT~^ood!@=E@eU$ExV^Ax7)2mgj_Di*hrLQGO5=4bh$QTD8JudXPRaPK#mFO zyZNbbbb9<8P&_YO7P(~pY}M(mj|1l-@4gJXK#oZZ$8M$5G!4JkBk}ngDwDh^TejSX z!{I)6>(pXHfu=aKD&JD?M9*t(~K!(O!4J%IZrkB5-bbgbUJZ39CHqb z!vMH`Gl{cd`4w5C!tVCBKf24isL{53XqQIPJmNZIRXZi_ZsCNsvVEt p<){f@Hvzj*6Tof)cH^!W;D1Zu$~1-?GrRx*002ovPDHLkV1fp8Kp+4B literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/wielded-inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/crossbow.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..47087de0bdee589d7cebc6ce5a340110535d2200 GIT binary patch literal 2267 zcmV<12qgE3P)iUz1i8`^{>G4TemA;Dn(fCd7E{kPE$nzW5mcWt^RPL@ZT z_$xhy9wBhngDha zup2c2>?UA0Y693zz-~AzCD3)f^gkAhmA~9ozbJjsu^pheyi@?g!@~e15{Zh0+-^4j zfk1$8I7}!M5`b_xtSV++z}GMgE6FPhP%Q?UCjkgv->Aq7VTt%c6oo1nuLhbYEw9%N z!zin?N?2Gy4qDlybLQ=P}g}$EGt6oD?3rj7asi}!fCd1(1AOMDu zpO=+VA|hoZ)sK{f$1at{6-IS8P7G;9${k6$k{-b)BN| zx~`)-*P%Msfq|$;mH4-9X4kG=!D2Zsmn&NhvCL$=EWi4WGOgrWs=Ka)iUN4OUJS!f zhG8hL*IV{ZDTS`<#JtI3RJ}YU8tVbr4h$@q({EZK)Ya8RA-wXn^U#(MwL}>Q>r?{Fe%gE323TVii*r@Xl<9d;Ek#Apl8d zv;K58OV+g1g2|dD>1>vCHtPpuQ=<(v=q?+z^$EdV)92#3R}yStlcG)jGa{%~kwVq(d% zHf`DjKwDcIB0?&gMiV6tv-IsnB+f;a_7Pa!=C9fz5_2v-_f)1Z9L{@&yY>X-eE)#* z`FwX$e95UYt0mtN$Hl4z80o(Ro$JaY_unY}J>Nf|y1Tn&W@bjgty;E#lJVyrDAe*B zw|(cW8>|*({d%W0<(Y`9C(w=7jorg-@1LWCRmd} z@DD%u<-$h+P)C#i)N9U?Pj_NsVs0f*akHb5W=G>3z`)slpyUsh+kQFu>`&K#`5Lx> z-yVOSTq4Dn|MgWU)Ra1+_(0b~S%BW&UbXGs4nb9PlnS8U*L46O+r#U{cm?o_Z$85Y zPvctAUR4XwV6n&k^IN}I_PqJw-K93{QB91FjxJkZ$EJJns3!Ve?4#$2Eo^>xckcNO zPv>7Y!8bni=u+7lScM&yGq$v};PH6M4oEsXJ5zsp=_NjQ_%KI~9N|k}Kg#c){WUZp zX#077!_xwY`r~0y5hbTj?BtPs?_H@6%jpw4A>Rsa1#N#Zt_)ZH_B&W`_sHw@@`*h@ znwy)gnssMgz~k{?nx=XA@@0np{(_wP%L`na&vA7&NhER}T)ETH@8O7bdkHGjDvp;gdu|nBu z>tE00hEMO)61``+;7l+Tn1O@60Q9`l!#`eqm5UcIvT?%(9_;Q05M9@c2iDf^50ISQlwHToK7b`pO0j+ zbT~^ood!@=E@eU$ExV^Ax7)2mgj_Di*hrLQGO5=4bh$QTD8JudXPRaPK#mFO zyZNbbbb9<8P&_YO7P(~pY}M(mj|1l-@4gJXK#oZZ$8M$5G!4JkBk}ngDwDh^TejSX z!{I)6>(pXHfu=aKD&JD?M9*t(~K!(O!4J%IZrkB5-bbgbUJZ39CHqb z!vMH`Gl{cd`4w5C!tVCBKf24isL{53XqQIPJmNZIRXZi_ZsCNsvVEt p<){f@Hvzj*6Tof)cH^!W;D1Zu$~1-?GrRx*002ovPDHLkV1fp8Kp+4B literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ef8fbb62ae18fa9fceaeb7dcf0ce3d3c5d7f12ed GIT binary patch literal 343 zcmV-d0jU0oP)bKMHCsT}9siHBI5*OriAbxTntS*G(o#)BK`HRQ$F( zCaA3tQdJ14VKCPXaJwh@M;}5MM`N-g z6lswM0sv*6lt;Xxo#I=1$rw73`wRdRz(8T#oG|m>1QdK=PO(hv4w3_6T!H;TlLc%7 pO6yJuOXE~p6gRj&DhKtq`T)6O2SgK6@oNA8002ovPDHLkV1nXKfu#Td literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..44556002ff0f3a31647ae88d7a309ff6a92a48c0 GIT binary patch literal 579 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn% zPZ!6KiaBp*oy|JrAkun%$|L79RvD6yCu@A;y;FLBpW`*QBc;2FWm~3w^IWq?f5P5? zJNNXmnl{=?R6o_JvKJ6KbEc+v&W@eeJ30OthvzVwi7`Ys^s*ihOGswizhAnd{AjY{q}keD`&s@|y;&Yyo6Y;IvQJ6#fiQo~sp--` zOLKm%@we$(a=_;N#(O!Z-hUAkyn24aeRd-T$tAL`LhTIi_xfB4neca?oKeE0Wsmkw zw_w?_*kgj@1jfU4@pnUAzW5*b{5HGvZr0XQ@mC&hNsg&5v;TK`&#V>yIgec~sHm=a z<6p_jw|=SF{k!r{_eEcL#q?i>yFvHBF{T9W4I3G5Fy-hlY-5lnPUz~T8P#h-_xZiz z%s8a_i(RjjN$M+$iR12ihrJfJsN z@bJ&8zs#@JACR?Sj`B?w} literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6c6cf5f82af63ab2aee051e408031a5a1bacc1f8 GIT binary patch literal 611 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$& zr;B4q#hkaZHu@b35NZ3L?GxVlc&>C?cBN3qKE~O*rApuB_$IzP;p1cSOGQKQ@twI- zpIUeba;a^L`D;2)Kl4TF?Pssgzbxq!6#SE3c7rL$gkc+lG;f3M0XOCZ?hO|iunUz< z7hl`VTxlaI?wy>heK+rVkGnEsLf-rL^)VZ?+~@K!bYyQmlVC8x<{U2rW5bH~231u? zr+;79Qg~%O*>Cbu*U#sle$8M0M*F3SVc`9lzOzp=iimgh>VC2~ezu_F`N<_e-s&gJ zQy0F&(|+QyjM=sWe`aoYDe00@sK9(lMKF7<%ejS;ZB0B)JQg|I!@vEz_ISfxHX{bf zC6aAImh9PUmv}0j*syJX45OsST zcaLW$*Dtz%wCjD<&Gmbk+NjS(OKaOk4Nthel5z-F#U8mgTrSnmkS(cO4qADU%uSp_U;dA z-z$vVtb7aZzE0eK(O~n b?lG+9G=AzDzP<#QY8X6S{an^LB{Ts5u2Kcr literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/meta.json new file mode 100644 index 000000000000..c7f8640edb10 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Crossbow/minicrossbow.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2532911353d63661b735004f2895103d45858b50/icons/obj/weapons/guns/energy.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/projectiles.rsi/cbbolt.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/projectiles.rsi/cbbolt.png new file mode 100644 index 0000000000000000000000000000000000000000..38bb0d8d57472082309493f8cb19d05232e90949 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7eJa z#W5tJHTlo~|MrI+n3geat-Zpym`|egzzSwJS%W3A0imH^|6f?>%+t;%o7B%26(nC$HA+RESG