From 7c52a20e53c976c7cac9fc3c5039236c84111078 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Mon, 23 Sep 2024 09:31:35 +0100 Subject: [PATCH 1/6] add fauna protection module --- .../Objects/Specific/Robotics/borg_modules.yml | 15 +++++++++++++++ .../Entities/Objects/Weapons/Guns/Basic/pka.yml | 16 ++++++++++++++++ .../Robotics/borgmodule.rsi/icon-carp.png | Bin 0 -> 253 bytes .../Specific/Robotics/borgmodule.rsi/meta.json | 5 ++++- 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-carp.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 2846410943d..add19a717b0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -243,6 +243,21 @@ - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: grappling-module } +- type: entity + parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ] + id: BorgModuleFauna + name: fauna protection module + description: A borg module for protection from deadly space fauna. + components: + - type: Sprite + layers: + - state: cargo + - state: icon-carp + - type: ItemBorgModule + items: + - WeaponProtoKineticAcceleratorOneHanded + - WeaponCrusherDagger + # engineering modules - type: entity id: BorgModuleAdvancedTool diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 409f622f89c..9bbc8129a4b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -13,3 +13,19 @@ map: [ "empty-icon" ] # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi + +- type: entity + parent: WeaponProtoKineticAccelerator + id: WeaponProtoKineticAcceleratorOneHanded + suffix: One-Handed, DO NOT MAP + description: Fires low-damage kinetic bolts at a short range. This kind has a gyroscope to keep a cyborg's aim steady. + components: + - type: GunWieldBonus + wieldBonusExamineMessage: null + minAngle: 0 + maxAngle: 0 + - type: Gun + minAngle: 1 + maxAngle: 2 + - type: UseDelay + delay: 0 # You can't dual wield this as a borg so no need for a delay diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-carp.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-carp.png new file mode 100644 index 0000000000000000000000000000000000000000..abe4ade024f4c7e11ec43fb222bf76f48d6d6274 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP;kAc zi(^Q{;p7Af*2M`TJxzfITx=2slU6-E_p$Z=Pu8Oc-rR~QY Date: Mon, 23 Sep 2024 09:32:04 +0100 Subject: [PATCH 2/6] re-add crusher recipes to secfab, move pka to secfab, t1 -> t2 --- .../Locale/en-US/research/technologies.ftl | 2 +- .../Entities/Structures/Machines/lathe.yml | 5 +++ .../Prototypes/Recipes/Lathes/robotics.yml | 5 +++ .../Prototypes/Recipes/Lathes/security.yml | 38 +++++++++++++++++++ Resources/Prototypes/Research/arsenal.yml | 30 ++++++++------- 5 files changed, 65 insertions(+), 15 deletions(-) diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 0b0970ec08f..91a803da6ea 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -22,7 +22,6 @@ research-technology-portable-fission = Portable Fission research-technology-space-scanning = Space Scanning research-technology-excavation = Mass Excavation -research-technology-salvage-weapons = Salvage Weapons research-technology-draconic-munitions = Draconic Munitions research-technology-uranium-munitions = Uranium Munitions research-technology-explosive-technology = Explosive Technology @@ -32,6 +31,7 @@ research-technology-nonlethal-ammunition = Nonlethal Ammunition research-technology-practice-ammunition = Practice Ammunition research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry research-technology-wave-particle-harnessing = Wave Particle Harnessing +research-technology-experimental-salvage-weaponry = Experimental Salvage Weaponry research-technology-advanced-riot-control = Advanced Riot Control research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry research-technology-experimental-battery-ammo = Experimental Battery Ammo diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c05b18c2ed1..4dab8a35675 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -848,6 +848,7 @@ - TargetSyndicate - WeaponDisablerPractice - WeaponLaserCarbinePractice + - WeaponProtoKineticAccelerator - Zipties # Begin DeltaV additions - ClothingNeckShockCollar # Nyanotrasen - Shock Collar recipe @@ -862,6 +863,7 @@ # End DeltaV additions dynamicRecipes: - EncryptionKeySyndie # Nyano + - BorgModuleFauna - BoxBeanbag - BoxShotgunIncendiary - BoxShotgunUranium @@ -912,6 +914,9 @@ - WeaponLaserCarbine - WeaponXrayCannon - ClothingBackpackElectropack + - WeaponCrusher + - WeaponCrusherDagger + - WeaponCrusherGlaive # Begin DeltaV additions - BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics - ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index bf8deba9840..5dd986dfbb2 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -321,6 +321,11 @@ id: BorgModuleGrapplingGun result: BorgModuleGrapplingGun +- type: latheRecipe + parent: BaseGoldBorgModuleRecipe + id: BorgModuleFauna + result: BorgModuleFauna + # Engineering Modules - type: latheRecipe diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 5a7ad143ac7..23943ce8257 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -106,6 +106,44 @@ Plastic: 250 Gold: 100 +- type: latheRecipe + parent: BaseWeaponRecipeLong + id: WeaponProtoKineticAccelerator + result: WeaponProtoKineticAccelerator + materials: + Steel: 1000 + Glass: 500 + Gold: 100 + +- type: latheRecipe + parent: BaseWeaponRecipeLong + id: WeaponCrusher + result: WeaponCrusher + materials: + Steel: 1500 + Glass: 500 + Plastic: 250 + Gold: 100 + +- type: latheRecipe + parent: BaseWeaponRecipe + id: WeaponCrusherDagger + result: WeaponCrusherDagger + materials: + Steel: 750 + Glass: 300 + Gold: 200 + +- type: latheRecipe + parent: BaseWeaponRecipeLong + id: WeaponCrusherGlaive + result: WeaponCrusherGlaive + materials: + Steel: 2000 + Glass: 500 + Silver: 250 + Gold: 250 + - type: latheRecipe id: ClothingBackpackElectropack result: ClothingBackpackElectropack diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 1bc89d160b9..4f0e289cba8 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -1,19 +1,5 @@ # Tier 1 -- type: technology - id: SalvageWeapons - name: research-technology-salvage-weapons - icon: - sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi - state: icon - discipline: Arsenal - tier: 1 - cost: 5000 - recipeUnlocks: - - WeaponProtoKineticAccelerator - - ShuttleGunKineticCircuitboard - # These are roundstart but not replenishable for salvage - - type: technology id: DraconicMunitions name: research-technology-draconic-munitions @@ -173,6 +159,22 @@ recipeUnlocks: - WeaponXrayCannon +- type: technology + id: ExperimentalSalvageWeaponry + name: research-technology-experimental-salvage-weaponry + icon: + sprite: Objects/Weapons/Melee/crusher_glaive.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 10000 + recipeUnlocks: + - WeaponCrusher + - WeaponCrusherDagger + - WeaponCrusherGlaive + - BorgModuleFauna + - ShuttleGunKineticCircuitboard + - type: technology id: BasicShuttleArmament name: research-technology-basic-shuttle-armament From 91979367d690a93c19c12e6e14d1cbb47107b129 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Mon, 23 Sep 2024 09:39:49 +0100 Subject: [PATCH 3/6] remove shovel from mining module, add recipes to emagged lathes --- .../Entities/Objects/Specific/Robotics/borg_modules.yml | 1 - .../Prototypes/Entities/Structures/Machines/lathe.yml | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index add19a717b0..69f9426d0fc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -219,7 +219,6 @@ - type: ItemBorgModule items: - MiningDrill - - Shovel - MineralScannerUnpowered - OreBag - Crowbar diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 4dab8a35675..fdb4315f003 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -230,6 +230,7 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + - WeaponProtoKineticAccelerator # DeltaV - .38 special ammo - Add .38 special lethals to emagged autolathe - SpeedLoaderSpecial - SpeedLoaderSpecialEmpty @@ -374,6 +375,7 @@ # End DeltaV additions - type: EmagLatheRecipes emagDynamicRecipes: + - BorgModuleFauna - BoxBeanbag - BoxShotgunIncendiary - BoxShotgunUranium @@ -413,6 +415,7 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon +<<<<<<< HEAD # Begin DeltaV additions - BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics - WeaponEnergyGun # Energy Gun @@ -435,6 +438,11 @@ - MagazineBoxSpecialHoly - MagazineBoxSpecialMindbreaker # End DeltaV additions +======= + - WeaponCrusher + - WeaponCrusherDagger + - WeaponCrusherGlaive +>>>>>>> 56e6e9b031 (remove shovel from mining module, add recipes to emagged lathes) - type: entity id: ProtolatheHyperConvection From ce0779c6e509c3dfe51d7add707a5c7bcf16053f Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Mon, 23 Sep 2024 13:13:59 +0100 Subject: [PATCH 4/6] you have died of dissin terry --- Resources/Prototypes/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 4f0e289cba8..0c37023c33e 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -195,7 +195,7 @@ - ShuttleGunPerforatorCircuitboard - ShuttleGunFriendshipCircuitboard technologyPrerequisites: - - SalvageWeapons + - ExperimentalSalvageWeaponry # Tier 3 From a8b0a12e8bab5e0a7b0ffc5e8d52be8e9b50c6d6 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Thu, 31 Oct 2024 13:58:12 +0000 Subject: [PATCH 5/6] add an icon --- .../Objects/Specific/Robotics/borg_modules.yml | 2 ++ .../Entities/Structures/Machines/lathe.yml | 9 +++------ .../Actions/actions_borg.rsi/fauna-module.png | Bin 0 -> 456 bytes .../Interface/Actions/actions_borg.rsi/meta.json | 5 ++++- 4 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 69f9426d0fc..47d06e88afb 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -256,6 +256,8 @@ items: - WeaponProtoKineticAcceleratorOneHanded - WeaponCrusherDagger + - type: BorgModuleIcon + icon: { sprite: Interface/Actions/actions_borg.rsi, state: fauna-module } # engineering modules - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index fdb4315f003..9c821edd0b9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -415,7 +415,9 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon -<<<<<<< HEAD + - WeaponCrusher + - WeaponCrusherDagger + - WeaponCrusherGlaive # Begin DeltaV additions - BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics - WeaponEnergyGun # Energy Gun @@ -438,11 +440,6 @@ - MagazineBoxSpecialHoly - MagazineBoxSpecialMindbreaker # End DeltaV additions -======= - - WeaponCrusher - - WeaponCrusherDagger - - WeaponCrusherGlaive ->>>>>>> 56e6e9b031 (remove shovel from mining module, add recipes to emagged lathes) - type: entity id: ProtolatheHyperConvection diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/fauna-module.png new file mode 100644 index 0000000000000000000000000000000000000000..888ddb464e67de02f8a203988866ef04c4b597bd GIT binary patch literal 456 zcmV;(0XP1MP)NCu5t(CbZ2X@dmYzL(mJ!1NFw23GG_@RP4~ipL z&|JpAz$Zy--@_e&;Q%n;5ut7Pe|nC>#dN@zH*`&e!!HC}H8~k}U;hs0U!5Arpq;&* zJ|W<${EtC|pN*kJhMmDqn}^}Xqpz4|(kcW%J{RF+Wsqk72e$ms)h`TUyo?0Rq)G_D zd@jxY18zCpLI9i3K{T;uQWOHXd=3I2-+MbdFld(_rdhphwp4}hdp+PO5 y6BPnI$5F-5`J-(@s)qomy-u%=$)M?)jRF93<<|v5Z(mmc0000 Date: Mon, 23 Sep 2024 09:32:04 +0100 Subject: [PATCH 6/6] re-add crusher recipes to secfab, move pka to secfab, t1 -> t2 --- .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 - Resources/Prototypes/Recipes/Lathes/devices.yml | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9c821edd0b9..2870b1e1048 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -349,7 +349,6 @@ - SyringeBluespace #- WeaponForceGun # DeltaV - WeaponLaserSvalinn - - WeaponProtoKineticAccelerator - WeaponGrapplingGun #- WeaponTetherGun # DeltaV - ClothingBackpackHolding diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 8f72ef7ad18..f1f7df44251 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -205,16 +205,6 @@ Glass: 100 Uranium: 100 -- type: latheRecipe - id: WeaponProtoKineticAccelerator - result: WeaponProtoKineticAccelerator - category: Weapons - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Silver: 100 - #- type: latheRecipe #DeltaV - LRP # id: WeaponTetherGun # result: WeaponTetherGun