cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Electrolite removal (#59019)

Browse Source
This commit is contained in:
manofpepsi
2021-05-12 01:59:50 -07:00
committed by GitHub
parent 70cb18be68
commit 9619bc590c
6 changed files with 10 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/electrolyzer.dm
+5 -5
View File
@@ -20,7 +20,7 @@
var/on = FALSE
///check what mode the machine should be (WORKING, STANDBY)
var/mode = ELECTROLYZER_MODE_STANDBY
///Increase the amount of moles worked on, changed by upgrading the electrolite tier
///Increase the amount of moles worked on, changed by upgrading the manipulator tier
var/workingPower = 1
///Decrease the amount of power usage, changed by upgrading the capacitor tier
var/efficiency = 0.5
@@ -106,14 +106,14 @@
cell.use((5 * proportion * workingPower) / (efficiency + workingPower))
/obj/machinery/electrolyzer/RefreshParts()
var/electrolite = 0
var/manipulator = 0
var/cap = 0
for(var/obj/item/stock_parts/electrolite/M in component_parts)
electrolite += M.rating
for(var/obj/item/stock_parts/manipulator/M in component_parts)
manipulator += M.rating
for(var/obj/item/stock_parts/capacitor/M in component_parts)
cap += M.rating
workingPower = electrolite //used in the amount of moles processed
workingPower = manipulator //used in the amount of moles processed
efficiency = (cap + 1) * 0.5 //used in the amount of charge in power cell uses
code/game/objects/items/circuitboards/machine_circuitboards.dm
+1 -1
View File
@@ -496,7 +496,7 @@
greyscale_colors = CIRCUIT_COLOR_GENERIC
build_path = /obj/machinery/electrolyzer
req_components = list(
/obj/item/stock_parts/electrolite = 2,
/obj/item/stock_parts/manipulator = 2,
/obj/item/stock_parts/capacitor = 2,
/obj/item/stack/cable_coil = 5,
/obj/item/stack/sheet/glass = 1)
code/modules/research/designs/stock_parts_designs.dm
-45
View File
@@ -246,51 +246,6 @@
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
//electrolite
/datum/design/basic_electrolite
name = "Basic Electrolite"
desc = "A stock part used in the construction of various devices."
id = "basic_electrolite"
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/glass = 100)
build_path = /obj/item/stock_parts/electrolite
category = list("Stock Parts","Machinery","initial")
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/adv_electrolite
name = "Advanced Electrolite"
desc = "A stock part used in the construction of various devices."
id = "adv_electrolite"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 150, /datum/material/glass = 150)
build_path = /obj/item/stock_parts/electrolite/adv
category = list("Stock Parts")
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/super_electrolite
name = "Super Electrolite"
desc = "A stock part used in the construction of various devices."
id = "super_electrolite"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 200, /datum/material/glass = 200, /datum/material/gold = 100, /datum/material/silver = 100)
build_path = /obj/item/stock_parts/electrolite/super
category = list("Stock Parts")
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/bluespace_electrolite
name = "Bluespace Electrolite"
desc = "A stock part used in the construction of various devices."
id = "bluespace_electrolite"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 200, /datum/material/glass = 200, /datum/material/gold = 100, /datum/material/silver = 100, /datum/material/diamond = 100)
build_path = /obj/item/stock_parts/electrolite/bluespace
category = list("Stock Parts")
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
//T-Comms devices
/datum/design/subspace_ansible
name = "Subspace Ansible"
code/modules/research/stock_parts.dm
-32
View File
@@ -77,7 +77,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/cell/high(src)
new /obj/item/stock_parts/electrolite(src)
/obj/item/storage/part_replacer/bluespace/tier2
@@ -89,7 +88,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/micro_laser/high(src)
new /obj/item/stock_parts/matter_bin/adv(src)
new /obj/item/stock_parts/cell/super(src)
new /obj/item/stock_parts/electrolite/adv(src)
/obj/item/storage/part_replacer/bluespace/tier3
@@ -101,7 +99,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/micro_laser/ultra(src)
new /obj/item/stock_parts/matter_bin/super(src)
new /obj/item/stock_parts/cell/hyper(src)
new /obj/item/stock_parts/electrolite/super(src)
/obj/item/storage/part_replacer/bluespace/tier4
@@ -113,7 +110,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/micro_laser/quadultra(src)
new /obj/item/stock_parts/matter_bin/bluespace(src)
new /obj/item/stock_parts/cell/bluespace(src)
new /obj/item/stock_parts/electrolite/bluespace(src)
/obj/item/storage/part_replacer/cargo //used in a cargo crate
@@ -124,7 +120,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/manipulator(src)
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/electrolite(src)
/obj/item/storage/part_replacer/cyborg
name = "rapid part exchange device"
@@ -184,12 +179,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
icon_state = "matter_bin"
custom_materials = list(/datum/material/iron=80)
/obj/item/stock_parts/electrolite
name = "electrolite"
desc = "An electrolite component to separate matters into others"
icon_state = "electrolite"
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
//Rating 2
/obj/item/stock_parts/capacitor/adv
@@ -227,13 +216,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
rating = 2
custom_materials = list(/datum/material/iron=80)
/obj/item/stock_parts/electrolite/adv
name = "advanced electrolite"
desc = "An electrolite component to separate matters into others"
icon_state = "adv_electrolite"
rating = 2
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
//Rating 3
/obj/item/stock_parts/capacitor/super
@@ -271,13 +253,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
rating = 3
custom_materials = list(/datum/material/iron=80)
/obj/item/stock_parts/electrolite/super
name = "super electrolite"
desc = "An electrolite component to separate matters into others"
icon_state = "super_electrolite"
rating = 3
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
//Rating 4
/obj/item/stock_parts/capacitor/quadratic
@@ -315,13 +290,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
rating = 4
custom_materials = list(/datum/material/iron=80)
/obj/item/stock_parts/electrolite/bluespace
name = "bluespace electrolite"
desc = "An electrolite component to separate matters into others"
icon_state = "bluespace_electrolite"
rating = 4
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
// Subspace stock parts
/obj/item/stock_parts/subspace/ansible
code/modules/research/techweb/all_nodes.dm
+4 -4
View File
@@ -8,7 +8,7 @@
display_name = "Basic Research Technology"
description = "NT default research technologies."
// Default research tech, prevents bricking
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "basic_electrolite", "c-reader", "desttagger", "salestagger", "handlabel", "packagewrap",
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "c-reader", "desttagger", "salestagger", "handlabel", "packagewrap",
"destructive_analyzer", "circuit_imprinter", "circuit_imprinter_offstation", "experimentor", "rdconsole", "bepis", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "restaurant_portal",
"paystand", "space_heater", "bucket", "sec_rshot", "sec_beanbag_slug", "sec_Islug", "sec_dart", "sec_38", "rglass", "plasteel", "experi_scanner", "destructive_scanner", "doppler_array",
"plastitanium", "plasmaglass", "plasmareinforcedglass", "titaniumglass", "plastitaniumglass", "plastic_knife", "plastic_fork", "plastic_spoon", "conveyor_belt", "conveyor_switch")
@@ -157,7 +157,7 @@
design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "w-recycler" , "emitter", "high_cell", "adv_matter_bin", "scanner_gate",
"atmosalerts", "atmos_control", "recycler", "autolathe", "high_micro_laser", "nano_mani", "mesons", "welding_goggles", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod",
"apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine",
"oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt", "electrolyzer", "adv_electrolite", "pneumatic_seal", "crystallizer")
"oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt", "electrolyzer", "pneumatic_seal", "crystallizer")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 12500)
discount_experiments = list(/datum/experiment/scanning/random/material/easy = 7500)
@@ -184,7 +184,7 @@
display_name = "High Efficiency Parts"
description = "Finely-tooled manufacturing techniques allowing for picometer-perfect precision levels."
prereq_ids = list("engineering", "datatheory")
design_ids = list("pico_mani", "super_matter_bin", "super_electrolite")
design_ids = list("pico_mani", "super_matter_bin")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
/datum/techweb_node/adv_power
@@ -217,7 +217,7 @@
display_name = "Miniaturized Bluespace Research"
description = "Extreme reduction in space required for bluespace engines, leading to portable bluespace technology."
prereq_ids = list("bluespace_travel", "practical_bluespace", "high_efficiency")
design_ids = list("bluespace_matter_bin", "femto_mani", "bluespacebodybag", "triphasic_scanning", "quantum_keycard", "wormholeprojector", "swapper", "bluespace_electrolite")
design_ids = list("bluespace_matter_bin", "femto_mani", "bluespacebodybag", "triphasic_scanning", "quantum_keycard", "wormholeprojector", "swapper")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
discount_experiments = list(/datum/experiment/exploration_scan/random/condition)
icons/obj/stock_parts.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 20 KiB