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

Update 10/27/2024 #92

Merged
merged 16 commits into from
Oct 28, 2024
Merged

Update 10/27/2024 #92

merged 16 commits into from
Oct 28, 2024

Conversation

VMSolidus
Copy link
Contributor

This time featuring 2 new psychic powers

Ichaie and others added 16 commits October 27, 2024 11:30
<!--
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]>
# Description

This PR Implements a new dedicated "Psionic Familiar System", allowing a
new class of powers for summoning Familiars directly. Familiars are
Psionic entities called from other planes of existence, who will follow
and protect the caster, with their life if necessary. Familiars can
never hurt their summoner, and inherit all of the faction tags of their
summoner. When the summoner dies or is mindbroken, his Familiars are
"sent back from whence they came".

Notably, Psionic Familiars are not like Remilia or the Ifrit, they do
not **depend** on being player controlled ghostroles, although they can
be! If not player controlled, they instead function as an NPC, similarly
to a Rat King's Servants.

# TODO

- [X] Implement new familiars for this system to use
- [X] Get sprites ready for the summon familiar spells.
- [x] Move Remilia and the Ifrit out of their Bible, and into the new
Psionic Familiar System.

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


https://github.com/user-attachments/assets/8e89021b-3529-4b48-9909-7e8bfd72d587


![image](https://github.com/user-attachments/assets/f89cbcc5-fb43-423a-a571-8aed9a5cfbba)

</p>
</details>

# Changelog

:cl:
- add: A new class of Psionic powers has been added, "Summon Familiar".
Familiars are a new kind of Psionic creature that can be summoned by
Psions with the right power. Familiars will automatically follow their
Master, attack anyone who attacks their Master, fight back when
attacked, and attack anyone their Master attacks. Additionally,
Familiars are also ghostroles, so that they can be taken over by a
player, but otherwise do not require player control to function.
Familiars disappear when they die, and will also disappear if their
Master is either killed, or mindbroken. Psions can have a maximum of
one(1) familiar at a time.
- add: New psi-power "Summon Imp", as the first new Psi Familiar. Imps
are small motes of living flame that follow and protect their summoner.
Imps also emit an incredibly bright light, and can natively cast
Pyrokinetic Flare.
- add: Remilia has been updated to be a Psi Familiar, and no longer
requires the Bible to summon. Chaplains now start with a Power that lets
them summon Remilia once every 2 minutes.

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: Remuchi <[email protected]>
This is an automated Pull Request. This PR updates the GitHub
contributors in the credits section.

Co-authored-by: SimpleStation Changelogs <[email protected]>
@VMSolidus VMSolidus merged commit 35e786e into master Oct 28, 2024
11 of 12 checks passed
Copy link
Contributor

RSI Diff Bot; head commit 13d6524 merging into 54b310b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Actions/psionics.rsi

State Old New Status
summon_bat Added
summon_imp Added
summon_remilia Added

Resources/Textures/Mobs/Demons/imp.rsi

State Old New Status
imp Added

Resources/Textures/Objects/Weapons/Melee/telebaton.rsi

State Old New Status
icon-off Added
icon Added
inhand-left Added
inhand-right Added

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.

4 participants