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

[Balance] Use skill tier duration multipliers for non-master engineers #4411

Merged
merged 3 commits into from
Sep 26, 2023
Merged

[Balance] Use skill tier duration multipliers for non-master engineers #4411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adb2370
Add duration multipliers for other engie levels
TeDGamer Sep 14, 2023
2c3a522
Remove dissaemble time check for skill engineer trained
TeDGamer Sep 14, 2023
32443b6
Remove skill check time for assembling as well
TeDGamer Sep 14, 2023
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
6 changes: 0 additions & 6 deletions code/modules/cm_marines/smartgun_mount.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,6 @@
to_chat(user, "You're securing the M56D into place...")

var/disassemble_time = 30
if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
disassemble_time = 5

if(do_after(user, disassemble_time * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
playsound(src.loc, 'sound/items/Deconstruct.ogg', 25, 1)
user.visible_message(SPAN_NOTICE("[user] screws the M56D into the mount."),SPAN_NOTICE("You finalize the M56D heavy machine gun."))
Expand Down Expand Up @@ -571,9 +568,6 @@
to_chat(user, "You begin disassembling [src]...")

var/disassemble_time = 30
if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
disassemble_time = 5

if(do_after(user, disassemble_time * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
user.visible_message(SPAN_NOTICE(" [user] disassembles [src]! "),SPAN_NOTICE(" You disassemble [src]!"))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1)
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/mob_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,10 @@ var/global/list/limb_types_by_name = list(
if(SKILL_ENGINEER)
if(skillcheck(src, SKILL_ENGINEER, SKILL_ENGINEER_MASTER))
return DURATION_MULTIPLIER_TIER_3
else if(skillcheck(src, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
return DURATION_MULTIPLIER_TIER_2
else if(skillcheck(src, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
return DURATION_MULTIPLIER_TIER_1
// Construction
if(SKILL_CONSTRUCTION)
if(skillcheck(src, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_MASTER))
Expand Down
Loading