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 2356e4578d..c6be930514 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png differ