From f76c0f650c9f79243ddfd7335077d8374387ad92 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 17 Nov 2024 15:28:03 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Honk/Catalog/Cargo/cargo_service.yml | 20 --------------- .../_Honk/Catalog/Fills/Crates/security.yml | 23 ----------------- .../_Honk/Entities/Ghosts/custom_ghosts.yml | 8 ++++++ .../Entities/Objects/Misc/implanters.yml | 7 +++++ .../Objects/Misc/subdermal_implants.yml | 9 +++++++ .../Weapons/Guns/Ammunition/Boxes/shotgun.yml | 13 ---------- .../Guns/Ammunition/Cartridges/shotgun.yml | 18 ------------- .../Guns/Ammunition/Projectiles/shotgun.yml | 16 ------------ .../Weapons/Guns/Shotguns/shotguns.yml | 24 ------------------ Resources/Prototypes/_Honk/tags.yml | 8 ------ .../Prototypes/_White/Catalog/Cargo/cargo.yml | 20 +++++++++++++++ .../_White/Catalog/Fills/Crates/security.yml | 23 +++++++++++++++++ .../Guns/Battery/disabler.rsi/base.png | Bin 523 -> 559 bytes 13 files changed, 67 insertions(+), 122 deletions(-) delete mode 100644 Resources/Prototypes/_Honk/Catalog/Fills/Crates/security.yml create mode 100644 Resources/Prototypes/_Honk/Entities/Ghosts/custom_ghosts.yml create mode 100644 Resources/Prototypes/_Honk/Entities/Objects/Misc/implanters.yml create mode 100644 Resources/Prototypes/_Honk/Entities/Objects/Misc/subdermal_implants.yml delete mode 100644 Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml delete mode 100644 Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml delete mode 100644 Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml delete mode 100644 Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml create mode 100644 Resources/Prototypes/_White/Catalog/Fills/Crates/security.yml diff --git a/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_service.yml index 6d002bad22..b74102b574 100644 --- a/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_service.yml @@ -37,23 +37,3 @@ cost: 1500 category: cargoproduct-category-name-service group: market - -- type: cargoProduct - id: ServiceBoxesResinShot - icon: - sprite: Objects/Storage/boxes.rsi - state: shellresin - product: CrateBoxesResinShot - cost: 3000 - category: cargoproduct-category-name-armory - group: market - -- type: cargoProduct - id: ServiceResinShotgun - icon: - sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump.rsi - state: icon - product: CrateResinShotgun - cost: 4000 - category: cargoproduct-category-name-armory - group: market diff --git a/Resources/Prototypes/_Honk/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/_Honk/Catalog/Fills/Crates/security.yml deleted file mode 100644 index db99d30060..0000000000 --- a/Resources/Prototypes/_Honk/Catalog/Fills/Crates/security.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: entity - id: CrateBoxesResinShot - parent: CrateWeaponSecure - name: коробки с резинововой дробью - description: много букав, лень читать - components: - - type: StorageFill - contents: - - id: BoxResinShot - amount: 3 - -- type: entity - id: CrateResinShotgun - parent: CrateWeaponSecure - name: травматический дробовик - description: Пиу пиу, чтобы не убить. @СБ Стетхем - components: - - type: StorageFill - contents: - - id: WeaponResinShotgun - amount: 1 - - id: BoxResinShot - amount: 2 diff --git a/Resources/Prototypes/_Honk/Entities/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_Honk/Entities/Ghosts/custom_ghosts.yml new file mode 100644 index 0000000000..35c0c72650 --- /dev/null +++ b/Resources/Prototypes/_Honk/Entities/Ghosts/custom_ghosts.yml @@ -0,0 +1,8 @@ +#DEN4IK_64 +- type: customGhost + id: den4ik_64-ghost + ckey: DEN4IK__64 + sprite: White/Ghosts/DEN4IK_64-ghost.rsi + alpha: 0.9 + ghostName: Никелевый камушек + ghostDescription: Этот камушек имеет талант, знаешь что я тебе за это дам??? diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_Honk/Entities/Objects/Misc/implanters.yml new file mode 100644 index 0000000000..0a8c698682 --- /dev/null +++ b/Resources/Prototypes/_Honk/Entities/Objects/Misc/implanters.yml @@ -0,0 +1,7 @@ +- type: entity + id: GenderSwapImplanter + name: gender swap implanter + parent: BaseImplantOnlyImplanter + components: + - type: Implanter + implant: GenderSwapImplant diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_Honk/Entities/Objects/Misc/subdermal_implants.yml new file mode 100644 index 0000000000..d4bf97546c --- /dev/null +++ b/Resources/Prototypes/_Honk/Entities/Objects/Misc/subdermal_implants.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseSubdermalImplant + id: GenderSwapImplant + name: Gender Swap Implant + description: This swaps the users gender on activation. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionActivateGenderSwapImplant diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml deleted file mode 100644 index fecd091ab3..0000000000 --- a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Shotgun Shells -- type: entity - name: коробка резиновой дроби - parent: AmmoProviderShotgunShell - id: BoxResinShot - description: A dispenser box full of beanbag shots, designed for riot shotguns. - components: - - type: BallisticAmmoProvider - proto: ShellShotgunResinShot - - type: Sprite - layers: - - state: boxwide - - state: shellresin diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml deleted file mode 100644 index 93ca13506c..0000000000 --- a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - id: ShellShotgunResinShot - name: ружейный патрон (.49 резиновая дробь) - parent: BaseShellShotgun - components: - - type: Tag - tags: - - ShellResinShotgun - - type: Sprite - layers: - - state: resin - map: [ "enum.AmmoVisualLayers.Base" ] - - type: CartridgeAmmo - proto: PelletShotgunResinShot - count: 4 - spread: 7 - - type: SpentAmmoVisuals - state: "resin" diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml deleted file mode 100644 index 88a0e69f8d..0000000000 --- a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - id: PelletShotgunResinShot - name: резиновая дробь (.49) - noSpawn: true - parent: [BaseBullet, BaseBulletTrail] - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot - - type: Projectile - damage: - types: - Blunt: 1 - - type: StaminaDamageOnCollide - ignoreResistances: false - damage: 22 diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml deleted file mode 100644 index c74b6c0568..0000000000 --- a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ /dev/null @@ -1,24 +0,0 @@ -- type: entity - name: травматический дробовик - parent: BaseWeaponShotgun - id: WeaponResinShotgun - description: Вот что выходит, когда старый дизайн Ремингтона соединяется с современными материалами. Модифицирован под миротворческие нужны Службы Безопасности. Использует патроны калибра .49 ружейный. - components: - - type: Item - size: Normal - shape: - - 0,0,4,0 - sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi - - type: Sprite - sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump.rsi - - type: Clothing - sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi - - type: BallisticAmmoProvider - proto: ShellShotgunResinShot - capacity: 6 - whitelist: - tags: - - ShellResinShotgun - - type: Tag - tags: - - WeaponResinShotgun diff --git a/Resources/Prototypes/_Honk/tags.yml b/Resources/Prototypes/_Honk/tags.yml index d1413f9793..46a0d634e8 100644 --- a/Resources/Prototypes/_Honk/tags.yml +++ b/Resources/Prototypes/_Honk/tags.yml @@ -16,11 +16,3 @@ - type: Tag id: EnergyCellMakeshift -- type: Tag - id: WeaponResinShotgun - -- type: Tag - id: MagazineResinShotgun - -- type: Tag - id: ShellResinShotgun diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index ce6b19814d..798b993839 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -276,3 +276,23 @@ cost: 10000 category: Security group: market + +- type: cargoProduct # WD ahead of wd upstream + id: cargoBoxesRubberShot + icon: + sprite: Objects/Storage/boxes.rsi + state: shellRubber + product: CrateBoxesRubberShot + cost: 3000 + category: cargoproduct-category-name-armory + group: market + +- type: cargoProduct + id: cargoRubberShotgun + icon: + sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump.rsi + state: icon + product: CrateRubberShotgun + cost: 4000 + category: cargoproduct-category-name-armory + group: market diff --git a/Resources/Prototypes/_White/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/_White/Catalog/Fills/Crates/security.yml new file mode 100644 index 0000000000..12e2a10557 --- /dev/null +++ b/Resources/Prototypes/_White/Catalog/Fills/Crates/security.yml @@ -0,0 +1,23 @@ +- type: entity # WD ahead of wd upstream + id: CrateBoxesRubberShot + parent: CrateWeaponSecure + name: ящик с коробками резиновой дроби + description: Ящик с четырьмя коробками резиновой дроби. + components: + - type: StorageFill + contents: + - id: BoxRubberShot + amount: 4 + +- type: entity + id: CrateRubberShotgun + parent: CrateWeaponSecure + name: ящик с травматическим дробовиком + description: Ящик с травматическим дробовиком и двумя коробками с резиновой дробью. + components: + - type: StorageFill + contents: + - id: WeaponRubberShotgun + amount: 1 + - id: BoxRubberShot + amount: 2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png index 2356e4578d080ed2c9c0aada76b0306efcbe4e98..c6be930514878e73a8af408d121ce0c7f041fbd6 100644 GIT binary patch delta 522 zcmV+l0`>ii1g`{;Fn<69XF*Lt006O%3;baP00009a7bBm000ie000ie0hKEb8vp}xjb#1T&R=r70UW&DHse8_M6R?YGxPj zic~5;aW8soTn$0nJl=6;*OdlSElR!4t^Rx^L2maL(`YnI=}cM|)3gHu1V25Sph)DN zHa6GUny3m+wSQeQ;xLt_%u$MVcK7(oH^W@}VBa5gxmciuV<%OsFErwGkWy1vQjJEF z+U+)}oerJfK2W((phBhAqaUqT@=f{Z^6HwZ&y@r2oMCzdATSf^UOco?fR+ld{uW!J z_iUCNiG-ozo11*DC!S>j07-~*6qFu|Hr#MH#eTp)&41Q$FT5U4R{=VR@7d%Bmd_9% zIGjN-j6gsPB&k&lGb|H8mAH6#4M+lxQ4Okw4aFR`*wd=8xw{@Lj{phaE#uOO%FG=8 z7Sj%h>IH)i4onk3K)iQR{a;{t2aNuJgT%6(+W)|y+b@wwBt%4?MaUCu=p;P!00000 MNkvXXt^-0~f=Q?4j{pDw delta 485 zcmVv1nlhlqz|53`3lL$za~P%o0-Wxkm&^Zn0oe*S%l zf`WpAk504ElFdd-nslG?E_e63`r^$^On(qsYG3yQ3D6&eR)3cKWowg*U%!p^GXv=E zb)~oN>3tXuwCq+rS*y8t>mEX+nR0X$5#Qb!eOSiRN1Bb6bSh;4lF@iZKT49U>i`Im zV%sHzNC^U;-f8cN&)gO$=Rba~u(5H?&Ta=lXB7lK(^WEYeAMIg#>0IF>9 z?H%8?Ar>joRez*|g2`L}T>eS;d_U&za(QM2xCldI#WGs}lU^&?woCe4h?ME`ht042 zJ3C{s-8QbaU3xOWuMR*3q57zZhmlqH1KA&hmRt3tyS55U=Az;_dWA^^<6&g<^{N@L z?UFY3JbQ&IuhN;mF|m;MLER7J&Ta>%Ql{cK2$2#GBVNm`dQylKx9Z7w7+FH3S~tBa z`6c_gEvWl}tkqnS(U?(^G&M00000NkvXXu0mjf6_fJu