Commit Graph

26399 Commits

Author SHA1 Message Date
sleepyyapril
ec2e483dd8 Fix AgeRequirement Showing Int32 Maximum (#1732)
I did separate locales because it'd be messy otherwise.

🆑
- fix: Loadouts will no longer show the integer limit.

(cherry picked from commit ef5d0e770f390c38dfd4ba173886598de1e96572)
2025-02-15 00:03:37 +03:00
SimpleStation Changelogs
382ad97b97 Automatic Changelog Update (#1731)
(cherry picked from commit bfed410db4db5c7959971d051b41f25986806950)
2025-02-15 00:03:33 +03:00
sleepyyapril
f011cb62aa Fix Arcade Machines (#30376) (#1731)
🆑
- fix: Fixed the most pressing issue: arcade games not working.

Co-authored-by: themias <89101928+themias@users.noreply.github.com>
(cherry picked from commit bd5259a088fa059faaacd846526c36bc9c09f4a1)
2025-02-15 00:03:29 +03:00
SimpleStation Changelogs
24ef6cb861 Automatic Changelog Update (#1727)
(cherry picked from commit 70603429b20665684fb58b03f69a905ffcfec4ab)
2025-02-15 00:03:25 +03:00
VMSolidus
300a851c66 Make BSO Able To Take Secoff Guns (#1727)
# Description

Congratulations, BSO can now take better guns if they wish. Or a sword.
I don't care.

# Changelog

🆑
- add: BSO now selects their weapon from the same list as Security
Officers. So you can trade your energy revolver for a Python if desired.

(cherry picked from commit 658d90fbf7d145e5cc0b89bdec7f40e1a95af244)
2025-02-15 00:03:21 +03:00
SimpleStation Changelogs
72dee9d2d6 Automatic Changelog Update (#1720)
(cherry picked from commit 58573e114e4ffb934a6a4d0749a27da6c6c09bc9)
2025-02-15 00:03:16 +03:00
VMSolidus
f0de1d3d4a Port Adjustable Jumpsuits And Undergarments (#1720)
# Description

Ports https://github.com/impstation/imp-station-14/pull/375
and https://github.com/impstation/imp-station-14/pull/384
Which are meant to go together.

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

![image](https://github.com/user-attachments/assets/090482f0-3665-42c6-badd-0985a928adfd)

</p>
</details>

# Changelog

🆑
- add: Added the ability to roll down jumpsuits to the waist, as well as
undergarment markings for wearing alongside said rolled jumpsuits.

---------

Co-authored-by: V <97265903+formlessnameless@users.noreply.github.com>

(cherry picked from commit 40b78c3150707db2965333b9e821add650d6cb53)
2025-02-15 00:03:11 +03:00
SimpleStation Changelogs
1b6eb8eae7 Automatic Changelog Update (#1728)
(cherry picked from commit bbd5820f957c6ce5f7633a68c8bef24d0009c302)
2025-02-14 23:37:30 +03:00
deltanedas
25df92e23d Port Autodoc Surgery Part Filter (#1728)
## About the PR
The autodoc surgery selection UI now only shows surgeries relevant to
the given part

## Why / Balance
Displaying less irrelevant information to the user makes the UI easier
to understand and use

## Technical details
add filtering logic in PickSurgeryWindow.xaml.cs

## Media

![10:29:33](https://github.com/user-attachments/assets/a41a2022-b5b3-4fa4-a67a-513dbc6860b2)

![10:29:22](https://github.com/user-attachments/assets/54032b09-e3da-4cbf-b1a0-c58d45cdb061)

## Requirements
- [X] I have read and am following the [Pull Request and Changelog
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
- [X] I have added media to this PR or it does not require an ingame
showcase.

## Breaking changes
no

**Changelog**
🆑 sowelipililimute
- tweak: Autodoc only lists surgeries relevant to the given part, e.g.
it won't suggest that you can lobotomise a left leg

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
(cherry picked from commit 37eb5dc09346d02254187f0e9db96545891a5a81)
2025-02-14 23:37:21 +03:00
SimpleStation Changelogs
05508cf934 Automatic Changelog Update (#1725)
(cherry picked from commit 636e70a99264f9142e5b79fc291648850af9d340)
2025-02-14 23:37:15 +03:00
VMSolidus
d0b50a9d0d No More Telepathy While Unconscious (#1725)
# Description

This removes the ability to use telepathy while unconscious.

# Changelog

🆑
- remove: Removed the ability to use Telepathy while unconscious. It is
now safe to sleepy-pen people who have psi powers.

(cherry picked from commit 7f4350b92714377afeeceaac9361a58bf926d38e)
2025-02-14 23:37:07 +03:00
SimpleStation Changelogs
788b1a9055 Automatic Changelog Update (#1716)
(cherry picked from commit def19e002704423a625752a446d4d2551f97782a)
2025-02-14 23:37:00 +03:00
sleepyyapril
75075e2940 Quick ChemMaster Fix (#1716)
🆑
- fix: Fixes the ChemMaster playing the button press sound on open.

---------

Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit 9ddfa358a7f0916422d29493dbb353a62f87e5d2)
2025-02-14 23:36:53 +03:00
sleepyyapril
11aa54b675 Fix Sanitization (#1688)
fixes sanitization with regards to emotes and radio prefixes being
silly.
prevents color coding your chat by escaping the escape

---------

Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com>
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: Hyper B <137433177+HyperB1@users.noreply.github.com>

(cherry picked from commit 69554e077cb926c5535c231dabbbb639f8dda0b7)
2025-02-14 23:36:45 +03:00
stellar-novas
54f9dbb66b Shhhh I Fucked Up (#1724)
Broke the CL when I edited it for them

Signed-off-by: stellar-novas <stellar_novas@riseup.net>
(cherry picked from commit ebf13c263c8b4645b729d285211f46dd05841d74)
2025-02-14 23:34:52 +03:00
SimpleStation Changelogs
5898d92020 Automatic Changelog Update (#1674)
(cherry picked from commit 47994d20772e3a0a4ec94afcb6cae102812cc134)
2025-02-14 23:34:45 +03:00
sleepyyapril
f028176cf2 AAC Tablet Port (#1674)
ports all changes to the AAC tablet and the AAC tablet itself. also puts
it in items loadout.

🆑
- add: Ported the AAC tablet from Delta-V.

---------

Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Milon <plmilonpl@gmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: keekee38 <iamabanana372456@gmail.com>
(cherry picked from commit 5f39fa26f8c0370baae6ee5b33bfaeda451ed4a3)
2025-02-14 23:34:34 +03:00
SimpleStation Changelogs
99beb66591 Automatic Changelog Update (#1723)
(cherry picked from commit 435e2ccad025bffb1cdb3da366d11de88828807d)
2025-02-14 23:34:27 +03:00
VMSolidus
4c03833c33 Fix CyberEyes (#1723)
# Description

Last changes to CyberEyes broke nightvision, so this reverts those
changes.

# Changelog

🆑
- fix: Fixed night vision not working correctly.

(cherry picked from commit 3d24fed5daddef4d8cca8a17aa2572f54127668b)
2025-02-14 23:34:21 +03:00
SimpleStation Changelogs
6f97943feb Automatic Changelog Update (#1722)
(cherry picked from commit c908efba4332824c73a9239c619e024846fba688)
2025-02-14 23:34:14 +03:00
Alice
169dcc1a29 Psionic Mantis Guidebook Entry (#1722)
(cherry picked from commit cb858848fe9b7260c2542b807bf33ff601db041a)
2025-02-14 23:34:04 +03:00
SimpleStation Changelogs
cfd21c5a93 Automatic Changelog Update (#1717)
(cherry picked from commit 631edc254b64842d69f18bfd15c69b32f3a1431a)
2025-02-14 23:33:51 +03:00
Timfa
f290a5988f Gladiabot Tweaks (#1717)
Signed-off-by: stellar-novas <stellar_novas@riseup.net>
(cherry picked from commit b3c27808a6cb00dec49d42e24f6a23b1da37d7c9)
2025-02-14 23:33:44 +03:00
SimpleStation Changelogs
9a1ec34dc7 Automatic Changelog Update (#1718)
(cherry picked from commit 3358e1fd1c585c02981dc60f7536a809d83a4a1a)
2025-02-14 23:33:37 +03:00
Timfa
7f6e061d39 Add a Plunger to the Cleaning Module (#1718)
<!--
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]?
-->

Give 'em plungers.

---

<!--
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/27a2a2d8-0b60-4f57-8f08-a61020579952)

</p>
</details>

---

# Changelog

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

🆑 Timfa
- add: Add plunger to a Borg Cleaning Mobule

(cherry picked from commit c20c166320c681b3eb39340f7bbc25490a409b15)
2025-02-14 23:33:30 +03:00
SimpleStation Changelogs
8f3024db3a Automatic Changelog Update (#1693)
(cherry picked from commit 040703e4c2bf1aa8bef5fff646b9a1de5146ed83)
2025-02-14 23:33:24 +03:00
VMSolidus
52b6896a91 Add 4 New Mining Materials (#1693)
# Description

This PR adds 4 new materials for use with lathe recipes. As well as
plenty of assets to implement more as we need. Nothing actually
currently uses these yet, so they're just sellable for now. Eventually
we're going to start differentiating ore loot by biome, so that we can

# TODO

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

![image](https://github.com/user-attachments/assets/27efa510-592a-4d4c-8de5-f35a929c3b1f)

![image](https://github.com/user-attachments/assets/7eddd91b-c49a-4ec8-aa80-f68d2dc88c17)

new ores

![image](https://github.com/user-attachments/assets/259c0213-efba-4c5b-8baf-ea565d54c142)

</p>
</details>

# Changelog

🆑
- add: Added lathe and ore processor materials for Lead, Aluminium,
Copper, Tungsten-Carbide, and Circuitry. Only Tungsten-Carbide currently
has a use.
- add: Tacsuits now require Tungsten-Carbide to make instead of
Plasteel, and require a lot less.
- add: Reworked ore drops for Lava planets. Lava planets now have random
ores that drop from any rock, but with their own drop table. Iron & Gold
are "Plentiful" on lava planets, with moderate amounts of Aluminium and
Tungsten. All other ores are very rare from Lava rocks.
- add: Energy Swords can now be manufactured at a Secfab after
researching Arsenal T3 Prototype Weapons

---------

Co-authored-by: stellar-novas <stellar_novas@riseup.net>

(cherry picked from commit dad3d5ddbc7051ce4d6f0e361beffd5c931933df)
2025-02-14 23:33:13 +03:00
Spatison
cbf9f4c052 upstream fix 2025-02-05 19:36:04 +03:00
SimpleStation Changelogs
86bd104a3e Automatic Changelog Update (#1706)
(cherry picked from commit 9448bac9cf3de6de64da3ce51f038792b95ad568)
2025-02-05 18:43:40 +03:00
Timfa
b4e414f5a1 Disablerbot & Batonbot Tweaks & Emagging (#1706)
(cherry picked from commit db087b09d29b0b45510a1e945e81741473b4bccc)
2025-02-05 18:43:36 +03:00
SimpleStation Changelogs
522e432918 Automatic Changelog Update (#1697)
(cherry picked from commit ebd6f8d2105c257594b82011a472d8f333edaf75)
2025-02-05 18:36:55 +03:00
ScarKy0
368efb8a5d Update binary key to use AI icon (#32327)
* Init

* uplink icon

(cherry picked from commit 5d5fdbe8c57eab28aad2482418e8fb2ee58abf18)
2025-02-05 18:36:44 +03:00
ArtisticRoomba
606d4720b7 Change the binary translator key's contraband designation to syndicate contraband + minor sprite change for consistency (#32193)
* adds new icon, changes binary key icon and frame, changes contraband designation

* added back the regular key as admeme because it makes sense (why am I not thinking about these things)

* hehe I cannot read!

(cherry picked from commit e5c671b195551015c430acd3778a7bbed645e747)
2025-02-05 18:36:38 +03:00
Adeinitas
90ee08ac54 Adds some things to the lobby (#1143)
* The first part of this PR, "Lobby Music"

* Part 2 of this PR, act 1: "Operator Plush"

* WebP conversion+ Fixing some YML

(cherry picked from commit 43290c65dd60ca54e11ccfd32ea6afb8691939a6)
2025-02-05 18:36:31 +03:00
Radezolid
a42a5f518b Added binary key to the LPO (#2635)
Added binary key

(cherry picked from commit 63712e66205001680561a2b6ca844cb0c6d742b8)
2025-02-05 18:36:28 +03:00
Kr8art
c054d6ea44 Add fox ears inner layer (#2539)
Foxears-inner

(cherry picked from commit 5a7c543d74030191d17c0e898446978281ea91c6)
2025-02-05 18:36:24 +03:00
Colin-Tel
c472d6cdbe Adds recipe for a box of nuggies (#2524)
Adds nuggie recipe

(cherry picked from commit d622d8d6a14bfb17025e663b40c350d14d325af8)
2025-02-05 18:36:21 +03:00
Stop-Signs
a439b14890 Port ingredient containers from frontier (#2504)
* Ported

* spawners

* Update food_ingredients.yml

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

---------

Signed-off-by: Stop-Signs <stopsign221@gmail.com>
(cherry picked from commit b8f9b7ca0ef86d7ff6bcbb6596de1a18a8d13506)
2025-02-05 18:36:13 +03:00
Velcroboy
e5657b2f3a Update some food spawners w/ entity tables (#30957)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
(cherry picked from commit 7ac1b2db1672b6a9f4e4a09ba14637056b9b8669)
2025-02-05 18:36:03 +03:00
Stop-Signs
c64e1fb603 1 more egg carton (#2503)
* easy

* Update chefvend.yml

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

---------

Signed-off-by: Stop-Signs <stopsign221@gmail.com>
(cherry picked from commit bd196992fdd2608c3b111dc2add79f5eba4643bf)
2025-02-05 18:35:57 +03:00
Stop-Signs
4aa485c528 Removes cooked egg reaction (#2501)
1984

(cherry picked from commit c029d5d4b8df2fdccba92f0bc14e635b2cdb6024)
2025-02-05 18:35:48 +03:00
boogiebogus
0e6ca2504a Add luna moth wings to moths (#2478)
* add selene wings

* brighten primary and secondary recolorable sprites

* correct meta.json whitespace

* bruh

* hopefully correct for real this time

(cherry picked from commit 943e4bf11a9892fbff9db7fe0419650ce5962de0)
2025-02-05 18:35:43 +03:00
Aikakakah
6bb7625ecc Drink flavors (#2462)
* Added flavors

* Added the flavors for real this time

* Fixed the spaces

* Removed xenobasher (it already existed and I missed that)

* Fixed acidspit

* DEFINITELY fixed acidspit

---------

Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com>
(cherry picked from commit 0ce6ca206407d33dfebde300daf79bebf3ea34b2)
2025-02-05 18:35:37 +03:00
Avalon
cbd63b94ae Port Magic Crayon From Frontier (#2410)
* ART

* Update clown.yml

* Loadout fixes, time req

* loadout bgone

* Fixes, moved things

* fixoneoops

* More fixes

* CRAFTING WORKS!

* Flipped slashes

* UNTOUCHED! AT LAST

* Fix comment

* Mailladd

* Webedit ops

Signed-off-by: Avalon <jfbentley1@gmail.com>

* untroll indent

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: Avalon <jfbentley1@gmail.com>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
(cherry picked from commit fe630d7391693b4ee6cb389f4460c064ae3e8d21)
2025-02-05 18:35:28 +03:00
Verm
b3cca59542 Bartending+: Shaking and Stirring (#29243)
* Shaking and Stirring

* Remove shake message

* Switch if order a bit

* Add doafter supprot for reactionmixer

* Fix nullability

* Timespan zero

* Forgot to remove loc string

* Reorganize usings

* Remove unneeded usings, fix b52 needing to be shaken

(cherry picked from commit 9fb1414bed67cd8ce91294e571d9a7a37773d526)
2025-02-05 18:35:22 +03:00
Nemanja
7ca0b2ef3a Infer type for EntSelector (#30856)
Infer type for EntSelector.cs

(cherry picked from commit e180a1b11b552ab790c59e3e5ee6ef2eeedb8bd5)
2025-02-05 18:35:15 +03:00
Unkn0wn_Gh0st
e05ee08c05 Frontier Port: Pretty Money (#2398)
* Frontier Port: Pretty Money

* Update Resources/Prototypes/Entities/Objects/Misc/space_cash.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Signed-off-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>

* Updated 100k texture

---------

Signed-off-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
(cherry picked from commit da772611f8b2b02f21f801ccf255220602e850e5)
2025-02-05 18:35:09 +03:00
Kr8art
2cecfc8ffc Buff Aloxadone (#2318)
* Buff Alox

* Revert "Buff Alox"

This reverts commit 730825bd9458c7f35d994627799c0b04ce2a29eb.

* Buff Alox fixed

* Untouch

(cherry picked from commit d82bfac627b53d19b60dc45e4f684c00b74b80b7)
2025-02-05 18:35:05 +03:00
Kr8art
2662bd8993 Add sustenance vendor restock (#2307)
Co-authored-by: Milon <milonpl.git@proton.me>

(cherry picked from commit 800acf4d3f8ae41546844cd4e8b09c70304c9e69)
2025-02-05 18:35:00 +03:00
Stop-Signs
d0565957e6 Home run bat discount (#2294)
Meow

(cherry picked from commit da111d969f36f514d5fb7dd8d9c4c77b45a3f4be)
2025-02-05 18:34:07 +03:00