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

[MIRROR] Laser pointers. Now more accessible! #1094

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25532

About The Pull Request

This PR should add the laser pointer (With its variations) to the loadout and the Good Clean Fun vendor.

How This Contributes To The Skyrat Roleplay Experience

I think laser pointers count as toys, so it's only fair if people can get their hands on them more often!
See someone with felinid traits? Someone that looks a little cat-ty..?
LIGHT!
Or.. you just want to be generally annoying to that one friend?
LIGHT!
Or.. perhaps.. You wanna get someone's attention without pointing like some maniac?
LIGHT!
Or or- Maybe- You just wanna be that one annoying bastard to borgs?
LIGHT!

Proof of Testing

Screenshots/Videos

image
image
image

Changelog

🆑 dis-integrates-the-integration-tests
qol: Laser pointers are now more accessible, being now available in the loadout and in the Good Clean Fun vendor.
/:cl:

* adds laser pointeers to good clean fun

* adds laser pointers to the loadout

* reverts a previous change

* adds laser pointer to modular vending

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit c835275 into master Dec 13, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25532 branch December 13, 2023 09:38
AnywayFarus added a commit that referenced this pull request Dec 13, 2023
Iajret pushed a commit that referenced this pull request Feb 22, 2024
* Removes a double space from health analyzer (#81589)

## About The Pull Request

Fixes the message saying someone is deaf having 2 spaces in it.

## Why It's Good For The Game

minor typo.

## Changelog

:cl:
spellcheck: Removed a double space in health analyzer's message telling
you someone is deaf.
/:cl:

---------

Co-authored-by: san7890 <[email protected]>

* Removes a double space from health analyzer

---------

Co-authored-by: John Willard <[email protected]>
Co-authored-by: san7890 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants