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.

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

"Don't waste resources" Pamphlets changes QOL #8272

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

blackcrystall
Copy link
Contributor

@blackcrystall blackcrystall commented Jan 29, 2025

About the pull request

No more wasting rare pamphlets without earning skills, you can't use it, if you aint getting skills

Explain why it's good for the game

No more skill issue? Thin ref

Also, CO smartgun skill... thank for that bug sended to downstream, now I come here to krill somebody...

Changelog

🆑
qol: Pamphlets skill check on increase, you can't spend them if they can't increase your skills
fix: Removed magic number on CO smartgun skill
/:cl:

@cmss13-ci cmss13-ci bot added Quality of Life Make the game harder to play Fix Fix one bug, make ten more labels Jan 29, 2025
Comment on lines +53 to +63
if(.)
var/datum/character_trait/skills/skill_trait = trait
if(istype(skill_trait))
if(user.skills.get_skill_level(skill_trait.skill) < skill_trait.skill_cap)
return

if(user.skills.get_skill_level(skill_trait.secondary_skill) < skill_trait.secondary_skill_cap)
return

to_chat(user, SPAN_WARNING("This pamphlet is useless for you!"))
return FALSE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if(.)
var/datum/character_trait/skills/skill_trait = trait
if(istype(skill_trait))
if(user.skills.get_skill_level(skill_trait.skill) < skill_trait.skill_cap)
return
if(user.skills.get_skill_level(skill_trait.secondary_skill) < skill_trait.secondary_skill_cap)
return
to_chat(user, SPAN_WARNING("This pamphlet is useless for you!"))
return FALSE
if(!.)
return
var/datum/character_trait/skills/skill_trait = trait
if(istype(skill_trait))
if(user.skills.get_skill_level(skill_trait.skill) < skill_trait.skill_cap)
return
if(user.skills.get_skill_level(skill_trait.secondary_skill) < skill_trait.secondary_skill_cap)
return
to_chat(user, SPAN_WARNING("This pamphlet is useless for you!"))
return FALSE

@harryob harryob marked this pull request as draft January 31, 2025 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Quality of Life Make the game harder to play
Projects
Status: Changes Requested
Development

Successfully merging this pull request may close these issues.

3 participants