From 796f6f10ea7891093ccc1e7e9847fcfbb7a41cbb Mon Sep 17 00:00:00 2001 From: Wizard-Grin <100096262+Wizard-Grin@users.noreply.github.com> Date: Mon, 31 Jul 2023 03:51:17 +0300 Subject: [PATCH 1/3] big salvage and miners update --- .../Salvage/SalvageSystem.Expeditions.cs | 2 +- Content.Shared/CCVar/CCVars.cs | 2 +- .../Weapons/Guns/Gunshots/plasma_cutter.ogg | Bin 0 -> 12978 bytes .../catalog/fills/boxes/general.ftl | 6 ++ .../catalog/fills/boxes/medical.ftl | 6 ++ .../catalog/fills/crates/salvage.ftl | 6 ++ .../objects/specific/cargo/cargo_pallet.ftl | 6 ++ .../objects/specific/medical/hypospray.ftl | 3 + .../objects/specific/salvage/ore_bag.ftl | 3 + .../weapons/guns/battery/battery_guns.ftl | 6 ++ .../entities/objects/weapons/melee/sword.ftl | 6 ++ .../Prototypes/Catalog/Cargo/cargo_cargo.yml | 20 ++++ .../Catalog/Fills/Boxes/general.yml | 22 +++++ .../Catalog/Fills/Boxes/medical.yml | 22 +++++ .../Catalog/Fills/Crates/salvage.yml | 29 ++++++ .../Objects/Specific/Medical/hypospray.yml | 37 +++++++ .../Objects/Specific/Salvage/ore_bag.yml | 26 +++++ .../Weapons/Guns/Battery/battery_guns.yml | 38 ++++++- .../Weapons/Guns/Projectiles/projectiles.yml | 24 +++++ .../Entities/Objects/Weapons/Melee/sword.yml | 40 ++++++++ .../Prototypes/Procedural/salvage_rewards.yml | 4 +- .../Specific/Medical/medipen.rsi/luxpen.png | Bin 0 -> 287 bytes .../Medical/medipen.rsi/luxpen_empty.png | Bin 0 -> 303 bytes .../Specific/Medical/medipen.rsi/meta.json | 6 ++ .../ore_bag_bluespace.rsi/equipped-BELT.png | Bin 0 -> 1000 bytes .../Mining/ore_bag_bluespace.rsi/icon.png | Bin 0 -> 1688 bytes .../ore_bag_bluespace.rsi/inhand-left.png | Bin 0 -> 969 bytes .../ore_bag_bluespace.rsi/inhand-right.png | Bin 0 -> 921 bytes .../Mining/ore_bag_bluespace.rsi/meta.json | 35 +++++++ .../Objects/Storage/boxes.rsi/dna.png | Bin 0 -> 210 bytes .../Objects/Storage/boxes.rsi/heart_black.png | Bin 0 -> 189 bytes .../Objects/Storage/boxes.rsi/meta.json | 6 ++ .../Weapons/Guns/Battery/cutter.rsi/icon.png | Bin 0 -> 1065 bytes .../Guns/Battery/cutter.rsi/inhand-left.png | Bin 0 -> 1060 bytes .../Guns/Battery/cutter.rsi/inhand-right.png | Bin 0 -> 1052 bytes .../Weapons/Guns/Battery/cutter.rsi/meta.json | 22 +++++ .../Guns/Battery/cutteradv.rsi/icon.png | Bin 0 -> 895 bytes .../Battery/cutteradv.rsi/inhand-left.png | Bin 0 -> 1059 bytes .../Battery/cutteradv.rsi/inhand-right.png | Bin 0 -> 1062 bytes .../Guns/Battery/cutteradv.rsi/meta.json | 22 +++++ .../Projectiles/projectiles.rsi/meta.json | 3 + .../projectiles.rsi/scatterlaser.png | Bin 0 -> 211 bytes .../Weapons/Melee/katana_cursed.rsi/icon.png | Bin 0 -> 1100 bytes .../Melee/katana_cursed.rsi/inhand-left.png | Bin 0 -> 1880 bytes .../Melee/katana_cursed.rsi/inhand-right.png | Bin 0 -> 1727 bytes .../Melee/katana_cursed.rsi/katana-shard.png | Bin 0 -> 485 bytes .../Weapons/Melee/katana_cursed.rsi/meta.json | 93 ++++++++++++++++++ 47 files changed, 490 insertions(+), 5 deletions(-) create mode 100644 Resources/Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/luxpen.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/luxpen_empty.png create mode 100644 Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/dna.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/heart_black.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cutter.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cutter.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cutteradv.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cutteradv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/katana-shard.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/meta.json diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs index fb49773cadf6a8..39452babe53d23 100644 --- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs +++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs @@ -19,7 +19,7 @@ public sealed partial class SalvageSystem * Handles setup / teardown of salvage expeditions. */ - private const int MissionLimit = 3; + private const int MissionLimit = 5; private readonly JobQueue _salvageQueue = new(); private readonly List<(SpawnSalvageMissionJob Job, CancellationTokenSource CancelToken)> _salvageJobs = new(); diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 1ad7de0d0837e3..b3e7768fe99343 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1450,7 +1450,7 @@ public static readonly CVarDef /// Cooldown for successful missions. /// public static readonly CVarDef - SalvageExpeditionCooldown = CVarDef.Create("salvage.expedition_cooldown", 300f, CVar.REPLICATED); + SalvageExpeditionCooldown = CVarDef.Create("salvage.expedition_cooldown", 150f, CVar.REPLICATED); public static readonly CVarDef SalvageExpeditionFailedCooldown = CVarDef.Create("salvage.expedition_failed_cooldown", 900f, CVar.REPLICATED); diff --git a/Resources/Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg b/Resources/Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg new file mode 100644 index 0000000000000000000000000000000000000000..70fda591a1459132f9380f2307bc4dafc60b1286 GIT binary patch literal 12978 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%0D)Is~V<`kRLw4^gBj2ziB(^d(F?!PBSq3$=IL6LE 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl index 87575e9df9fcd2..778fd7e3d370bd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl @@ -76,3 +76,9 @@ ent-BoxEncryptionKeySyndie = коробка ключей шифрования с ent-BoxDeathRattleImplants = коробка имплантатов предсмертнохрип .desc = Шесть имплантатов предсмертнохрип и глобальных систем позиционирования для всего отряда. .suffix = { "" } +ent-BoxArtifactMiners = коробка шахтерского артефакта + .desc = Содержит в себе артефакты добытые шахтерами. + .suffix = { "" } +ent-BoxCursedKatana = коробка с проклятой катаной + .desc = Содержит в себе ужасающий осколок неизвестного происхождения. + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl index 6069ae56ddfc04..6eae5fd4a239be 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl @@ -22,3 +22,9 @@ ent-BoxMouthSwab = коробка стерильных палочек ent-BoxBodyBag = коробка мешков для тел .desc = Содержит мешки для тел. .suffix = { "" } +ent-BoxCardboardMedPens = коробка с медпенами + .desc = Содержит различные медпены. + .suffix = { "" } +ent-Boxluxmedpen = коробка с роскошными медпенами + .desc = Содержит роскошные медпены, для крайне тяжелых травм. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl index dae805a959c348..b95736478bacf4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl @@ -13,3 +13,9 @@ ent-CratePartsT3T4 = ящик деталей 3/4 уровня ent-CratePartsT4 = ящик деталей 4 уровня .desc = Содержит 5 случайных деталей 4 уровня для улучшения оборудования. .suffix = { "" } +ent-CrateMinerEquipment = ящик шахтерских инструментов + .desc = Содержит набор инструментов для двух шахтеров + .suffix = Заполненный +ent-CrateMinerAdvancedEquipment = ящик продвинутых шахтерских инструментов + .desc = Содержит набор продвинутых инструментов для двух шахтеров + .suffix = Заполненный \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl index 66ac3f71a70d75..abb321c3f0e415 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl @@ -1,3 +1,9 @@ ent-CargoPallet = грузовой поддон .desc = Определяет предметы для продажи Центкому при отзыве шаттла. .suffix = { "" } +ent-CargoCrateMinerEquipment = ящик шахтерских инструментов + .desc = Содержит набор инструментов для двух шахтеров + .suffix = { "" } +ent-CargoCrateMinerAdvancedEquipment = ящик продвинутых шахтерских инструментов + .desc = Содержит набор продвинутых инструментов для двух шахтеров + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl index 74a29f6287b159..f06c975501d54b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -31,3 +31,6 @@ ent-Hypopen = ручка ent-HypopenBox = коробка с гипоручкой .desc = Небольшая коробка, содержащая гипоручку. Упаковка распадается при вскрытии, не оставляя после себя никаких улик. .suffix = { "" } +ent-Luxurymedpen = роскошный медпен + .desc = Содержит смесь химических веществ, способных поднять буквально с того света. + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/salvage/ore_bag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/salvage/ore_bag.ftl index 87c0efd75b4c6c..f03141a748df3c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/salvage/ore_bag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/salvage/ore_bag.ftl @@ -1,3 +1,6 @@ ent-OreBag = мешок для руды .desc = Прочная сумка для утилизаторов и шахтеров для переноски больших объемов руды. .suffix = { "" } +ent-OreBagBluespace = бездонный мешок для руды + .desc = Прочная сумка для утилизаторов и шахтеров для переноски ОЧЕНЬ больших объемов руды. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl index 086b8619888449..c7b77be3ec6385 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -52,3 +52,9 @@ ent-MiniatureEnergyCrossbow = энергетический мини арбале ent-WeaponBehonkerLaser = глаз бехонкера .desc = Глаз бехонкера, стреляет лазером при сжатии. .suffix = { "" } +ent-WeaponCutter = ионный резак + .desc = Инструмент шахтеров, предназначенный для расчистки горных пород. + .suffix = { "" } +ent-WeaponCutterAdv = улучшенный ионный резак + .desc = Инструмент шахтеров, предназначенный для расчистки горных пород. Обладает усовершенствованной батареей и усиленной концентрирующей линзой. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl index 2a6c2a6cf78e04..516154fc4e8aaa 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl @@ -13,3 +13,9 @@ ent-Claymore = клеймор ent-Cutlass = катлас .desc = Язвительно изогнутый клинок, часто встречающийся в руках космических пиратов. .suffix = { "" } +ent-Katanacursed = проклятая катана + .desc = Проклятая катана. Результат работы дворфов. Осквернена душами убитых. + .suffix = { "" } +ent-KatanacursedShard = проклятый осколок + .desc = Загадочный осколок, созданный неизвестным существом. + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index 97df4bef181e1e..1f737d377ca426 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -6,4 +6,24 @@ product: CargoPallet cost: 250 category: Cargo + group: market + +- type: cargoProduct + id: CargoCrateMinerEquipment + icon: + sprite: Objects/Weapons/Guns/Battery/cutter.rsi + state: icon + product: CrateMinerEquipment + cost: 7500 + category: Cargo + group: market + +- type: cargoProduct + id: CargoCrateMinerAdvancedEquipment + icon: + sprite: Objects/Weapons/Guns/Battery/cutteradv.rsi + state: icon + product: CrateMinerAdvancedEquipment + cost: 12500 + category: Cargo group: market \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index a96b8ba95e108f..d9780dbed2d1b2 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -414,3 +414,25 @@ layers: - state: box - state: syringe + +- type: entity + name: miner artifact + parent: BoxCardboard + id: BoxArtifactMiners + description: This box is filled with mousetraps. Try not to get your hand stuck in one. + components: + - type: Sprite + layers: + - state: box_of_doom + - state: heart_black + +- type: entity + name: box of magazines + parent: BoxArtifactMiners + id: BoxCursedKatana + description: A box full of medpens. + components: + - type: StorageFill + contents: + - id: KatanacursedShard + - id: ClothingOuterDogi \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index 4a352b49903a8b..077832c3499ae5 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -119,3 +119,25 @@ whitelist: tags: - BodyBag + +- type: entity + name: box of magazines + parent: BoxCardboard + id: BoxCardboardMedPens + description: A box full of medpens. + components: + - type: Sprite + layers: + - state: box_of_doom + - state: dna + +- type: entity + name: box of lux medpens + parent: BoxCardboardMedPens + id: Boxluxmedpen + description: A box full of medpens. + components: + - type: StorageFill + contents: + - id: Luxurymedpen + amount: 6 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 9e83e1eec0e7b2..a5e9486ba311f5 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -146,3 +146,32 @@ contents: - id: SalvagePartsT4Spawner amount: 5 + +- type: entity + id: CrateMinerEquipment + name: "mining" + description: For the daring. + suffix: Filled + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: WeaponCutter + amount: 2 + - id: OreBagBluespace + amount: 2 + +- type: entity + id: CrateMinerAdvancedEquipment + name: "mining advanced" + description: For the daring. + suffix: Filled + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: WeaponCutterAdv + amount: 2 + - id: OreBagBluespace + amount: 2 + diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index f218fca657f66c..7ee8e748847d18 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -277,3 +277,40 @@ - id: Hypopen sound: path: /Audio/Effects/unwrap.ogg + +- type: entity + name: Luxury Medipen + parent: ChemicalMedipen + id: Luxurymedpen + description: Contains enough stimulants for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: luxpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: Item + sprite: Objects/Specific/Medical/medipen.rsi + size: 5 + - type: SolutionContainerManager + solutions: + pen: + maxVol: 34 + reagents: + - ReagentId: Epinephrine + Quantity: 15 + - ReagentId: Ichor + Quantity: 15 + - ReagentId: TranexamicAcid + Quantity: 4 + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: luxpen_empty + - type: Hypospray + solutionName: pen + transferAmount: 30 + - type: StaticPrice + price: 500 + - type: Tag + tags: [] diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml index a2afb788e324a9..2632bce655434f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml @@ -22,3 +22,29 @@ tags: - Ore - type: Dumpable + +- type: entity + name: ore bag bluespace + id: OreBagBluespace + parent: BaseStorageItem + description: A robust bag for salvage specialists and miners alike to carry large amounts of ore. + components: + - type: Sprite + sprite: Objects/Specific/Mining/ore_bag_bluespace.rsi + state: icon + - type: Clothing + sprite: Objects/Specific/Mining/ore_bag_bluespace.rsi + quickEquip: false + slots: + - belt + - type: Item + size: 176 + - type: Storage + capacity: 2400 + quickInsert: true + areaInsert: true + areaInsertRadius: 14 + whitelist: + tags: + - Ore + - type: Dumpable \ No newline at end of file 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 f9e5e7e5a3ef3e..c475d2db5b4a33 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -485,4 +485,40 @@ - type: MagazineVisuals magState: mag steps: 5 - zeroVisible: true \ No newline at end of file + zeroVisible: true + +- type: entity + name: Cutter + parent: BaseWeaponBatterySmall + id: WeaponCutter + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/cutter.rsi + state: icon + - type: Gun + fireRate: 6 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletCutter + fireCost: 10 + - type: Appearance + +- type: entity + name: Advanced Cutter + parent: BaseWeaponBatterySmall + id: WeaponCutterAdv + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/cutteradv.rsi + state: icon + - type: Gun + fireRate: 8 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletCutter + fireCost: 5 + - type: Appearance \ 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 57a80c20a67ed9..4e058b512efe5d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -770,3 +770,27 @@ lifetime: 0.4 - type: StaminaDamageOnCollide damage: 65 + +- type: entity + id: BulletCutter + name: Cutter bolt + parent: BaseBullet + noSpawn: true + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + layers: + - state: scatterlaser + - type: GatheringProjectile + - type: Projectile + damage: + types: + Heat: 0.5 + # Short lifespan + - type: TimedDespawn + lifetime: 0.4 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 3ced854c5a01ae..0e2e21f4f1832b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -123,3 +123,43 @@ size: 15 sprite: Objects/Weapons/Melee/cutlass.rsi - type: DisarmMalus + +- type: entity + name: Cursed katana + parent: BaseItem + id: Katanacursed + description: Ancient craftwork made with not so ancient plasteel. + components: + - type: Sharp + - type: Unremoveable + - type: Tag + tags: + - Katana + - type: Sprite + sprite: Objects/Weapons/Melee/katana_cursed.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 35 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/katana_cursed.rsi + - type: DisarmMalus + +- type: entity + parent: BaseItem + id: KatanacursedShard + name: Strange shard + description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/katana_cursed.rsi + state: katana-shard + - type: SpawnItemsOnUse + items: + - id: Katanacursed + sound: + path: /Audio/Effects/bite.ogg diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 92a393a6a71437..304d3363c3a818 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -64,11 +64,11 @@ CrateArmorySMG: 1.0 CrateArmoryLaser: 1.0 CrateArmoryShotgun: 1.0 - CrateArmoryPistols: 1.0 + BoxCursedKatana: 1.0 # rare armor ClothingOuterArmorRiot: 1.0 # rare chemicals - CognizineChemistryBottle: 1.0 + Boxluxmedpen: 1 OmnizineChemistryBottle: 1.0 # money SpaceCash2500: 1.0 diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/luxpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/luxpen.png new file mode 100644 index 0000000000000000000000000000000000000000..25018420e45d8b9de0fd020f0343778b48f890fb GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0tD+ z#WAE}&fCiud7BIb*dFZfRF+|ua4%pGN?>X~AUNlsU<#|S_=XLP{HctOif2Dy^Ki_n zU^Gz^DxU6edaC#SZ7;d(`Pd8^7uOeb_UKVJOxn8ZiJ z1AciuZW3-D?}a*c*VM#1|F+9goFJ!q$k}AY>tZiWpQF|86YOViYSH4F?rnalH}Utc ze7_#1H{S#+x5jcDY(BZQI3)C{l1Js?MbV#Q8eVQa&+vug`^1vFduvUf|L=|Xrwg=P g;s68NAKM3v{sj(UzgNkq13ky!>FVdQ&MBb@00d5I#sB~S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/luxpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/luxpen_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..d438d94d8f5185e05045b4085124316c5c7ac6ee GIT binary patch literal 303 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 b?lH{M+p$Oe+%IEb3Ssbc^>bP0l+XkK8+N$C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..da85765a9e600a9d2dbea964f24d7820b6a96700 GIT binary patch literal 921 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-ueVd8 zNV~kL;i&=*jYS6!E^<^9TD38!V4{HWiL8sS!yg=f8mGF%G$T_$YSFZPZU361ny)n} zXf$htdl-tA1_eL7{&J!Af#PM+N?%H60ae@{+X*RV9a!Yy#?qzyjK8LOAf+M{l>B;~Q^ zL*c~rYRp{sXH_jan6H*D^(S?cSg%gg)i*ECZ7E#TJ9W)8@p&TOo)o7pwe0_?dM+d} zHS*JnIff-lESwM29B29#P5I!dcjBDY?`5y{sdhaIe6lvkQP{n0O~u|t)0Sp?6-9lS zVq>ZG?B4(P!T!IOOW&Q#xM9E4vF8>R-xh|M_S_FXykc(STh?{ly7htIOup+@ZCzT~ zcW^87baP$ZLWc0&2A|d(+gcI3>Ey;`mp>FTG8;)E8?e$`I6ls0m zrNQRtvYNxrfvY|`I=Yrwd;WoQ;-0$K%qkm0%*-5HZbWFh=xh-8Hvh2Y1ZC8RA8ye@{d@XWx((AqU z4-d4I*Z;dH;GJA~ljm|?+@95Y+E4l4{o(#dBEx!n%q9u;t<@9X?EK;s^mxDiC9#)1 z@&ymPzsfZTi+lY0vP@6?c&wxA13T77_m0ZA-U_SAV)&`wko`L+kgxxjCQHwstkhHe z!Ao+NE@f*lI&!jmj|}6%`ZSo>E#^A2?VlDG8Jan$SjPN5*v0sG!hw3V54`L#y^7aF SEcO6noWax8&t;ucLK6Uut(-vs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json new file mode 100644 index 00000000000000..12b34cad4a2156 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/dna.png b/Resources/Textures/Objects/Storage/boxes.rsi/dna.png new file mode 100644 index 0000000000000000000000000000000000000000..19ee38be5c7564a3d8a533a07bbc11b7be5b34f9 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5Fx}I|F(ktM?S+H94GKK07m5yBM}K+2kn`BD z=Ws~T?`aXX%7$@&^nWU9wwQ@3DJdFshm`h?|S@9j~q7w=#8g|X_h64Pvk z2;JFBIey(0t+z|bVqVoXWm35R{G5i4j(h4w4D-J!Jlw7NIud9lgQu&X%Q~loCIE%* BM*si- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/heart_black.png b/Resources/Textures/Objects/Storage/boxes.rsi/heart_black.png new file mode 100644 index 0000000000000000000000000000000000000000..bdf4aceb6657394a96dec7213f981343a3b2c959 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5Fv!!zF(ktM?L|kf0|p!}7c>2*Eq*I|bj-F`0aUo{%GJE;dv?D%4!_QiZ{D@;!u;jejh-?dQa8v??^t(#3DXQq fmoy6o9S5lwDFQ5{{084>Yg+`LsEPkJP5$u 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 HB{Ts517OzE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cutteradv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/cutteradv.rsi/meta.json new file mode 100644 index 00000000000000..564a1be02e1fdf --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/cutteradv.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2b8b045d5a237147d736e3ba3c77c8cc5fb66cb5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json index 804ab0bc91019a..225b86edf89ccc 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "scatterlaser" + }, { "name": "bolt" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png new file mode 100644 index 0000000000000000000000000000000000000000..c13980a86640036efc959c7204c84443f548708c GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DA?-h z;uumf=k2A9ybTHhtN}hUO|~&E++5P_n-}hI5-;T6e!*kW#}|JDcuwx`Q{GwKa(~wR zZU!a}g@%SI#^X<}ecw5AsXiOWY4MGP{EjtjHm8sK#aC?PP|{`Io_N^(iu9oXPW^Vq z>+gTe~DWM4f D^uR>m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..36b332b16316be9d443f46d7efe8c8fa714bd03e GIT binary patch literal 1100 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/katana-shard.png b/Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/katana-shard.png new file mode 100644 index 0000000000000000000000000000000000000000..44be6d648a7efe60910638d509a32b1cd11ca59a GIT binary patch literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(ehe5&=FTt^y1S1`Gib3EamT;eGYm?Y_ebJS-PVa%cVj|M)BGrUaV> zD`G=kdqYgF&2fsWn)83pKE4^h-Z9Po`B;#>?DvLeO^LGo^DP9nZ_!*ZRpGBl>jvdG z&P(UH9e-PLJ#O2f!}4~z4CgidpBg;(SBgj`Li!?fj1@&`V} zaWEJQ3W=FVdQ&MBb@0AFXqWdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/meta.json new file mode 100644 index 00000000000000..c9a40273bff19d --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/katana_cursed.rsi/meta.json @@ -0,0 +1,93 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b3e8eebdc9d822ad70bf0cdbe2f26850d4a7bbe7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "katana-shard", + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} From 8ce3bdfb0f657f75a1685168a0b9f6bec7ec9410 Mon Sep 17 00:00:00 2001 From: Wizard-Grin <100096262+Wizard-Grin@users.noreply.github.com> Date: Mon, 31 Jul 2023 06:58:03 +0300 Subject: [PATCH 2/3] fixfix --- Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml | 3 ++- .../Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index 1f737d377ca426..71e188d8a00f45 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -26,4 +26,5 @@ product: CrateMinerAdvancedEquipment cost: 12500 category: Cargo - group: market \ No newline at end of file + group: market + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml index 2632bce655434f..d700dcde54a063 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml @@ -47,4 +47,4 @@ whitelist: tags: - Ore - - type: Dumpable \ No newline at end of file + - type: Dumpable From 552de1588742f54f2663b26cabbb6b036ad3b4fa Mon Sep 17 00:00:00 2001 From: Wizard-Grin <100096262+Wizard-Grin@users.noreply.github.com> Date: Mon, 31 Jul 2023 07:26:57 +0300 Subject: [PATCH 3/3] FixFixFixFix --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3550b292d84a8a..28d6137fd58d97 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -483,7 +483,7 @@ autoRechargeRate: 400 - type: MagazineVisuals magState: mag - steps: 5 + steps: 2 zeroVisible: true - type: entity