-
Notifications
You must be signed in to change notification settings - Fork 607
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
blackcrystall
wants to merge
2
commits into
cmss13-devs:master
Choose a base branch
from
indefinity-cordon:SOLVE_FUNNY_ISSUES
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
"Don't waste resources" Pamphlets changes QOL #8272
blackcrystall
wants to merge
2
commits into
cmss13-devs:master
from
indefinity-cordon:SOLVE_FUNNY_ISSUES
+16
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Red-byte3D
reviewed
Jan 29, 2025
cmss13-ci
bot
added
Quality of Life
Make the game harder to play
Fix
Fix one bug, make ten more
labels
Jan 29, 2025
harryob
requested changes
Jan 31, 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 |
There was a problem hiding this comment.
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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: