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

Datumizes Specialist Sets #6933

Merged
merged 4 commits into from
Aug 17, 2024
Merged

Conversation

Zonespace27
Copy link
Contributor

@Zonespace27 Zonespace27 commented Aug 12, 2024

About the pull request

Converts specialist sets into datums instead of list/string hell, improves a fair bit of surrounding code

Fixes a few things:

  • If a heavy sniper went to cryo, it would reopen the sniper spot instead
  • Demo/Scout had a chance to not have the skill to use their c4 if they got a specialist set from their vendor instead of a spec kit

Explain why it's good for the game

Our old system sucked, this sucks significantly less

Testing Photographs and Procedure

Screenshots & Videos

Tested:

  • Vending spec sets
  • Cryoing as spec
  • Using spec kits
  • Cryoing as spec kit spec

Changelog

🆑
fix: Fixed heavy sniper spec opening up the wrong specialist slot on admin cryo
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Aug 12, 2024
@Zonespace27 Zonespace27 added the Code Improvement Make the code longer label Aug 12, 2024
kiVts
kiVts previously requested changes Aug 15, 2024
Copy link
Contributor

@kiVts kiVts left a comment

Choose a reason for hiding this comment

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

two things that I saw

code/game/machinery/vending/cm_vending.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/specialist.dm Outdated Show resolved Hide resolved
@kiVts kiVts marked this pull request as draft August 15, 2024 05:34
Zonespace27 and others added 2 commits August 15, 2024 08:04
@Zonespace27 Zonespace27 requested a review from kiVts August 16, 2024 19:51
@Zonespace27 Zonespace27 marked this pull request as ready for review August 16, 2024 19:51
@Kaga-404
Copy link
Contributor

Kaga-404 commented Aug 16, 2024

If a heavy sniper went to cryo, it would reopen the sniper spot instead

Is it not currently reopening both? It removes both from the list when picking either, so the re-opening was just piggybacking off of it (old cryopod.dm line 345)

Besides that this implementation looks great. Much cleaner and the incompatible_sets lists work even better and can be easily extended, nicely done!

@Zonespace27
Copy link
Contributor Author

Is it not currently reopening both? It removes both from the list when picking either, so the re-opening was just piggybacking off of it (old cryopod.dm line 345)

Looks like it was only done in when cryoed by pod, not when cryoed by admin

@harryob harryob enabled auto-merge August 17, 2024 07:30
@harryob harryob added this pull request to the merge queue Aug 17, 2024
Merged via the queue into cmss13-devs:master with commit c015286 Aug 17, 2024
29 checks passed
cm13-github added a commit that referenced this pull request Aug 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants