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] [MODULAR] Grants Hearthkin Transcendent Olfaction (& One Other Thing) #1022

Merged
merged 2 commits into from
Dec 7, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

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

About The Pull Request

This gives them that mutation that allows you to track people by scent.
I heavily recommend you have all the kindred nuzzle something at roundstart so you can track them later.
I was going to get a meme done for this PR body but this'll do instead.
image

This also gives them some brown bear pelts.

Thanks to @vinylspiders for helping me with the code.

How This Contributes To The Skyrat Roleplay Experience

Easier allows them to track people for all kinds of purposes, and the brown bear pelt is kinda drip.

Proof of Testing

Screenshots/Videos

image

Changelog

🆑 Nerev4r
add: Hearthkin have discovered a new herbal remedy to clear the sinuses, and now enjoy bloodhound-level scent tracking as they did long ago.
add: Hearthkin have discovered a population of grizzly bears on the ice moon, and have appropriately skinned some of them.
/:cl:

… (#25067)

* initial d

* wew

* Apply suggestions from code review

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

* Maybe this will fix it?

* Revert "Maybe this will fix it?"

This reverts commit b75cca9d4d33634e1d899c3bc5fdabbd288b00a8.

* Test CI

* Update species.dm

* Testing to see if this fixes it

* Let's test this too.

* Update species.dm

* Update dna.dm

* Update dna.dm

* Update body.dm

* Revert "Update body.dm"

This reverts commit a213fc7c6091e626ebd870c8432db6f54cf1a6e6.

* Revert "Update dna.dm"

This reverts commit f4af1a25ad40e9e6caae4541aa6564607f9f785a.

* Revert "Update dna.dm"

This reverts commit 385c1122e99200fd85ee732c85f534b8dbdbc9db.

* Revert "Merge branch 'sniffsnoff' of https://github.com/Nerev4r/Skyrat-tg into pr/25067"

This reverts commit 825f586201aa42417bfb95cf29151336e51793b6, reversing
changes made to 385c1122e99200fd85ee732c85f534b8dbdbc9db.

* Revert "Let's test this too."

This reverts commit 55ecfa9b704c181ba1efb2ccb5cc8ae5014ebe6a.

* Revert "Testing to see if this fixes it"

This reverts commit f08e50c88f979284322a79c6c479195c7a1d47f6.

* Update species.dm

---------

Co-authored-by: Snakebittenn <[email protected]>
Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit 228014a into master Dec 7, 2023
22 checks passed
@Iajret Iajret deleted the upstream-mirror-25067 branch December 7, 2023 17:44
AnywayFarus added a commit that referenced this pull request Dec 7, 2023
Iajret pushed a commit that referenced this pull request Feb 18, 2024
…ost on Metastation (#1022)

* [NO GBP] Removes a double newscaster from the arrivals sec post on Metastation (#81523)

## About The Pull Request

This fixes a double newscaster in meta arrivals sec post.


![image](https://github.com/tgstation/tgstation/assets/28870487/fed928fe-20c3-4404-9d7a-ea499d4f3729)

I got really confused when I saw this in-game, because I thought I had
fixed it already. I looked into it but apparently I just moved an
intercom and just didn't fix this in #77706? I literally have the double
newscaster in the pic, but I guess I just forgot to also fix that?? I'm
tagging this as no GBP because I cannot believe I missed this and it
should have been fixed in the first PR.

Anyways its gone now!


![image](https://github.com/tgstation/tgstation/assets/28870487/a21d26f3-53a2-4585-881f-18ba53980f6b)

Say, aren't wallmounts supposed to fall down when not supported by a
tile...?
## Why It's Good For The Game

There needs to be 1 not 2 of them there man.
## Changelog
:cl: Rhials
fix: Removes the double-newscaster from the arrivals sec post.
/:cl:

* [NO GBP] Removes a double newscaster from the arrivals sec post on Metastation

---------

Co-authored-by: Rhials <[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