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

[MIRROR] Remove age-based skill bonuses #1054

Closed
wants to merge 2 commits into from
Closed

[MIRROR] Remove age-based skill bonuses #1054

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fbb94d
[MIRROR] Remove age-based skill bonuses
SierraKomodo Sep 22, 2023
50c30f1
Merge branch 'dev-sierra' into upstream-pr-34172
Lexanx Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/client/preference_setup/occupation/skill_selection.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@

points_by_job[job] = job.skill_points //We compute how many points we had.
if(!job.no_skill_buffs)
points_by_job[job] += S.skills_from_age(age) //Applies the species-appropriate age modifier.
points_by_job[job] += 8 // Base skill buff
points_by_job[job] += S.job_skill_buffs[job.type] //Applies the per-job species modifier, if any.

if((points_by_job[job] >= sum) && sum) //we didn't overspend, so use sanitized imported data
Expand Down
3 changes: 0 additions & 3 deletions code/modules/species/outsider/vox.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,6 @@
var/datum/pronouns/P = H.choose_from_pronouns()
return "[SPAN_DANGER("[P.His] beak-segments are cracked and chipped! [P.He] [P.is] not even recognizable.")]\n"

/datum/species/vox/skills_from_age(age)
. = 8

/obj/item/vox_changer
name = "mouldy mirror"
desc = "Something seems strange about this old, dirty mirror. Your reflection doesn't look like you remember it."
Expand Down
7 changes: 0 additions & 7 deletions code/modules/species/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,13 +835,6 @@ The slots that you can use are found in items_clothing.dm and are the inventory

show_browser(src, species.get_description(), "window=species;size=700x400")

/datum/species/proc/skills_from_age(age) //Converts an age into a skill point allocation modifier. Can be used to give skill point bonuses/penalities not depending on job.
switch(age)
if(0 to 22) . = 0
if(23 to 30) . = 3
if(31 to 45) . = 6
else . = 8

/datum/species/proc/post_organ_rejuvenate(obj/item/organ/org, mob/living/carbon/human/H)
return

Expand Down
7 changes: 0 additions & 7 deletions code/modules/species/station/adherent.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,6 @@
/datum/species/adherent/get_blood_name()
return "coolant"

/datum/species/adherent/skills_from_age(age)
switch(age)
if(0 to 1000) . = -4
if(1000 to 2000) . = 0
if(2000 to 8000) . = 4
else . = 8

/datum/species/adherent/get_additional_examine_text(mob/living/carbon/human/H)
if(can_overcome_gravity(H)) return "\nThey are floating on a cloud of shimmering distortion."

Expand Down
7 changes: 0 additions & 7 deletions code/modules/species/station/nabber.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,3 @@
/datum/species/nabber/check_background(datum/job/job, datum/preferences/prefs)
var/singleton/cultural_info/culture/nabber/grade = SSculture.get_culture(prefs.cultural_info[TAG_CULTURE])
. = istype(grade) ? (job.type in grade.valid_jobs) : ..()

/datum/species/nabber/skills_from_age(age) //Converts an age into a skill point allocation modifier. Can be used to give skill point bonuses/penalities not depending on job.
switch(age)
if(0 to 18) . = 8
if(19 to 27) . = 2
if(28 to 40) . = -2
else . = -4
6 changes: 0 additions & 6 deletions code/modules/species/station/station.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,6 @@
else
H.equip_to_slot_or_del(new /obj/item/device/flashlight/flare(H), slot_r_hand)

/datum/species/diona/skills_from_age(age)
switch(age)
if(101 to 200) . = 12 // age bracket before this is 46 to 100 . = 8 making this +4
if(201 to 300) . = 16 // + 8
else . = ..()

// Dionaea spawned by hand or by joining will not have any
// nymphs passed to them. This should take care of that.
/datum/species/diona/handle_post_spawn(mob/living/carbon/human/H)
Expand Down