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] Gasping in shock, but for non-humans! #1007

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

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

About The Pull Request

This PR should make *gaspshock available for non-human species.

How This Contributes To The Skyrat Roleplay Experience

*gaspshock used to be limited to humans only, which.. did not make much sense.
Now everyone can gasp in shock!

Proof of Testing

Screenshots/Videos

https://cdn.discordapp.com/attachments/640760727489085450/1182094163748061284/Is6ZPUT.mp4?ex=658371fa&is=6570fcfa&hm=d3b87cbbafb5b260668c10602620df11d166029acc94674dc59f87ea69ece903&

Changelog

🆑 KannaLisvern
fix: *gaspshock being only limited to humans
/:cl:

* makes gaspshock no longer limited to humans

* Revert "makes gaspshock no longer limited to humans"

This reverts commit 06e4d2d7dcce182d832d9b3e3ea9f10a2d7d5211.

* makes *gaspshock no longer limited to humans

* SKYRAT EDIT CHANGE comment

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

* Update code/modules/mob/living/emote.dm

* Update code/modules/mob/living/emote.dm

* Update code/modules/mob/living/emote.dm

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit 2a6214a into master Dec 7, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25470 branch December 7, 2023 11:18
AnywayFarus added a commit that referenced this pull request Dec 7, 2023
Iajret pushed a commit that referenced this pull request Feb 17, 2024
… vending machines. (#1007)

* Fixes `product_categories` not working for non-constructable vending machines. (#81467)

## About The Pull Request
This is something I've discovered while working on the previous PR.

## Why It's Good For The Game
Prevents future issues with non-constructable vending machines that use
categories, since we don't have any such thing rn.

## Changelog
N/A

* Fixes `product_categories` not working for non-constructable vending machines.

---------

Co-authored-by: Ghom <[email protected]>
Iajret pushed a commit that referenced this pull request Feb 19, 2024
… vending machines. (#1007) (#2020)

* Fixes `product_categories` not working for non-constructable vending machines. (#81467)

## About The Pull Request
This is something I've discovered while working on the previous PR.

## Why It's Good For The Game
Prevents future issues with non-constructable vending machines that use
categories, since we don't have any such thing rn.

## Changelog
N/A

* Fixes `product_categories` not working for non-constructable vending machines.

---------

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

Successfully merging this pull request may close these issues.

3 participants