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

Prison communications #715

Merged
merged 56 commits into from
Mar 8, 2024
Merged

Conversation

Bonktrauma
Copy link
Contributor

@Bonktrauma Bonktrauma commented Jan 23, 2024

About the PR

Added in the prisoner coms key
Gave prisoners and prison guards new headsets with the prisoner encryption key
Gave warden a box of the keys
Gave security key access to prison key by default

Why / Balance

I wanted an easier way to speak with prisoners without giving them access to security coms

Technical details

Media

additions

  • [ x] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog
🆑 - BonkTrauma and DangerRevolution

  • add: Added Prisoner communication channel and updated a few headsets to include it

@Bonktrauma Bonktrauma requested a review from DebugOk as a code owner January 23, 2024 21:53
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review labels Jan 23, 2024
Copy link
Contributor

github-actions bot commented Jan 23, 2024

RSI Diff Bot; head commit d2a2b19 merging into 717e81c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi

State Old New Status
crypt_orange Added
prisoner_label Added

Edit: diff updated after d2a2b19

@ps3moira
Copy link
Contributor

ps3moira commented Feb 7, 2024

this is great. is there also a prisoner intercom?

@Bonktrauma
Copy link
Contributor Author

this is great. is there also a prisoner intercom?

I haven't added an intercom, I uh, might, but I'm not sure how the intercoms work since I haven't taken a look at them, prisoners will automatically start with the prisoner com channel so there isn't much point in the intercom in my opinion

@Bonktrauma Bonktrauma requested a review from VMSolidus February 20, 2024 19:58
@DebugOk
Copy link
Contributor

DebugOk commented Mar 7, 2024

@VMSolidus Please re-review and merge if its good enough

@VMSolidus VMSolidus merged commit 9b783af into DeltaV-Station:master Mar 8, 2024
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Mar 8, 2024
@Bonktrauma Bonktrauma deleted the prison-headset branch March 8, 2024 13:44
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
# Description

Per DeltaV-Station#711, this PR adds new stat changes to Vulpkanins to make them more
mechanically interesting and distinct from Humans.

- Receive the Voracious trait by default, giving them 2x eating/drinking
speed.
- Takes 30% less Cold damage
- Takes 30% more Heat damage, up from 15%.
- Hunger rate increased by 25%.
- Receive 25% more fire stacks, increasing the Heat damage and duration
of being on fire.
- Flash duration has been increased by 50%.
  - The duration of flashes, 5 seconds, will become 7.5 seconds.

**Only merge** alongside DeltaV-Station#715.

## Media

<details><summary>Expand</summary>

**New flash duration**


https://github.com/user-attachments/assets/afafd890-d40b-4c63-9259-53ae6a355e53

</details>

## Changelog

:cl: Skubman
- add: Vulpkanins receive the Voracious trait for free, giving them 2x
eating/drinking speed, but Vulpkanins get hungrier 25% faster.
- tweak: Vulpkanins gain a 30% Cold resistance, but their Heat
vulnerability has increased from 15% to 30%. Vulpkanins also receive 25%
more Fire stacks, amplifying the damage and duration of being on fire.
- tweak: Flash duration against Vulpkanins has been increased by 50%.

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
![WarningTrystan](https://github.com/user-attachments/assets/958f868b-11b9-48f0-80ab-13d9ff243f06)
<!--
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 is the rework regarding the unique feature for vulpkanins, this
is mostly due to the "FORCED" Issue by VM:
Simple-Station/Einstein-Engines#711

This PR will mostly add the new features that will mostly make
Vulpkanins unique.

For Vulpkanin Stats changed please check this PR:
Simple-Station/Einstein-Engines#713

- Flash Damge: Flashable has 2 new variables "EyeDamageChance" (Float)
and "EyeDamage" (int), those are default to 0 but if changed could give
a chance from 0 to 1 to give EyeDamage from the EyeDamage Value, this is
not fixed to vulpkanin and can be added to anything with the "Flashable"
Component.
- ScentTracker: Add a new Forensics type "Scent", scent will spread on
everything you wear and only the ent with the "ScentTrackerSystem" can
track a scent, tracking a scent will leave an effect on those who has or
the item with the scent, scent can be cleaned away with soap or you can
compleatly generate a new scent of a person by cleaning yourself, note:
someone with a scent does not mean his the one making that scent, they
may just have an item with the scent in their bag!
- Vulpkanins Screams: I have 5 Fox Screams that need to be edited and
need to be added in-game for vulpkanins with a lisence, just need to
have the time to do it and this PR seem the perfect place for it.

---

# 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] Flash Damage
- [x] Scent System
- [x] ScentTracker System
- [x] Vulpkanin Screams

---

<!--
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>


![image](https://github.com/user-attachments/assets/3bd60c0f-2528-4be7-a52d-defe2990c475)

![image](https://github.com/user-attachments/assets/6756b6af-3f76-4faa-9fbd-c35964b267b3)

![image](https://github.com/user-attachments/assets/b4ff84a2-64eb-4985-876b-d3e93fc8bd12)

![image](https://github.com/user-attachments/assets/dd4b47ea-ae39-44c3-b5a2-27ee68703857)

</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: FoxxoTrystan
- add: Forensics Scent Type and Vulpkanins can now track scents, better
keep yourself clean!
- tweak: Vulpkanins eyes are sensetive, please dont flash them with
lights as this could damage them.
- add: Vulpkanins now has their own screams!

---------

Signed-off-by: FoxxoTrystan <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
# Description
Fixes cleaning forensics off of an object being impossible unless it has
a scent. Explained in the latest (to date) comment to DeltaV-Station#715.

Also removes some unnecessarily duplicated code and inverts an if
condition.

# Changelog
:cl:
- fix: Soap once again can be used to clean evidence off.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants