From 2f923d88e4aa624f55dd7f4f7a2a57e5ff8d22c2 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:14:30 +0200 Subject: [PATCH] New head of security weapon:Energy Shotgun (#30643) * Reset hopefully? * removes the emergency security orders * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Rewrites the description based on review Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> * 7 shots, recharge taking 42 seconds * minor renaming :godo: * please work * Revert "please work" This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c. * please fix --------- Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> --- .../Catalog/Fills/Lockers/heads.yml | 4 +- .../Objects/Misc/secret_documents.yml | 16 ---- .../Weapons/Guns/Battery/battery_guns.yml | 50 +++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 85 ++++++++++++++++++ .../Prototypes/Objectives/objectiveGroups.yml | 2 +- .../Objectives/stealTargetGroups.yml | 16 ++-- Resources/Prototypes/Objectives/traitor.yml | 7 +- .../Guidebook/Antagonist/Traitors.xml | 4 +- .../Guns/Battery/energy_shotgun.rsi/base.png | Bin 0 -> 824 bytes .../energy_shotgun.rsi/equipped-BACKPACK.png | Bin 0 -> 873 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 873 bytes .../Guns/Battery/energy_shotgun.rsi/icon.png | Bin 0 -> 807 bytes .../energy_shotgun.rsi/mag-unshaded-1.png | Bin 0 -> 156 bytes .../energy_shotgun.rsi/mag-unshaded-2.png | Bin 0 -> 157 bytes .../energy_shotgun.rsi/mag-unshaded-3.png | Bin 0 -> 166 bytes .../energy_shotgun.rsi/mag-unshaded-4.png | Bin 0 -> 166 bytes .../Guns/Battery/energy_shotgun.rsi/meta.json | 37 ++++++++ .../inhands_64x.rsi/energy-inhand-left.png | Bin 0 -> 979 bytes .../inhands_64x.rsi/energy-inhand-right.png | Bin 0 -> 997 bytes .../Guns/Battery/inhands_64x.rsi/meta.json | 27 ++++++ .../inhands_64x.rsi/wielded-inhand-left.png | Bin 0 -> 1132 bytes .../inhands_64x.rsi/wielded-inhand-right.png | Bin 0 -> 1147 bytes .../projectiles_tg.rsi/heavylaser.png | Bin 0 -> 340 bytes .../Projectiles/projectiles_tg.rsi/meta.json | 3 + 24 files changed, 220 insertions(+), 31 deletions(-) delete mode 100644 Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index a56c31566c..45935be0ac 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -308,7 +308,7 @@ id: LockerFillHeadOfSecurityNoHardsuit table: !type:AllSelector children: - - id: BookSecretDocuments + - id: WeaponEnergyShotgun - id: BookSpaceLaw - id: BoxEncryptionKeySecurity - id: CigarGoldCase @@ -375,4 +375,4 @@ - id: JetpackBlue - id: SpaceCash1000 - id: BeachBall - - id: BikeHorn + - id: BikeHorn \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml b/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml deleted file mode 100644 index 257aea8268..0000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: [BaseItem, BaseGrandTheftContraband] - id: BookSecretDocuments - name: "emergency security orders" - description: TOP SECRET. These documents specify the Emergency Orders that the HoS must carry out when ordered by Central Command. - components: - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - layers: - - state: folder-sec-doc - - type: Tag - tags: - - Book - - HighRiskItem - - type: StealTarget - stealGroup: BookSecretDocuments diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 5b8130567b..3ae9a2302d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -717,3 +717,53 @@ - type: Appearance - type: StaticPrice price: 750 + +- type: entity + name: energy shotgun + parent: [BaseWeaponBattery, BaseGunWieldable] + id: WeaponEnergyShotgun + description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + - type: Gun + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletLaserSpread + fireCost: 150 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletLaserSpread + fireCost: 150 + - proto: BulletLaserHeavySpread + fireCost: 150 + - proto: BulletDisablerSmgSpread + fireCost: 150 + - type: Item + size: Large + shape: + - 0,0,3,1 + sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi + heldPrefix: energy + - type: Tag + tags: + - HighRiskItem + - type: StealTarget + stealGroup: WeaponEnergyShotgun + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed + - type: Battery + maxCharge: 1050 + startingCharge: 1050 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 25 #takes 42 seconds to fully recharge, the answer to life, the universe and everything \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 42217a88bb..57eb672848 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -981,3 +981,88 @@ - type: Tag tags: - HideContextMenu + +- type: entity + name: laser bolt + id: BulletLaser + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: heavylaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 10 + soundHit: + collection: WeakHit + forceSound: true + +- type: entity + name: wide laser barrage + id: BulletLaserSpread + noSpawn: true + parent: BulletLaser + components: + - type: ProjectileSpread + proto: BulletLaser + count: 5 #50 heat damage if you hit all your shots, but wide spread + spread: 30 + +- type: entity + name : heavy laser bolt + id: BulletLaserHeavy + parent: BulletLaser + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Heat: 15 + +- type: entity + name: narrow laser barrage + id: BulletLaserHeavySpread + noSpawn: true + parent: BulletLaser + components: + - type: ProjectileSpread + proto: BulletLaser + count: 3 #45 heat damage if you hit all your shots, but narrower spread + spread: 10 + +- type: entity + name: disabling laser barrage + id: BulletDisablerSmgSpread + noSpawn: true + parent: BulletDisablerSmg + components: + - type: ProjectileSpread + proto: BulletDisablerSmg + count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though + spread: 9 \ No newline at end of file diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index fe1d8e3528..b6d727f880 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -21,7 +21,7 @@ CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 - SecretDocumentsStealObjective: 0.5 + EnergyShotgunStealObjective: 0.5 - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 08c0840276..a912a6ad8e 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -28,13 +28,6 @@ sprite: Objects/Devices/hand_teleporter.rsi state: icon -- type: stealTargetGroup - id: BookSecretDocuments - name: "emergency security orders" - sprite: - sprite: Objects/Misc/bureaucracy.rsi - state: folder-sec-doc - - type: stealTargetGroup id: ClothingShoesBootsMagAdv name: advanced magboots @@ -84,6 +77,13 @@ sprite: Objects/Misc/nukedisk.rsi state: icon +- type: stealTargetGroup + id: WeaponEnergyShotgun + name: energy shotgun + sprite: + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + state: base + # Thief Collection - type: stealTargetGroup @@ -406,3 +406,5 @@ sprite: sprite: Mobs/Animals/crab.rsi state: crab + + diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index a686925c33..419e7ac109 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -195,16 +195,17 @@ ## hos - type: entity + noSpawn: true parent: BaseTraitorStealObjective - id: SecretDocumentsStealObjective + id: EnergyShotgunStealObjective components: - type: Objective - # hos has a gun ce does not, higher difficulty than most + # HoS will have this on them a lot of the time so.. difficulty: 3 - type: NotJobRequirement job: HeadOfSecurity - type: StealCondition - stealGroup: BookSecretDocuments + stealGroup: WeaponEnergyShotgun owner: job-name-hos ## ce diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 78b950c690..3e48200e88 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -86,9 +86,9 @@ - - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]secret documents[/bold]. + - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold]. - + - Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold]. diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..1d7177f4eab5ce8e6ba5b97eb1f12bc6f079e936 GIT binary patch literal 824 zcmV-81IPS{P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0?kQ8K~z{r?Ucz+ z6LA#BzrPu}&>2b>Qb4vTEv+VEBrYd4VxlK6UWguyM&sE(!HbDEk8&{)ml#0}CR{zK zH!($Af`+YN*=(^R?NDgipTAjJ_EI2G5B(&Q-}}Aa^1koQn?Z>ZB})8jh%x>(q`)!C z^E{T9)0iCjKne;t-%>{-q6c+}IjkP5k}*UDH?rwCK7Jn4?r8G2QE(LD?*n8jTWV>e zqG*LsQGuDMp9l|!bOG)LiK^pzu6iPv+24Vhp`JBkHNjxeuyh_jd!h^I zi^{lE?=##hyc-)bEY>WnR%G29OM#-xn#MhAE&R>3hIf0y<6&?Xf~jzXXaZg`0auuS zsX#X@Z~Ng3b|RC>Vqrl6WiO|!jE7fhL|mSSqAVKMfUQxsXA!BStl8>ASS2f*l`tI| z#M0n#{A|4d&p zPl00>6OzWmM^Cjt$b$Je7La32uo2m{yK!CkzIOxF!0mXnzH z8q$KgYMbc%bXXVQ@-$P??ttAcz+|;xVscpZ=Q$t+aqet8-iN-SulE7*wjQNppZbZb zTB3sJ(#}zmMIxo-12hEMsFH{?Q4W@E9D>7U#88%(xlwW9HX9UcY*=vcAttZ7h4j(|myKSe^YEswD4*PqA9^(P+J&szMCco^X1a zHr%u2w{z?E9s0#&!~GvCO}AIn3KwL3rs_QR7_METmfkQ6qn4@Y%|)>5`}QiN*z?_& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..a382ba66ba1a8d1a102d8fcfa21598c0a1142bae GIT binary patch literal 873 zcmV-v1D5=WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{%%vK~#8N?V3$* z577q=v+LqL#2461R{RCe90DcZn9=(`&@TJ^MP@@TrMh-2I zswJeB`cg45(RB2`nQ5skb(h^`ciZQeOm=42?DPEp^RP>pWduPG1kp+O#7Qo?t_NDW z=@}5mUEt(eeQjTu01d-K5i#mS)c|m3)Xx?hO;?*B#d|zrLWQmdJPe&?^QX?b(gft& zE2z92PE1<@u8%lUyad8~6%Py< z0A9X$zHP#MHfxCqQas|wl}9roTw>S&AWgWE%dxDsWrCC-VE`;)bH)g z>>R&-?J6r23anTx8ooBf=l+`dM7%42 z38G671VIo4K@bE%5dB8(yNRJ=(VM5Pzr;rT5rz#2F?1Xd{;2s)jI^Q4fcvXe(c3?m z@~5bq>B)dlv=94lI_Wj1o+|(WonS43S)l&9Nj;FN`sj000000NkvXXu0mjf&C8D) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..a382ba66ba1a8d1a102d8fcfa21598c0a1142bae GIT binary patch literal 873 zcmV-v1D5=WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{%%vK~#8N?V3$* z577q=v+LqL#2461R{RCe90DcZn9=(`&@TJ^MP@@TrMh-2I zswJeB`cg45(RB2`nQ5skb(h^`ciZQeOm=42?DPEp^RP>pWduPG1kp+O#7Qo?t_NDW z=@}5mUEt(eeQjTu01d-K5i#mS)c|m3)Xx?hO;?*B#d|zrLWQmdJPe&?^QX?b(gft& zE2z92PE1<@u8%lUyad8~6%Py< z0A9X$zHP#MHfxCqQas|wl}9roTw>S&AWgWE%dxDsWrCC-VE`;)bH)g z>>R&-?J6r23anTx8ooBf=l+`dM7%42 z38G671VIo4K@bE%5dB8(yNRJ=(VM5Pzr;rT5rz#2F?1Xd{;2s)jI^Q4fcvXe(c3?m z@~5bq>B)dlv=94lI_Wj1o+|(WonS43S)l&9Nj;FN`sj000000NkvXXu0mjf&C8D) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4cdf7dc401909bd9e4d0aa57df160ddbcdd2bb81 GIT binary patch literal 807 zcmV+?1K9kDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0=!8?K~z{r?Uc`N z5+dGqGYym@bC7B)6EHvbyJ+rLI6c8m&w zfaT>C%uK!^4sLJA>F7RsTXoa=_O2q(Q?XvN9XixUxhukh2^x+KoBhr7NHjrZ$%&3m z9~@+jnXC$EJ(1c%^;{05arUzl&tj{!_WXns_lH(-<-HTPhAViH-V06B_>AUwy7W`{^4nG|NH(L}4#Z^`2y~ZpVK4q61M@LRV5SkX#Bp#1*&EnzXN7e?O=L)zG z8sO%2UQK=Cno%mFR)l@(SOmob&k9C8T^Q`|;?}K6PAB1LBgiDv#N5CWV*{6r4P;_t zXnXk@1MxekRMt=|mO=U9u-KyLwmKYY3>J$ESo~Embtc59W0JZfb3VH1U)!$-36bjAUbjevh0Q2shSxxak$qjN&JC+D*F^8 zkOY^f4XK$ge8}QJB#s}tj%;3so|z)O2NN_k@s{|55h}@ka~?HrbZM~+W@mGHVhLI< zE5qSVF|t(R7_XApl^n9_>XVdtXHOxFh4@eBt;7&9{6PuCzCrA>XX7Gh}K zeN^0|f(W!0U@KU>@3YB`z8#VEH(ezd8KAk)Al>YlZWlEW-muQ5Z|B;LoAjeg#Jz6| z+_HOEg`4tcrmSBTZrU-d^jvKYD^ttPEwJPDcDs>Q=Wls)s~3kDf9i&}w~p=jR%ywp lN;N!lvI6;>1s;*b3=DjSL74G){)!Z!prNOWV@QPi+hdAc3{xHE`!lvI6;>1s;*b3=DjSL74G){)!Z!ppmDGV@QPi+oKD4859K=HgKy{m?efi`}@R@ xLx80@$CtTbcHHUx|DtBeZ`IFdW;hTn$Sfkty77i@LIF@WgQu&X%Q~loCIF5>D=Gj0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..2008e393d1d71ead1ee221a244aa7d9784c0478f GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ptYxqV@QPi+oKz~7z9KdE{cCm`{!bJ^;z)L zMJWjrp7ws%ac5w#SAAu%{^0txJN^d0`e$Vx%M8?L=At(57Dw;xOX636JO)o!KbLh* G2~7Yck2C)O literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..bd4685d5b0ad5582061fdd83a66b2f3fb2483d3a GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ptYxqV@QPi+oOtH3<^9B7aty2V=maA^?60p zf};mDz?KY7;PLqAvgm|hn=3)I)pe}YZu9CxPi^fP)uE`z75pUXO@ GgeCw2xib*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json new file mode 100644 index 0000000000..9ffc003082 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon sprite made by Papermaker48 for SS14, other sprites made by Boaz1111 with that sprite as reference.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8f7c40c4f9d7d43c237ee95c20dc1d2d20891912 GIT binary patch literal 979 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49ppxE{-7;ac}SX`wKft9RKJT=wQ(x;32%V zW1`2C1)cSJv*y_pe(_k;*_rOYk8#~T?)Xl%dtU<<8+Hirg-+0DYo3wubo;xc&0B7_ zm6XrF`L}M;vNzv07=N}gwvL@;!w0k$1$;8DtlPFSykf>moAr17)en`w&-gIkrcOle zsq=MxC!q@W=6#zsP5RBV~^!r-P!vKQZ{_{W9XdZ z@Rr+u;e9jqyTFlD&Ct-Eh7`^RGnOV)aQ?Z%fZ9}=G(|G7(O#^UO%wPD_OVxO1(?^lVn zUwL=hj2Om62XEiL&D}RqZZhWvi*Vk1*SD87l`lD-!gS@jSyOrZyWe)kyE*4bNb%&c z?o(^je`_|K;p%DgS;>ck^GZug7iefV{0gx*&H7Zh@uX-%P0gCueDU+mrFvt8U9P`h zI``H2OK+O0FaMBQlQm7~U<^~nhPLxPyXNorFZW^MKG?6K+IViY{Hy+7rOzKtRp9*h z#{6uJugUf!_txo}+V5GtJ3m_5@%Am=byFW~_sV*Hq-3k*{tYkg?W=pBmOgK1`22gj zv!`mB?R=ZD;gCJI>)%Up500K_Ik}g?Xn~5t50r?(!Z{FqtxH#=@#ZYYLasfpzAkPN zsd@Ef`jn=7QAYcME5$@6WWC?U7Vpt8Dd21F)yMt%zf~OSXWn7?6=8ZO{F#u0as1cs zr{!wa)_lCG&-+ZMVdj7RAFFgFL}&5%Pj?P#KV9_yxOliOw4$3J${}SbS-NZ&Ak6kuskNL*35kItTM1{glVS{{PDs&Q^L`>E-Kaf6o7=M+1|>57p%d+z-AtUBR;dz%Ewv^$#{H lpA86_@ber$Qi%RKymP;0Trb;ohO4b0VNX{-mvv4FO#q##z108! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9b45368663314b7ad36ae0e24e2872bff461d0e5 GIT binary patch literal 997 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49r!YE{-7;ac}RQ_nzV?bNr*Bj%n+bLjqd5 zo>TU)TwQr1czK_!EsNuGzrW1?H1ArMy_$49PmsHDMuyzBKY^0mTib8_@Hu~AlkWL- zzimFhd1L%uT<7&?jUR8y?W~RMy5gCE_96p?F!6OdCSN`H3>hkW4z7H%Q~&%tyN%)# zWfnQC+WpEtU{}Z2ucc{CO{{_6ckZ_v+xKP^SkI zU)}zf#;wG#sC$=n^~#;*R<0a20kNU?uN|DehVjG}&YaRM+l@aJ<{YxIvd^46YmOUV zi2v2luc31%U*35_m*J69!JoZ}!n5bNv8`JC>Sgi=)$0r##*TG0`#u*>-1aYH?Wz#1 zKP3|aqyB!n!SKwEdCRKnufNR{XgQtDQ1-3=&F5END}VQVsNijg-oEPg?r#zgKZ-H% z?pyY6=EjRpcz!*s{`|a_?Z&NJQZuFYXFSWllO}(m^`61i%ahM4Wlz;)*cz3)s}`!QFW7|F7C(J@e;o(dYVq`N027 zlU}y}_qL`+t6%jl^p zdz-IHSf=fZKFIDp+ab5lDtE%EZ8}SGnHEnCo8q-JXxHtfcbx=+JoemY_gGwBUs`Q` zW46lQS4)@HX>dhO{<7$D)I4pD?%w&&?tGb1x%cNvlh-NB1$a_le_vBI^OH!^h5EuK z9zP+by4I*Ujqez5?W}&bx%}Pqcgve!d^KXWkgEB&XjzJ%5W~d>pSPE)I&)ko=D2e` z^8=^D$rA2^p6Og)@)OKeFR@vknyrc)x;qV?>BlbaJfZIX%?Bjz>FVdQ&MBb@063t* Ar~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json new file mode 100644 index 0000000000..2fcf294bc9 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "energy-inhand-left", + "directions": 4 + }, + { + "name": "energy-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..056e6026ac107802ca61d274e1be6aad0ecb67b8 GIT binary patch literal 1132 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucHH@Avjv*CsZ|~mEo*gQ2;G??zt(~gNblrBV z_4WL#m}t1+;=vewmi49KO(8EF1oYd=|1s`;A^%`$T!(^2PF47qZ9DGl;FSzrliZt| zdtKLe>BVDezROjP&%11{c>0#f?EFi6ZhmKe_~*pw*`Mcpp7UKb+#To=EMP~=aXs0> ztQVnI@7`5CniM!~vb|MRzDfIaJ=up}r>Oj?@n~Y)KS!=p`>yzAx6qs&b+NN|Tv+?) zy!@z1^FBmWJCfRx$m3w!T0^WI}wN?7w^OGpZa<%kR#P?~QpJX4U!ic;2<8_kWgc zRgIc8_p8{A()X5F(gJp&TMj?(R2Q@DGyUbU_p*#w{_dmqz8sc1{rtW-7whG9+qP~^ zJym0;KheWw)6F%R=0)e~cCQl8-&$f7+xb)Daqchv{y7`3Ed9v2`|F08GbK+xEm}6u zYw3|qI>Ga!qYP7b&llb^zv`o(zyIu@9r&I9?I%1uU#&re|UX2p?qhU^2e~>3y&67zulBt za?IRFGyna&e|{G-_RNZ__xJjd{3O0t<-5yzzn{2oy!GJqeZtmfFN^78glmS_ a#QzMkK{F5CPWvbVlJ#`;b6Mw<&;$TNav+HS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d5933b2f698b070a7724cce6b2071f83ef4f2907 GIT binary patch literal 1147 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucH3FV4jv*CsZ|~mEo*gQ2;G_D*umANzIMm0j~N<^Y;2Do z`Cl{NLbmem)oW|2_4oMP_%>_XEW5c@>&%YZiM+q`{gZQ6M2+42pQjJr$=hzJ<+c2> zQ2+7UpEL#d+Na)sZ$8mOM@;+v^VXH!ug;yfzq;rB$B%_uckH;a<o518zt;2Z3wZbc^299We~q z+1Y&Y4^*|^y_4Pa%cT8v{OYfBUI<>_x?aWp|4g5{zl;BT^K`lPSo_hNB9AQ9n-dyW zOn3M&<&=GxkPPps#IQec>2doOxUu=465qJ{QRvb7_otsfIkWO$n}}nq{tE5~VO7EF z=E!Y+H1){cn%bvey4|_Nx_}0C|;=BENO)+}u zN)z+n>z`EJzdg~vao0uGg4?zWnihV3_2aj9>2IZwpIFfXVMFVG5Sg-w4RrU1iid(l%MJ4Z?8JquK-9fj? zDSPd+OO{*DZI=G4eLzOe!~Wmb(=EK$Cv{n66!pK#V#ks`unH}h*!1w^r+vRe`*XMG z|KFUEx=;7+lEC*<-+!%Ao$7V+!i9HwkA4^Kz8e<3Q+@y4Dc}CfzOYI=s=9aY-e(!% zn?L2gOn9~TQ|auJDQlECSeU~8pE=WW^<8Q5zhx@#j^>6lEbXlSepb^{MJO!3^Z4V5 zFJEQ~+pd-TX;y0R)#1%uhDwz^zh_kEy;w5mcadY=-hX`-`t^D{^X;acDGQrtQ=>4i zG48hCzoMeMF08Fe_4+1?-zR7Pes=rmiCMy~Vq#)a^YSmVZ7~tJ_s2f;ez5rA#b??| zs(-m|xBdI~+LPOr_K9=9ul=$t#?n@;(*4}4=w5O4ZNi_|dhxrQvHjo^pJkQEUO4yr zTc>*mFZ`UfbBj{^^32(fCf(2G?cn5J!oD~->=1kFp6r)PYWQ8%_rxC!f4zNo+1c$+ pMYo&(^owV8*Nw*r(F+<%{~0#~HXL$x+kF)z>*?y}vd$@?2>=$cCIbKf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png new file mode 100644 index 0000000000000000000000000000000000000000..4db201c77cb1642fc0edc27a878319a164e6d7ed GIT binary patch literal 340 zcmV-a0jvIrP)H-l5#UHSA2d zh#TS=Ok63Q(xws`I#bZi%!cxp_mu$CylEQo&&pG7-blID+eckLe+sa{+uf>w15&nB z2pXWnU9b>E4-poEMW6s)_!qzyK#+)Nz#!ZPtA2Z;B2r#LCH6-%s!HV}Fck$DnLUKR z4`(=^4G@^8FbS9n*QLi)MACm?j$!}<7{CAqFn|WAO6Y#B9bYeSY!Lvo)2^+$b)RXs zDsZ_zrx&R0{q~w?JrG26y+5;iX7=dtXuy&c4G292Hzv#;1qdQck;2h{076j1Nq{i~ mHJl9a5pGPZq^}?)*wzO;*Qe?u`>1080000