Skip to content

Commit

Permalink
Adds the ability to research deck gun parts excluding firing electron…
Browse files Browse the repository at this point in the history 
…ics and science tier fix (#2604)
  • Loading branch information
@Bokkiewokkie
Bokkiewokkie authored Mar 29, 2024
1 parent e90cb25 commit c3fb977
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 20 deletions.
10 changes: 0 additions & 10 deletions nsv13/code/game/objects/items/nsv_circuitboards.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,6 @@
build_path = /obj/machinery/computer/deckgun
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF

/obj/item/circuitboard/computer/deckgun/Destroy(force=FALSE)
if(!force)
return QDEL_HINT_LETMELIVE
return ..()

/obj/item/circuitboard/machine/deck_gun
name = "deck gun core (Machine Board)"
req_components = list(
Expand All @@ -215,11 +210,6 @@
needs_anchored = FALSE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF

/obj/item/circuitboard/machine/deck_gun/Destroy(force=FALSE)
if(!force)
return QDEL_HINT_LETMELIVE
return ..()

/obj/item/circuitboard/machine/deck_gun/powder
name = "deck gun powder gate (Machine Board)"
req_components = list(
Expand Down
43 changes: 33 additions & 10 deletions nsv13/code/modules/research/techweb/all_nsv_nodes.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
design_ids = list("shield_fan", "shield_capacitor", "shield_modulator", "shield_interface", "shield_frame")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
export_price = 5000
tech_tier = 5
hidden = TRUE

/datum/techweb_node/ship_circuits
Expand All @@ -16,6 +17,7 @@
design_ids = list("helm_circuit", "navigation_console_circuit", "tactical_comp_circuit", "astrometrics_console", "dradis_console", "cargo_dradis_console")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
export_price = 1000
tech_tier = 1

//Munitions tech
/datum/techweb_node/maa_circuits
Expand All @@ -26,6 +28,7 @@
design_ids = list("fighter_computer_circuit", "ordnance_comp_circuit", "fighter_launcher_circuit", "ammo_sorter_computer", "ammo_sorter", "munitions_computer_circuit")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
export_price = 1000
tech_tier = 1

/datum/techweb_node/basic_torpedo_components
id = "basic_torpedo_components"
Expand All @@ -35,6 +38,7 @@
design_ids = list("warhead", "missile_warhead", "decoy_warhead", "freight_warhead", "guidance_system", "propulsion_system", "iff_card")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 2000
tech_tier = 3

/datum/techweb_node/advanced_torpedo_components
id = "advanced_torpedo_components"
Expand All @@ -44,6 +48,7 @@
design_ids = list("bb_warhead", "hellfire_warhead", "probe_warhead")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 7500
tech_tier = 4

/datum/techweb_node/prototype_disruption_warheads
id = "prototype_disruption_warheads"
Expand All @@ -53,25 +58,27 @@
design_ids = list("proto_disruption_warhead")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6500)
export_price = 7000
tech_tier = 3
tech_tier = 4

/datum/techweb_node/advanced_ballistics
id = "adv_ballistics"
display_name = "Advanced Ballistics"
description = "More guns means better guns... Right?"
prereq_ids = list("ballistic_weapons")
design_ids = list("naval_shell", "powder_bag", "gauss_rack_upgrade", "broadside_casing", "broadside_load", "broadside_packer", "plasma_core")
design_ids = list("naval_shell", "powder_bag", "naval_artillery_comp", "artillery_loader", "powder_loader", "payload_gate", "broadside_casing", "broadside_load", "broadside_packer", "plasma_core")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 5000
tech_tier = 3

/datum/techweb_node/macro_ballistics
id = "macro_ballistics"
display_name = "Macro-Ballistics"
description = "Asking important questions, like what if we made even bigger guns?"
prereq_ids = list("adv_ballistics", "adv_plasma")
design_ids = list("naval_shell_ap", "plasma_accelerant", "deck_gun_autorepair", "deck_gun_autoelevator")
design_ids = list("naval_shell_ap", "plasma_accelerant", "deck_gun_autorepair", "deck_gun_autoelevator", "gauss_rack_upgrade")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
export_price = 10000
tech_tier = 4

/datum/techweb_node/missile_automation
id = "missile_automation"
Expand All @@ -81,6 +88,7 @@
design_ids = list("missilebuilder", "slowconveyor", "missilewelder", "missilescrewer", "missilewirer", "missileassembler")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
tech_tier = 3

//Fighter tech
/datum/techweb_node/countermeasure_charge
Expand All @@ -100,6 +108,7 @@
prereq_ids = list("base")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
export_price = 1000
tech_tier = 1

/datum/techweb_node/fighter_tier1
id = "fighter_tier1"
Expand All @@ -109,6 +118,7 @@
prereq_ids = list("fighter_fabrication")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
export_price = 1000
tech_tier = 2

/datum/techweb_node/fighter_tier2
id = "fighter_tier2"
Expand All @@ -118,6 +128,7 @@
prereq_ids = list("fighter_tier1", "adv_engi")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 4000
tech_tier = 3

/datum/techweb_node/fighter_tier3
id = "fighter_tier3"
Expand All @@ -127,6 +138,7 @@
prereq_ids = list("fighter_tier2", "bluespace_travel", "bluespace_power")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
export_price = 7500
tech_tier = 4

/datum/techweb_node/fighter_guns_tier1
id = "fightergun1"
Expand All @@ -136,6 +148,7 @@
prereq_ids = list("fighter_tier1", "weaponry")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
export_price = 1000
tech_tier = 2

/datum/techweb_node/fighter_guns_tier2
id = "fightergun2"
Expand All @@ -145,6 +158,7 @@
prereq_ids = list("fightergun1", "ballistic_weapons")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 2500
tech_tier = 3

/datum/techweb_node/fighter_guns_tier3
id = "fightergun3"
Expand All @@ -154,6 +168,7 @@
prereq_ids = list("fightergun2", "adv_weaponry")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 5000
tech_tier = 4

/datum/techweb_node/fighter_mining
id = "fightermining"
Expand All @@ -163,6 +178,7 @@
prereq_ids = list("fighter_tier1", "adv_mining", "adv_plasma")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 1000
tech_tier = 3

/datum/techweb_node/autoinjector
id = "autoinjector"
Expand All @@ -172,15 +188,17 @@
prereq_ids = list("adv_biotech","adv_surgery")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 1500
tech_tier = 4

/datum/techweb_node/xenoorgan_biotech
id = "xenoorgan_bio"
display_name = "Xeno-organ Biology"
description = "Plasmaman, Ethereals, Lizardpeople... What makes our non-human crewmembers tick?"
prereq_ids = list("adv_biotech")
design_ids = list("limbdesign_felinid", "limbdesign_lizard", "limbdesign_plasmaman", "limbdesign_ethereal", "limbdesign_moth", "limbdesign_apid")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6500)
export_price = 9000
id = "xenoorgan_bio"
display_name = "Xeno-organ Biology"
description = "Plasmaman, Ethereals, Lizardpeople... What makes our non-human crewmembers tick?"
prereq_ids = list("adv_biotech")
design_ids = list("limbdesign_felinid", "limbdesign_lizard", "limbdesign_plasmaman", "limbdesign_ethereal", "limbdesign_moth", "limbdesign_apid")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6500)
export_price = 9000
tech_tier = 1

//Vehicle Hardpoint tech
/datum/techweb_node/vehicle_start
Expand All @@ -191,6 +209,7 @@
prereq_ids = list("engineering")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 1000
tech_tier = 1

/datum/techweb_node/vehicle_utility
id = "vehicle_utility"
Expand All @@ -200,6 +219,7 @@
prereq_ids = list("vehicle_start")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
export_price = 2000
tech_tier = 1

/datum/techweb_node/vehicle_tier1
id = "vehicle_tier1"
Expand All @@ -209,6 +229,7 @@
prereq_ids = list("vehicle_start")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 2500
tech_tier = 1

/datum/techweb_node/vehicle_tier2
id = "vehicle_tier2"
Expand All @@ -218,6 +239,7 @@
prereq_ids = list("vehicle_tier1")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3500)
export_price = 3500
tech_tier = 2

/datum/techweb_node/vehicle_tier3
id = "vehicle_tier3"
Expand All @@ -227,6 +249,7 @@
prereq_ids = list("vehicle_tier2")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 5000
tech_tier = 3

/// Munitions Upgrade for Engineering Borg
/datum/techweb_node/cyborg_upg_muni
Expand Down

0 comments on commit c3fb977

Please sign in to comment.