From 865810c6e122cb2f4f8eb601c17bf9b84690f890 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:17:35 -0500 Subject: [PATCH] New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903) * New Sprites for Tranq * Add consistancy to secfab print --- .../Weapons/Guns/Ammunition/Boxes/shotgun.yml | 2 +- .../Guns/Ammunition/Cartridges/shotgun.yml | 6 +++--- .../Entities/Structures/Machines/lathe.yml | 6 +++--- .../Prototypes/Recipes/Lathes/security.yml | 16 ++++++++-------- Resources/Prototypes/Research/arsenal.yml | 2 +- .../Objects/Storage/boxes.rsi/meta.json | 11 +++++++---- .../Storage/boxes.rsi/shelltranquilizer.png | Bin 0 -> 266 bytes .../Casings/shotgun_shell.rsi/meta.json | 6 ++++++ .../shotgun_shell.rsi/tranquilizer-spent.png | Bin 0 -> 450 bytes .../Casings/shotgun_shell.rsi/tranquilizer.png | Bin 0 -> 425 bytes 10 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index 63ad52c032..063937aee9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -126,4 +126,4 @@ - type: Sprite layers: - state: boxwide - - state: shellslug + - state: shelltranquilizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index e26c4e9540..57b95cb901 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseShellShotgun name: shell (.50) parent: BaseCartridge @@ -114,7 +114,7 @@ components: - type: Sprite layers: - - state: practice + - state: tranquilizer map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo proto: PelletShotgunTranquilizer @@ -129,7 +129,7 @@ - type: SolutionTransfer maxTransferAmount: 7 - type: SpentAmmoVisuals - state: "practice" + state: "tranquilizer" - type: entity id: ShellShotgunImprovised diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 537c42346e..ab3cf20ac3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -334,6 +334,7 @@ - BoxBeanbag - BoxShotgunIncendiary - BoxShotgunUranium + - BoxShellTranquilizer - ExplosivePayload - GrenadeBlast - GrenadeEMP @@ -361,7 +362,6 @@ - PowerCageHigh - PowerCageMedium - PowerCageSmall - - ShellTranquilizer - SpeedLoaderMagnumIncendiary - SpeedLoaderMagnumUranium - TelescopicShield @@ -747,6 +747,7 @@ - BoxBeanbag - BoxShotgunIncendiary - BoxShotgunUranium + - BoxShellTranquilizer - ExplosivePayload - FlashPayload - GrenadeBlast @@ -774,7 +775,6 @@ - PowerCageHigh - PowerCageMedium - PowerCageSmall - - ShellTranquilizer - ShuttleGunDusterCircuitboard - ShuttleGunFriendshipCircuitboard - ShuttleGunPerforatorCircuitboard @@ -828,6 +828,7 @@ - BoxLethalshot - BoxShotgunFlare - BoxShotgunSlug + - BoxShellTranquilizer - MagazineBoxLightRifle - MagazineBoxMagnum - MagazineBoxPistol @@ -841,7 +842,6 @@ - MagazineShotgun - MagazineShotgunEmpty - MagazineShotgunSlug - - ShellTranquilizer - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty - type: MaterialStorage diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 1efbd3b42d..1e6b70f943 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -139,16 +139,16 @@ Steel: 100 - type: latheRecipe - id: ShellTranquilizer - result: ShellTranquilizer + id: BoxShellTranquilizer + result: BoxShellTranquilizer category: Ammo - completetime: 4 + completetime: 5 materials: - Plastic: 15 - Steel: 10 - Glass: 5 - Plasma: 10 - Silver: 5 + Plastic: 240 + Steel: 160 + Glass: 80 + Plasma: 160 + Silver: 80 - type: latheRecipe id: TargetHuman diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 97b0c1e82b..5a55a34cdf 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -58,7 +58,7 @@ cost: 5000 recipeUnlocks: - MagazineShotgunBeanbag - - ShellTranquilizer + - BoxShellTranquilizer - BoxBeanbag - WeaponDisabler diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 788c43845c..f30d9c9ae7 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -35,7 +35,7 @@ "name": "sechud" }, { - "name": "bottle" + "name": "bottle" }, { "name": "box" @@ -155,12 +155,12 @@ "name": "writing_of_doom" }, { - "name": "headset" + "name": "headset" }, { "name": "encryptokey" - }, - { + }, + { "name": "inhand-left", "directions": 4 }, @@ -200,6 +200,9 @@ { "name": "shelluranium" }, + { + "name": "shelltranquilizer" + }, { "name": "shelltoy" }, diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png new file mode 100644 index 0000000000000000000000000000000000000000..96990098bfd2199eff0defdc0fb385efdf20e941 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7eVe z#W5tJHTlo~|MrI+n3geat-Zpym`|egzzSwJS%X&%2OltqC5dcQQ~w|S^-D^DRY61I zv+wVD_CG(DsuI>S;U=>j6Hs{pyTDYAt>@+>PN?}c&VUn)E2mB{x5?GSF(mr5e%JlDj^ScR$FjFI8e%G+hNv-IVY zEA^=XJBx{jn3>f&E@rqa z3^-64`_6mmiHA`P4LN4NO>chQbK+scJw*{gqnSQ0n7?1X5Y>2pMg1qsK1M?YHkTFr q+TO~FO-%Luz@X<#jqptK^<~fkvN?bl1TFbCX( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png new file mode 100644 index 0000000000000000000000000000000000000000..9eaa42de8440c5dde25c427a0076a49e4d40010c GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq~J{ z)5S3)qV?@Gdym5oBJK4PQ`XI1y@bWnWbzJ+mkLE&vyXQ@G1J_!a)+h$&eWGrDt5O| zez)*>*a}4ji=CwfmmXTSOnWrtv@3TJ|Ggsi@3ni%|H~*HGD=QeS)!f5x~4%i!{@=< zW#39~^&I#i_v1{K=L~L}H^PhfK2*f57D{6>{&7oAptNE4>!LUMEH>vdyY;+&{0_d^ z_Et7wN~Y(I(ud2}iY?pMzxlMt_V)8nk7zKjvy+*-bqgy{>Ei2$uYBJ)YuSn4wJt~X zj_Ir4Dqvs`4D~bj%n0_fn&g{$T;GqCm~?!9{~J5XV|Q2gPAb?56{o+eiqNLcKgQe1IhhM`QuH8}^3 zBWq+iS`D=JhH=*!|2tWn1M;3hN51{#?QfF%S^|L~%$FMBnda-upao=e05J$$3Z4w2 NJYD@<);T3K0RWkEtX%*A literal 0 HcmV?d00001 -- 2.51.2