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

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −3
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a86ef
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
blackcrystall Jan 29, 2025
c90ddd3
typo
blackcrystall Jan 29, 2025
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
16 changes: 15 additions & 1 deletion code/game/objects/items/pamphlets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

if(!can_use(user))
return
on_use(user)

on_use(user)
qdel(src)

/obj/item/pamphlet/proc/can_use(mob/living/carbon/human/user)
Expand All @@ -48,6 +48,20 @@
if(!bypass_pamphlet_limit)
user.has_used_pamphlet = TRUE

/obj/item/pamphlet/skill/can_use(mob/living/carbon/human/user)
. = ..()
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
Comment on lines +53 to +63
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


/obj/item/pamphlet/skill/medical
name = "medical instructional pamphlet"
desc = "A pamphlet used to quickly impart vital knowledge. This one has a medical insignia."
Expand Down
3 changes: 1 addition & 2 deletions code/modules/character_traits/skills.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@
trait_desc = "Gives the CO information on his smartgun"
skill = SKILL_SPEC_WEAPONS
skill_cap = SKILL_SPEC_SMARTGUN
skill_increment = 7

skill_increment = SKILL_SPEC_SMARTGUN

/datum/character_trait/skills/spotter
trait_name = "Spotter Training"
Expand Down