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

Floof Station Release V5 #376

Merged
merged 146 commits into from
Nov 24, 2024
Merged

Floof Station Release V5 #376

merged 146 commits into from
Nov 24, 2024

Conversation

Fansana
Copy link
Owner

@Fansana Fansana commented Nov 23, 2024

sarcoph and others added 30 commits September 21, 2024 15:49
The refactors here are a little clunky, sorry. I wanted these three specific gas masks to have a unique Ingredient tag for the sake of crafting.
This is why the GasMaskTags prototype exists: to "reset" the child gas masks to the original tag list. Not pretty but otherwise you would be able to use muffled gas masks in the crafting recipes and waste resources, which would trip up anyone who wanted to make multiple muffled gas masks at a time.
Just the regular one, because the other two gas masks aren't equippable in loadout themselves.
I actually don't know if this is necessary because they were moved rather than removed.
# Description

Fixes issue [reported in the
discord.](https://discord.com/channels/1218698320155906090/1218698321053356060/1298139147428696095)

---
# Media

![image](https://github.com/user-attachments/assets/11bf61b5-caf0-4104-9224-f55b1c29c1b6)

---

# Changelog

:cl:
- fix: Cybereyes examine message no longer reveals person's identity.

Signed-off-by: Remuchi <[email protected]>
# Description
Ports DeltaV-Station/Delta-v#1383 with all due
changes.

Also moves some files from delta-v/nyano namespaces to the root
namespace.

# TODO
- [X] Port fun
- [X] Test fun
- [X] Record fun

<details><summary><h1>Media</h1></summary>
<p>

I had to compress the shit out of this video, so it's about as good as
it can get.


https://github.com/user-attachments/assets/3ab9d328-ae6e-4a6c-8a48-9da22783579a

</p>
</details>

---

# Changelog
:cl:
- add: Raising glimmer too high can now cause glimmer wisps to start
haunting the station.

---------

Co-authored-by: deltanedas <[email protected]>
…(#1137)

# Description
Resolves #1132.

# Changelog
:cl:
- fix: Fixed the "high amplification" trait lowering your amplification
instead of increasing it.

Signed-off-by: Mnemotechnican <[email protected]>
This cherry-picks
space-wizards/space-station-14#30576

# Description
adds cool energy bolas

---------

Signed-off-by: Ghost581 <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: Remuchi <[email protected]>
# Description

It was missing from the #944 for some reasons.


# Changelog
:cl:
- fix: Added missing deflect alert locale.

Signed-off-by: Remuchi <[email protected]>
* Fix (hopefully)

* Fixed Spelling Mistake and minor Code Cleanup

* Revert "Fixed Spelling Mistake and minor Code Cleanup" due to Pull
Request Guidelines

This reverts commit cee3e0226b349187bd8fd8b639e161fb877e8bdb.

# Description

Fixes SS14-Classic/deep-station-14#87

---------

Co-authored-by: DakotaGay <[email protected]>
Co-authored-by: Julian Giebel <[email protected]>
# Description

Behold, the counterpart to Shadeskip. Pyrokinetic Flare.
It is the "Lessermost" of all planned Pyroclastic-Anomaly Powers. This
one is quite simple. It produces a flashbang effect when cast, and
creates some glimmer. This is a natural counter to people spamming
Shadeskip all over the station, since flash effects can be used to clear
living shadows.

<details><summary><h1>Media</h1></summary>
<p>


https://github.com/user-attachments/assets/6db1db99-3985-4b6e-9766-b161394f0eee

</p>
</details>

# Changelog

:cl:
- add: Added Pyrokinetic Flare as a new Psi ability.
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Updated the penlight to work with the new UI system.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Fix Penlights

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- fix: Fixed penlights
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

this PR fix #1126 

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->


---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![imagem_2024-10-22_112221053](https://github.com/user-attachments/assets/d9b21d1e-834b-4c8a-a27e-e3d6ea079567)

![imagem_2024-10-22_112257222](https://github.com/user-attachments/assets/58a99618-ed63-4193-9ee0-1d1d83cc9d5f)

![imagem_2024-10-22_112309324](https://github.com/user-attachments/assets/bf4d2e9b-6b9c-4de5-b5f4-d53428fd02fe)

![imagem_2024-10-22_112323017](https://github.com/user-attachments/assets/97efceb6-a4f5-435f-abb9-3115ce1e2870)

![imagem_2024-10-22_112333040](https://github.com/user-attachments/assets/bea13c3d-6278-4b53-ae11-070782d4c741)

![imagem_2024-10-22_112343862](https://github.com/user-attachments/assets/88ead88e-5db0-46eb-a4cb-480946ed96cc)

![imagem_2024-10-22_112417214](https://github.com/user-attachments/assets/cec33b4d-8bba-4872-8573-3d224d526b06)


</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- fix: #1126
# Description

The listening post being able to recall the shuttle was a little too
much for people, but luckily it and a few other things are datafields.
This PR removes the "Shuttle Recall" functionality for the
communications console on the Listening Post, while also giving a custom
broadcast announcement to the comms console so that it isn't just using
the Nuclear Operative Announcement. This way the listening post isn't
forcing people to call red alert by faking a nukie threat every round.

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/97e0ca52-893b-4dd5-bc3b-bbb2a601236b)

</p>
</details>

# Changelog

:cl:
- tweak: The Syndicate Listening Post now has a custom communications
console, which no longer can recall Nanotrasen shuttles, and doesn't
sign its messages as Nuclear Operatives.
# Description
Some of the icons consist of multiple layers so they were incorrectly
displayed in radial selector menus. Now this system uses the same method
PrototypeSelectorMenu uses.


![image](https://github.com/user-attachments/assets/49de1798-e909-4e0a-8495-ca52c227b121)
---

# Changelog

:cl:
- fix: Layered icons are now properly displayed in radial menus.

Signed-off-by: Remuchi <[email protected]>
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

I don't understand why it hasn't been done before tbf.


https://github.com/user-attachments/assets/6ea2a3eb-80ce-4905-b546-7b8902308533

---

# Changelog

:cl:
- add: Clicking on health alert now will print message in chat,
displaying your health state.

---------

Signed-off-by: Remuchi <[email protected]>
# Description

Made by request from Nuclear14, while also adding a trait that was
present both in Parkstation, as well as something N14 would like to
have. This PR extends the TraitSystem so that it can now also add or
remove Factions from a character. It also adds in the Animal Friend
trait from Parkstation/Fallout: New Vegas.

# Changelog

:cl:
- add: The Animal Friend trait has been added to the game. Characters
with this trait are not attacked by animals.

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

Introduces a telescopic baton - a new self-defense weapon for command
staff

DEVELOPERS:
* Adds a way to apply status effects with pre-made component.

AWAITING DISCUSSION:
* Currently, the system works that players are rewarded for their skill
and ability to click precisely. The batton will knockdown someone only
in first 1.5 seconds after extending it. If you fail to do so, you'll
have to retract it and extend once again, which takes about 4 seconds
total.

---
<details><summary><h1>Media</h1></summary>
<p>


https://github.com/user-attachments/assets/cc19bf44-391e-4d27-9be9-96d3d77bebc8

</p>
</details>

---

# Changelog

:cl:
- add: Added telescopic baton - a self-defense weapon for Command staff.

---------

Signed-off-by: Remuchi <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Copy link
Contributor

Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation.

You can move your current work from the master branch to another branch by branching from and resetting the master branch.

@github-actions github-actions bot closed this Nov 23, 2024
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Audio Changes any ogg files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: Workflow Changes any GitHub workflow files Changes: YML Changes any yml files labels Nov 23, 2024
@FoxxoTrystan FoxxoTrystan reopened this Nov 23, 2024
@Memeji Memeji added the Priority: 1-High Needs to be resolved as soon as possible label Nov 23, 2024
@Fansana Fansana marked this pull request as ready for review November 24, 2024 01:08
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Nov 24, 2024
Copy link
Contributor

Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation.

You can move your current work from the master branch to another branch by branching from and resetting the master branch.

@github-actions github-actions bot closed this Nov 24, 2024
@FoxxoTrystan FoxxoTrystan reopened this Nov 24, 2024
@FoxxoTrystan
Copy link
Collaborator

#375 is not even merged into Master.

@Fansana Fansana self-assigned this Nov 24, 2024
@Fansana Fansana merged commit 261c645 into stable Nov 24, 2024
38 of 40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: Workflow Changes any GitHub workflow files Changes: YML Changes any yml files Priority: 1-High Needs to be resolved as soon as possible Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.