Skip to content

Commit

Permalink
early merge of rebalanced salv weapon researching (#2077)
Browse files Browse the repository at this point in the history
* add fauna protection module

* re-add crusher recipes to secfab, move pka to secfab, t1 -> t2

* remove shovel from mining module, add recipes to emagged lathes

* you have died of dissin terry

* add an icon

* re-add crusher recipes to secfab, move pka to secfab, t1 -> t2

---------

Signed-off-by: deltanedas <[email protected]>
Co-authored-by: deltanedas <@deltanedas:kde.org>
  • Loading branch information
deltanedas authored Dec 20, 2024
1 parent 50dfb55 commit 9f39931
Show file tree
Hide file tree
Showing 12 changed files with 114 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/research/technologies.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@
- type: ItemBorgModule
items:
- MiningDrill
- Shovel
- MineralScannerUnpowered
- OreBag
- Crowbar
Expand All @@ -244,6 +243,23 @@
- 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
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: fauna-module }

# engineering modules
- type: entity
id: BorgModuleAdvancedTool
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 10 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@
- RiotShield
- SpeedLoaderMagnum
- SpeedLoaderMagnumEmpty
- WeaponProtoKineticAccelerator
# DeltaV - .38 special ammo - Add .38 special lethals to emagged autolathe
- SpeedLoaderSpecial
- SpeedLoaderSpecialEmpty
Expand Down Expand Up @@ -350,7 +351,6 @@
- SyringeBluespace
#- WeaponForceGun # DeltaV
- WeaponLaserSvalinn
- WeaponProtoKineticAccelerator
- WeaponGrapplingGun
#- WeaponTetherGun # DeltaV
- ClothingBackpackHolding
Expand All @@ -377,6 +377,7 @@
# End DeltaV additions
- type: EmagLatheRecipes
emagDynamicRecipes:
- BorgModuleFauna
- BoxBeanbag
- BoxShotgunIncendiary
- BoxShotgunUranium
Expand Down Expand Up @@ -416,6 +417,9 @@
- WeaponLaserCannon
- WeaponLaserCarbine
- WeaponXrayCannon
- WeaponCrusher
- WeaponCrusherDagger
- WeaponCrusherGlaive
# Begin DeltaV additions
- BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics
- WeaponEnergyGun # Energy Gun
Expand Down Expand Up @@ -807,6 +811,7 @@
- WeaponDisablerPractice
- WeaponFlareGunSecurity
- WeaponLaserCarbinePractice
- WeaponProtoKineticAccelerator
- Zipties
# Begin DeltaV additions
- ClothingNeckShockCollar # Nyanotrasen - Shock Collar recipe
Expand All @@ -821,6 +826,7 @@
# End DeltaV additions
dynamicRecipes:
- EncryptionKeySyndie # Nyano
- BorgModuleFauna
- BoxBeanbag
- BoxShotgunIncendiary
- BoxShotgunUranium
Expand Down Expand Up @@ -871,6 +877,9 @@
- WeaponLaserCarbine
- WeaponXrayCannon
- ClothingBackpackElectropack
- WeaponCrusher
- WeaponCrusherDagger
- WeaponCrusherGlaive
# Begin DeltaV additions
- BoxShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics
- ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/Recipes/Lathes/devices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,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
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/robotics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,13 @@
id: BorgModuleTool
result: BorgModuleTool

# Mining Modules

- type: latheRecipe
parent: BaseGoldBorgModuleRecipe
id: BorgModuleFauna
result: BorgModuleFauna

# Engineering Modules

- type: latheRecipe
Expand Down
38 changes: 38 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 17 additions & 16 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -174,6 +160,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
Expand All @@ -193,8 +195,7 @@
- ShuttleGunSvalinnMachineGunCircuitboard
- ShuttleGunPerforatorCircuitboard
- ShuttleGunFriendshipCircuitboard
technologyPrerequisites:
- SalvageWeapons
technologyPrerequisites: # DeltaV: added prerequesite
- ExplosiveTechnology

# Tier 3
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9",
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9. fauna-module.png created by deltanedas (github) for SS14.",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -103,6 +103,9 @@
{
"name":"syndicate-martyr-module"
},
{
"name": "fauna-module"
},
{
"name": "select-type"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).",
"copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png and icon-carp.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).",
"size": {
"x": 32,
"y": 32
Expand All @@ -28,6 +28,9 @@
{
"name": "icon-cables"
},
{
"name": "icon-carp"
},
{
"name": "icon-chemist"
},
Expand Down

0 comments on commit 9f39931

Please sign in to comment.