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

Upstream Merge 05/07/2024 #293

Merged
merged 70 commits into from
Jul 5, 2024
Merged

Upstream Merge 05/07/2024 #293

merged 70 commits into from
Jul 5, 2024

Conversation

Peptide90
Copy link
Collaborator

Keep us up to date with the latest changes and fixes.
Main changes include:

  • Changes to loadout system from LoadoutJobRequirement to CharacterJobRequirement
  • New psionic stuff we wont use
  • Height and weight sliders
  • Languages, mostly unused

FoxxoTrystan and others added 30 commits June 10, 2024 16:48
Resolves Simple-Station/Einstein-Engines#37

# Description

This PR adds languages. Every entity who can speak now speaks a specific
language (or Universal, for entities that are not supposed to speak,
which is understood by everyone). Other entities who do not understand
this language will see gibberish (it's possible to learn how certain
induvidual words are spelled. But the spelling changes between rounds).
This means that certain creatures, like xenos, cats, vulps, can
communicate within their species in their own languages. Similarly, it
means that xenos, cats and other things cannot understand GalacticCommon
speakers without a translator or cognization.

An entity may be able to speak multiple languages, or understand a
language but be unable to speak it.

Thi PR was orignally made for Frontier but is now being ported and will
be maintain here.
Orignal PR:
new-frontiers-14/frontier-station-14#671

This PR was made orignally by Mnemotechnician and FoxxoTrystan.

---

# TODO

- [x] Language System. (Check Frontier PR for all the compleated todo
list)
- [x] Port PR from Frontier.
- [x] QOL Changes.
- [x] Missing Default Languages. (Missing default langauges for some
roundstart species)
- [x] Animals Languages.

---

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


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/fc43efd9-612e-4a6d-8ed6-90a26d315c6f)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/b86616a3-d5fb-408d-865e-90d09096b6d7)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/ab1e8581-522d-4e7e-95e8-f62575bc5039)

</p>
</details>

---

# Changelog

:cl: FoxxoTrystan / Mnemotechnician
- add: All species can now bring their own cultures and languages

---------

Signed-off-by: Mnemotechnican <[email protected]>
Signed-off-by: FoxxoTrystan <[email protected]>
Co-authored-by: fox <[email protected]>
Co-authored-by: Mnemotechnican <[email protected]>
Co-authored-by: Pspritechologist <[email protected]>
Co-authored-by: Lincoln McQueen <[email protected]>
Co-authored-by: Arkyfloof <[email protected]>
Co-authored-by: reese1243 <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Eagle-0 <[email protected]>
Co-authored-by: BlitzDev <[email protected]>
Co-authored-by: Arkyfloof <[email protected]>
Co-authored-by: Danger Revolution! <[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

<!--
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 add a bunch of Misc Repsrites and others fixes that i have
missed.
This PR will avoid ALL .yml changes and will focus on only "Sprites"
changes.

Here is the following list of Changed Sprites:

• Rust Solid/Reinforced Walls
• Stunbaton
• Banners
• Radiation Collector
• Riot Suit
• Bulletproof Vest
• Armor Vest
• Slim Armor Vest
• Fire Extinguisher
• Stock Parts
• Rack
• Screen

# 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] Port/Resprites.

---

<!--
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/Simple-Station/Einstein-Engines/assets/45297731/3ad4521e-093c-4e3a-a088-6e61e8e66a49)

</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:
- tweak: Rust Walls Sprites.
- tweak: Armor, Bulletproof, Riot Suit Resprites.
- tweak: New Banners Sprites.
- tweak: Stunbaton, Fire Extinguisher New Sprites.
- tweak: Rack/WallScreen resprites.
- tweak: Stock Parts new sprites!
- tweak: Radiation Collector has now a new sprite!
# Description

Nixpkgs updated `8.0.x` to `8.0.3xx` but we need `8.0.1xx`
There's probably an upcoming mirror for this, but whatever.
## Mirror of PR #26441: [Fix atmos NaN
error](space-wizards/space-station-14#26441)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `fdb4a61487db9fc67714c913832427063abdea42`

PR opened by <img
src="https://avatars.githubusercontent.com/u/60421075?v=4"
width="16"/><a href="https://github.com/ElectroJr"> ElectroJr</a> at
2024-03-26 04:27:08 UTC - merged at 2024-03-26 04:44:56 UTC

---

PR changed 16 files with 43 additions and 25 deletions.

The PR had the following labels:
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> - Fixes a bug I introduced in #22521 that caused the temperature to be
set to `NaN`. I don't know for sure, but I assume this is causing the
current atmos issues
> - Fixes `FixVacuum` not working after #22521
> - Removes some redundant yaml that was setting FixVacuum to its
default value
> 
> 🆑
> - fix: Fixed an atmos bug, which was (probably) causing atmospherics
on the station to behave incorrectly.


</details>

Co-authored-by: SimpleStation14 <Unknown>
## Mirror of PR #26447: [Curtains
fix](space-wizards/space-station-14#26447) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `55b146a16c74d9b1ef4991f3ad3e22b15267f56f`

PR opened by <img
src="https://avatars.githubusercontent.com/u/141568243?v=4"
width="16"/><a href="https://github.com/Futuristic-OK">
Futuristic-OK</a> at 2024-03-26 13:45:20 UTC - merged at 2024-03-26
16:03:54 UTC

---

PR changed 2 files with 13 additions and 31 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
>  Now curtains can be built and opened inside walls and windows, etc.
> (There is a mistake that if the curtain is opened outside the 180
degree range, the sound of the curtains opening will not be played by
the player himself. All the surrounding players and ghosts will still
hear the sound.
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
>  Why not?
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
>  A few lines of code
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> Erm... Nothing?
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> - tweak: Сurtains can be built and opened inside full tiles
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - tweak: Сurtains can be built and opened inside full tiles
> -->
> 


</details>

Co-authored-by: SimpleStation14 <Unknown>
…ies with empty containers (#447)

## Mirror of PR #26430: [Reduces size of smaller cartons and fix size
discrepancies with empty
containers](space-wizards/space-station-14#26430)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `47fe7d3cc664d59bacc2036e5678adad47622e3d`

PR opened by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-25 16:06:33 UTC - merged at 2024-03-26 04:04:42 UTC

---

PR changed 2 files with 49 additions and 33 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> - Reduces the item size of drink cartons with `maxVol: 50` to `small`
> - Fixes discrepancies between full alcohol bottles and empty
> - Makes empty cartons consistent with full as well 
> 
> ## Why / Balance
> Keeps it consistent with other drink containers. 
> 
> ## Technical details 
> n/a
> 
> ## Media
> Before:
>
![image](https://github.com/space-wizards/space-station-14/assets/107660393/f232b56c-c4d1-480f-ae29-a11dc2f2c47c)
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes in-game, **or** this PR does not require an in-game showcase
> 
> ## Breaking changes
> n/a
> 
> **Changelog**
> n/a


</details>

Co-authored-by: SimpleStation14 <Unknown>
…ets (#191)

## Mirror of PR #25955: [Trading Outpost now has half buy-only and half
sell-only
pallets](space-wizards/space-station-14#25955)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `c0bbbc33c19eafcc8defaa7f1ec2df42e485b435`

PR opened by <img
src="https://avatars.githubusercontent.com/u/1471082?v=4" width="16"/><a
href="https://github.com/wafehling"> wafehling</a> at 2024-03-10
02:47:02 UTC

---

PR changed 8 files with 226 additions and 123 deletions.

The PR had the following labels:
- Changes: Sprites
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> I added two new entity types, a buy and sell only cargo pallet, and
added them to the trading outpost in place of the old pallets.
> 
> ## Why / Balance
> Since the day this was added, every single shift, at some point I'll
hear someone in cargo yelling about how **"You sold stuff I just
bought!"**
> 
> This seemed like the easiest way to fix the problem.
> 
> ## Technical details
> Added a variable to the cargo pallet component for labeling which type
it is, added two new varieties of the cargo pallet to the yml, and
adjusted all the calls for GetCargoPallets() to have boolean variables
for buyOnly and sellOnly to tell the function what kind of call you're
looking for.
> 
> If you don't give it any specifics it'll still treat any pallet as a
two-way one, but this function is only called 2 or 3 times and I've
adjusted them all and commented the function itself for anyone looking
to change/add it in the future.
> 
> The old pallet is still in the game and is set to "both" by default,
so it should work just fine for backwards compatibility.
> 
> ## Media
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/38cdf849-3e05-4f98-957f-65a719c2280d)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/56e471e9-b45e-4332-bd55-7220566542ab)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/a5e8e651-d301-420a-b2d7-cc4cf07a50af)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/fdf2cf4c-fba8-46c9-9a30-7313a2204b5e)
>
![image](https://github.com/space-wizards/space-station-14/assets/1471082/3811edd0-bb32-44cf-b884-e0a9f4bf16fa)
> 
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> 
> Shouldn't break anything, I've left the old pallets fully in, and
updated them to work with the new GetCargoPallets() function just like
they used to. Not sure if/where you'd still need them, but better safe
than sorry.
> 
> **Changelog**
> 🆑
> - tweak: The trading outpost now has dedicated buy-only and sell-only
pallets. No more accidentally selling orders you just bought. Cargonians
rejoice!
> 


</details>

Co-authored-by: SimpleStation14 <Unknown>
This is an automated Pull Request. This PR updates the GitHub
contributors in the credits section.

Co-authored-by: SimpleStation Changelogs <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
# Description

Adds hand-holes for corpo jackets pending the game being any good.
Renames corpo jacket sprites for clarity and organization.

---

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

See the bot :)

</p>
</details>
# Description

<sub>~~Change from Nyano~~</sub>
Uses space a lot better. The old layout still exists if people want it
for whatever reason.
I also renamed "Default" to "Overlay", which should stay anyway if the
default change is denied.

---

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

## Separated


![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/b97c4373-99ac-4ac5-80a5-149122238551)

## Overlay


![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/3891756f-91f0-4336-b075-6c461ee1b8e6)

</p>
</details>

---

# Changelog

:cl:
- tweak: UI layout now defaults to separated, the old one is still
available in settings
# Description

This pr streamlines the build process by removing the python3 dependency
and pointing to the new build scripts.
# Description

This ports
Simple-Station/Parkstation-Friendly-Chainsaw#46.
This PR is something I consider a key feature adjacent to Space Wind
Rework and its accompanying updates, and is an essential part of the
space station experience.
In practice, this weirdly enough makes being launched into space a bit
easier to survive, since instead of needing to throw potentially
hundreds of items, you can simply throw enough items to get started
flying in the direction of the station and will eventually float back to
the station.

---

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


https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/5570ef35-16e2-493a-ac35-738f27751346


https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/51fba943-8dce-4265-a9cc-7181155eb8de


https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/cd6c0511-2639-4e14-8160-426ba7f2ba73

---
</p>
</details> 

# Changelog

:cl: DEATHB4DEFEAT
- tweak: Space has suddenly become less dense (objects don't slow down
in space)
- remove: Moths are unable to move in space
- tweak: Moths have way better control in zero gravity environments

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
## Mirror of PR #22962: [Landmine
stepoff](space-wizards/space-station-14#22962)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `54dd273f660d6d8d523d0771bb8d8437373b082e`

PR opened by <img
src="https://avatars.githubusercontent.com/u/59531932?v=4"
width="16"/><a href="https://github.com/YuriyKiss"> YuriyKiss</a> at
2023-12-25 12:38:55 UTC

---

PR changed 13 files with 95 additions and 47 deletions.

The PR had the following labels:
- Status: Awaiting Changes


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> Landmine will explode when player steps off it. Landmine will make a
sound effect when player steps on it
> Close #21658 (Issue has some other suggestions, turn them into
separate issues if relevant)
> 
> Requires space-wizards/RobustToolbox#4883
> 
> ## Why / Balance
> IRL some landmines will only trigger after you release the pressure
put on them.
> 
> ## Technical details
> There are two landmine modes now, one will make landmine trigger
immediately after player steps on them another one will only trigger
after player steps off the landmine (this is the default now).
> 
> ## Media
> Landmine stepoff in action:
> 
>
https://github.com/space-wizards/space-station-14/assets/59531932/6e884619-7217-4301-bd78-6e843e0d78f1
> 
> - [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**
> - tweak: landmines will trigger after you step off them
> - add: landmine trigger sound
> 


</details>

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <[email protected]>
# Description

Hooray, more JavaScript!
I tested this on a personal repo with a new PAT, but it *should* work
here first try.

---------

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

Simple-Station/Parkstation-Friendly-Chainsaw#10

This adds a feature whereby a random goal for the shift is faxed to the
station's Captain at the start of every shift.
It is up to the Captain to decide if and how this goal is to be
completed.
Goals are randomly generated every shift, and are meant to help
encourage station activity and RP.
Admins are also able to send station goals via `sendstationgoal`.

---

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


![stationgoals](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4a2b5533-dfee-4388-bfbc-043ee71b2647)

---

</p>
</details> 

# Changelog

:cl: VMSolidus
- add: Added station goals that get sent to the Command fax machine at
the start of every shift

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Courtesy of @StillIcarus

# Description

This adds a new Peacock tail marking to Harpies. I'm also taking this
time to update them to the recent DeltaV changes to the birbs.

# Media

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/4f776006-700e-4d92-802c-03e6dd201491)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/5fd143ab-069f-4d1c-b5e0-ee982a95b4b6)

The backside is semi cursed, but that's something I can't do within the
scope of this PR due to sprite system limitations that Death has planned
improvements for. Just ignore them. :)

Have a birb as consolation.

![faridaiscute](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/09373a57-f32f-48eb-b52b-6d12143f62ff)

:cl: VMSolidus
- add: Peacock Tails have been added for Harpies

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
# Description

Ports
Simple-Station/Parkstation-Friendly-Chainsaw#19

I have added a new stat for firearms, the "Reliability" stat, which is a
number between 0 and 1. It's used as a percentage chance for the weapon
to fire itself when violently thrown into anyone. This PR differs from
the original one slightly in that to get it to actually work without
crashing, I set the system to listen to an event that triggers whenever
the gun collides with another entity, not necessarily just the floor.
This is the same event responsible for the clown's cream pie system, or
for glass shards embedding in an entity.

# Changelog

:cl:
- add: NanoTrasen has disabled the unneeded safeties on your guns- Make
sure you're careful with them!
- tweak: All Firearms now have a reliability stat, some are more
reliable than others. The more reliable a weapon is, the less likely it
is to accidentally discharge when yeeted.
# Description

Simple-Station/Parkstation-Friendly-Chainsaw#11

Later, I would like to have this system not just for animals, but for
implementations of humanoid NPCs, since it can just as easily be used
for human NPCs.
I could make space bandits that CHEEKI BREEKI at people.

# Changelog

:cl: DEATHB4DEFEAT
- add: Animals will no longer be a silent, soulless shell

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
…#445)

## Mirror of PR #26250: [Make all implants unable to be implanted more
than once](space-wizards/space-station-14#26250)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `771390bb6741074935e5f24c0aa9c87bc7b5ad09`

PR opened by <img
src="https://avatars.githubusercontent.com/u/63975668?v=4"
width="16"/><a href="https://github.com/Simyon264"> Simyon264</a> at
2024-03-19 00:44:21 UTC - merged at 2024-03-26 00:16:19 UTC

---

PR changed 3 files with 28 additions and 0 deletions.

The PR had the following labels:
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> This PR makes mind shields unable to be implanted more than once.
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> PJB complained and people waste implants by injecting already injected
people.
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> Adds a new datafield to the Implanter component which is checked in
implanter system.
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
![image](https://github.com/space-wizards/space-station-14/assets/63975668/4907ddb2-de2f-490c-a35d-07c4f3b6c79b)
> 
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> N/A
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> 🆑 Simyon
> - tweak: All implants are now unable to be implanted more than once.
> 


</details>

Co-authored-by: SimpleStation14 <Unknown>
SimpleStation14 and others added 19 commits July 1, 2024 22:37
<!--
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]?
-->

Self explanatory

P.S. i genuinely dont know what the fuck i did, who wrote this?

# 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 shit

# Media

https://youtu.be/hbJbd5SgZ54

# 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 loadouts becoming uneditable after spending all your points
# Description
Cherry-picks DeltaV-Station/Delta-v#1194

This is a minor issue in the yml files of custom species that will
become a problem if we ever merge wizden's better hand indicators.

This PR shouldn't require a preview; all credit goes to the original
author of the fix.

---

# Changelog
Too minor for a cl. Or as some say, no cl no fun.

Co-authored-by: Angelo Fallaria <[email protected]>
# Description
Cherry-picks DeltaV-Station/Delta-v#1237

All credit goes to the original author, deltanedas

Adds a PDA app that lets seccies know who's wanted and who's about to be
thrown out of an airlock without relying on the sechud and people having
their IDs on them.

# Media


![image](https://github.com/Simple-Station/Einstein-Engines/assets/69920617/37f5fa1a-27a5-4392-b4bb-be0f1016b499)

(see the original PR for a better preview)

# Changelog

:cl: deltanedas
- add: Security can find the new SecWatch™ app in their PDAs to see
current suspects and wanted criminals.

Co-authored-by: deltanedas <[email protected]>
Co-authored-by: Azzy <[email protected]>
# Description
For some reason, ClothingSystem.TryEquip would return false if there's a
do-after to equip the clothing. This had caused all quick-equip attempts
on SMALL ITEMS to fail and ended up with every SMALL clothing item being
equipped into one of the pocket slots (which have no equip delays).

Also fixes quick swap - see the comments below.

# Changelog

:cl:
- fix: Equipping clothing using the Z key works correctly again.
# Description
Makes it so that the station and the ATS get a very tiny bit of friction
to prevent cargo tech pros from sending either of those out of this
galaxy cluster (which has actually happened multiple times on two
servers and required either admin intervention or early round ending).

# Technical details
Added a PassiveDampeningComponent which defines how much friction an
entity receives while in 0g. FrictionRemoverSystem was updated to try to
fetch this component from an entity before updating its dampening. A new
system was added to automatically add this component (if it's not
already defined) to all station grids.

# Media
See the #when-you-code-it channel for a preview. It's kinda hard to
demonstrate, but after a few minutes, stations and the ATS come to an
almost complete stop.

# Changelog
:cl:
- tweak: Space stations now have a tiny bit of velocity dampening to
prevent them from being flunged into the void.
# Description
This cherry-picks the following two PRs of mine from delta-v:
- DeltaV-Station/Delta-v#1118 (this one is a
port of two other frontier PRs, see the original description for
details)
- DeltaV-Station/Delta-v#1232

Encompassing a total of 8 distinct changes:
1. Fixes dropping the carried person when walking to a different grid
(from station to shuttle or vice versa. Walking into space however will
still make you drop them) and also makes sure that pressing shift while
being carried does not make you escape.
2. Ensures that the carried person is always centered relative to the
parent (under certain conditions, such as walking near a gravitational
anomaly, their position can change, and that leads to really weird
effects)
3. Fixes the mass contest in CarryingSystem that caused stronger
entities to take longer to escape than weaker ones.
4. Adds popups for when you're getting picked up or being stuffed into a
bag as a pseudo-item (e.g. a felinid)
5. Adds an action to stop escaping an inventory. This action gets added
to your action bar when you attempt escaping and gets removed when you
stop or escape. It applies both to carrying and items (hampsters,
felinids, whatever else).
6. Adds a sleep action for pseudo-items stuffed inside a suitable bag.
The bag must have a special component, which is added to the base
backpack item and thus inherited by all soft bags (duffels, satchels,
etc). Contrary to a popular belief, sleeping IS PURELY COSMETICAL and
does not provide healing. (Beds provide healing when you buckle into
them and that healing does not depend on whether or not you're sleeping)
7. Makes it so that when you try to take a pseudo-item out of the bag
(e.g. a felinid), you automatically try to carry them (if you don't have
enough free hands, they will be dropped on the floor like usually), and
enables you to insert the carried person into a bag, but only if they're
a pseudo-item (e.g. felinid).
8. Allows pseudoitems to be inserted into bags even when there are other
items (as long as there's enough space)

---

## For technical details and video showcases, see the original PRs

This PR is split into separate commits so different parts can be
reverted if deemed unneccessary.

---

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

![Example Media Embed](https://example.com/thisimageisntreal.png)

</p>
</details>

---
-->

# Changelog
:cl:
- fix: Carrying is less likely to behave erratically or suddenly
interrupt now.
- add: You can now see when someone is trying to pick you up, and also
you can interrupt your attempt at escaping from their hands or
inventory.
- add: You can now properly take Felinids out of bags and place them
inside.
- add: Scientists have discovered that Felinids can sleep in bags.
# Description
Ports delta-v paper signatures implemented by me in
DeltaV-Station/Delta-v#1172, including the
changes later introduced by deltanedas in
DeltaV-Station/Delta-v#1345.

Everything should be pretty self-explanatory, see the original PR for
details.

---

<!--
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/Simple-Station/Einstein-Engines/assets/69920617/50737402-a60d-425a-8938-f6e47427b22b)

(see the original PR for a video demonstation)

</p>
</details>

---

# Changelog

:cl:
- add: You can now sign paper by alt-clicking it while holding a pen.

---------

Signed-off-by: Mnemotechnican <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
@Peptide90 Peptide90 merged commit a0526e9 into master Jul 5, 2024
9 checks passed
@Peptide90 Peptide90 deleted the upstream_merge branch July 5, 2024 20:29
Peptide90 pushed a commit that referenced this pull request Jul 24, 2024
## Mirror of PR #26162: [Door Remote now shows Mode in
UI](space-wizards/space-station-14#26162) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `e627a0d24bc8ae89665feb0b0d519b5fbb77ce32`

PR opened by <img
src="https://avatars.githubusercontent.com/u/58439124?v=4"
width="16"/><a href="https://github.com/Plykiya"> Plykiya</a> at
2024-03-15 23:14:52 UTC

---

PR changed 7 files with 151 additions and 67 deletions.

The PR had the following labels:
- Status: Awaiting Changes


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> Changed the door remote to show what mode it's in on the UI so you
don't have to toggle it to figure out if you're bolting a door or
setting it to emergency access...
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> There is no indicator and it's awkward to set a door to emergency
access instead of bolting it against nukies.
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> - Split DoorRemoteSystem into Shared/Server/Client from just Server
> - Added door remote status control that updates itself on first pickup
and then whenever the mode is toggled
> - Got rid of the custom "ShowPopupToUser" function that the DoorRemote
used to have in favor of PopupClient/PopupEntity
> - Created new Door Remote locale messages.
> 
> The only problem I have with my code change is that I created a shitty
fourth placeholder enum so that I could check for a difference on
initial pickup with PrevOperatingMode. Without it, the mode string only
appears on pickup for 2/3 options instead of 3/3 options because the
default PrevOperatingMode would end up matching the current Mode the
door remote is set to, thus not updating the UI. Would love a better
implementation suggestion for that...
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [ X ] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
>
https://github.com/space-wizards/space-station-14/assets/58439124/733eb78a-d1a6-4678-a325-9fda8dc1a4c8
> 
> 
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> DoorRemoteComponent moved from Content.Server.Remotes to
Content.Shared.Remotes.Components, DoorRemoteSystem OnInHandActivation
changed from Public to Private, DoorRemoteSystem moved from
Content.Server to Content.Shared, DoorRemoteSystem is now
SharedDoorRemoteSystem
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> 🆑
> - add: Door remote UI now shows the mode it is in.
> 


</details>

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <[email protected]>
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.

10 participants