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

Locks on spotter kit. #4114

Closed
wants to merge 1 commit into from
Closed

Conversation

Segrain
Copy link
Contributor

@Segrain Segrain commented Aug 5, 2023

About the pull request

Another promise off my todolist. I might have some further ideas building on companion kits, so some code is split into a generic variant and some left as specific to the sniper-spotter setup between a specialist and a regular marine.

Explain why it's good for the game

I am tired of magpies stealing or ransacking spotter kits. I barely even play sniper, and I am tired of random marines shooting down my door solely to steal the kit anyway.

Changelog

🆑
add: Spotter kit now features a two layer lock. First swipe sniper's ID to mark his willingness to part with it, second swipe the rifleman's ID to claim the spotter role. Comes with automatic skill adjustment and transfer into sniper's squad.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Aug 5, 2023
if(recipient)
. += SPAN_NOTICE("It has been claimed by [recipient].")
else
. += SPAN_NOTICE("It is still sealed. It can be claimed by squad rifleman's ID.")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. += SPAN_NOTICE("It is still sealed. It can be claimed by squad rifleman's ID.")
. += SPAN_NOTICE("It is still sealed. It can be claimed by swiping a squad rifleman's ID.")

/obj/item/storage/box/kit/companion/spotter/get_examine_text(mob/user)
. = ..()
if(!issuer)
. += SPAN_NOTICE("It can be unlocked by sniper specialist's ID.")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. += SPAN_NOTICE("It can be unlocked by sniper specialist's ID.")
. += SPAN_NOTICE("It can be unlocked by swiping the sniper specialist's ID.")

Comment on lines +539 to +542
var/issuer
var/datum/squad/associated_squad
var/associated_fireteam
var/recipient
Copy link
Contributor

Choose a reason for hiding this comment

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

code doc pls

///A kit that is issued by one human to another.
/obj/item/storage/box/kit/companion
var/issuer
var/datum/squad/associated_squad
Copy link
Contributor

Choose a reason for hiding this comment

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

null on destroy

Comment on lines +564 to +569
/obj/item/storage/box/kit/companion/proc/register_issuer(mob/living/carbon/human/user)
issuer = user.real_name
associated_squad = user.assigned_squad
associated_fireteam = user.assigned_fireteam

/obj/item/storage/box/kit/companion/proc/register_recipient(mob/living/carbon/human/user, obj/item/card/id/card)
Copy link
Contributor

Choose a reason for hiding this comment

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

code doc

return
return ..()

/obj/item/storage/box/kit/companion/proc/register_issuer(mob/living/carbon/human/user)
Copy link
Contributor

Choose a reason for hiding this comment

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

code doc

pro_case_overlay = "spotter"
var/datum/character_trait/trait_to_apply = /datum/character_trait/skills/spotter
Copy link
Contributor

Choose a reason for hiding this comment

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

null on destroy pls

@Zonespace27 Zonespace27 marked this pull request as draft August 6, 2023 00:37
@SupernovaXTS
Copy link
Contributor

Two things to consider would be appending spotter to the spotter's name in an OW console, which could make it easier for SOs to find the spotter at a glance, and maybe doing something like giving the spotter kit a flavor text to remind people about PDT-L kits or something similar

@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Aug 14, 2023
@github-actions github-actions bot closed this Aug 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants