Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gene Booth Speedup Research #14415

Merged
merged 5 commits into from
Jun 7, 2023
Merged

Gene Booth Speedup Research #14415

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ae076f
main changes
Nexusuxen Jun 6, 2023
5614149
get rid of warnings
Nexusuxen Jun 6, 2023
1778607
convert . = type to type = type
Nexusuxen Jun 7, 2023
7060e39
convert . = type to type = type
Nexusuxen Jun 7, 2023
460a027
convert . = type to type = type
Nexusuxen Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/modules/medical/genetics/geneticsBooth.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ TYPEINFO(/obj/machinery/genetics_booth)
var/letgo_hp = 50
var/mob/living/carbon/human/occupant = null
var/process_time = 20 SECONDS
var/static/process_speedup = 0 // static since the genetek upgrade is universal
var/damage_per_tick = 1

var/image/screenoverlay = null
Expand Down Expand Up @@ -239,7 +240,8 @@ TYPEINFO(/obj/machinery/genetics_booth)
UpdateOverlays(screenoverlay, "screen", 0, 1)
animate_shake(src,5,3,2, return_x = -3)
playsound(src.loc, 'sound/impact_sounds/Metal_Clang_1.ogg', 30, 1, pitch = 1.4)
if (entry_time + process_time < TIME)
var/adjusted_time = process_time - (process_time * process_speedup)
if (entry_time + adjusted_time < TIME)
eject_occupant()
else
UpdateOverlays(abilityoverlay, "abil", 0, 1)
Expand Down
44 changes: 44 additions & 0 deletions code/modules/medical/genetics/geneticsResearch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,21 @@ var/datum/geneticsResearchManager/genResearch = new()
genResearch.max_material += 50
..()

/datum/geneticsResearchEntry/gene_booth_speedup_complex
name = "Complex Gene Booth Acceleration"
desc = "Increases the working speed of the Gene Booth by an additional +25%."
researchTime = 1200
researchCost = 150
tier = 2
requiredMutRes = list("early_secret_access")
requiredResearch = list(/datum/geneticsResearchEntry/genebooth)

onFinish()
var/obj/machinery/genetics_booth/type = /obj/machinery/genetics_booth
type.process_speedup += 0.25
. = type // we get warned about type being defined but unused and idk how else to make byond shut up
Nexusuxen marked this conversation as resolved.
Show resolved Hide resolved
..()

// TIER TWO

/datum/geneticsResearchEntry/reclaimer
Expand Down Expand Up @@ -350,6 +365,20 @@ var/datum/geneticsResearchManager/genResearch = new()
tier = 2
requiredResearch = list(/datum/geneticsResearchEntry/rademitter)

/datum/geneticsResearchEntry/gene_booth_speedup
name = "Gene Booth Injection Speedup"
desc = "Increases the working speed of the Gene Booth by 25%."
researchTime = 1200
researchCost = 75
tier = 2
requiredResearch = list(/datum/geneticsResearchEntry/genebooth)

onFinish()
var/obj/machinery/genetics_booth/type = /obj/machinery/genetics_booth
type.process_speedup += 0.25
. = type
Nexusuxen marked this conversation as resolved.
Show resolved Hide resolved
..()

// TIER THREE

/datum/geneticsResearchEntry/saver
Expand Down Expand Up @@ -398,6 +427,21 @@ var/datum/geneticsResearchManager/genResearch = new()
genResearch.emitter_radiation -= 30
..()


/datum/geneticsResearchEntry/gene_booth_speedup_biotic
name = "Biotic Gene Booth Injection"
desc = "Increases the working speed of the Gene Booth by an additional +25%."
researchTime = 1800
researchCost = 100
tier = 3
requiredResearch = list(/datum/geneticsResearchEntry/genebooth, /datum/geneticsResearchEntry/gene_booth_speedup)

onFinish()
var/obj/machinery/genetics_booth/type = /obj/machinery/genetics_booth
type.process_speedup += 0.25
. = type
Nexusuxen marked this conversation as resolved.
Show resolved Hide resolved
..()

// TIER FOUR

/datum/geneticsResearchEntry/saver_slots
Expand Down