mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-18 14:07:53 +03:00
4265b4a052d3cd03ea0dd39d1d5ffdfe1bd42caa
376 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Eris
|
75a463cf5d | Saving changes 1 | ||
|
nikthechampiongr
|
04d5f5b5ad | Fix RA0032 (#32514) | ||
|
VMSolidus
|
edf9b969f3 |
Pretty Big Atmos Fixes PR (#2486)
# Description This PR ports some fixes to the order of operations for air pressure processing, which will help fix issues with temperature not correctly diffusing, as well as errors in the order of operations processing that made it so that Space Wind was receiving wildly incorrect pressure values. Additionally, this fixes a math error that made it so that the diagonal airflows were contributing 41% more to airflows, making diagonal motion unusually harsh. There's still two more bugs I need to fix though. |
||
|
Nemanja
|
1408d6c712 |
Replace IClickAlert with events (#30728)
* Replace IAlertClick with events * whoop * eek! |
||
|
Plykiya
|
2568b253b1 |
Updates GasTankSystem and InternalsSystem to not use Component.Owner (#29934)
* blah, setup * Updates GasTankSystem and InternalsSystem to not use Component.Owner * squish the diff * Fixa the rest |
||
|
Ed
|
2e651a50b9 |
Fix candles (firestack fading) (#28139)
Update FlammableSystem.cs (cherry picked from commit afb1acab10a5abc2ff954d08107c5e7866d3db8e) |
||
|
VMSolidus
|
6fd1f87e14 |
Gas Tile Overlay Performance Tweaks (#2472)
# Description
Gas Tile Overlay had a non-functional check for preventing it from
running on every frame. This PR fixes the frametime stopper, such that
it actually prevents the system from constantly running at all times.
# Changelog
🆑
- tweak: Made some performance improvements to the Gas Tile Overlay.
|
||
|
VMSolidus
|
e4cf2c5fb7 |
Flammable Performance Improvements (#2462)
# Description  I'm yeeting the server costs for the flammable system. This system will no longer querry every entity that might be on fire to check if they're on fire, and is instead querrying only entities that have a new OnFireComponent, which is used to tell them that they're on fire. 99% cost reductions are fun. I have verified in testing that this works. # Changelog 🆑 - fix: Dramatically improved performance of the flammable system. |
||
|
Leon Friedrich
|
7c9cb44466 | Use non-generic TryComp() for metadata & transform (#28133) | ||
|
Gersoon
|
908e0ab9cd |
MakeRespriteGreatAgainPart1 (#644)
* UltraMegaCommit * Fix1 * Fix2 * Fix3 * Update monotile_frame.yml * Fix4 * Fix5 |
||
|
vanx
|
1d953e0928 |
[Fix] FIREEEEEEEEE (#594)
* wow much fire * drop children (in code) * fix * oops * fix * TemperatureProtection * Update Resources/Prototypes/_White/Body/Parts/resomi.yml Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> --------- Co-authored-by: vanx <discord@vanxxxx> Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> |
||
|
Spatison
|
54086988e3 |
Mass clean up (#587)
* mass clean up
(cherry picked from commit 12bb873b02c1ef50e20763542b030452cc0613da)
* Revert "Centrifuge buff (#393)"
This reverts commit
|
||
|
RedFoxIV
|
7f33f5f733 |
Stab++ (#556)
* эмалированная репа * локалка, ветка и коммит * Компилить тяжело и неуютно * Зато уютно набегать * и тихо капает ОЗУ * и гит растрёпанный, как блядь |
||
|
Spatison
|
672f9d7ec6 |
[Revert] Magboots Refactor (#495)
* Revert "Magboots Refactor (#2273)" This reverts commit |
||
|
VMSolidus
|
03b8d24403 |
Space Wind Visuals (#2406)
# Description This PR adds several new features for Space Wind to make it far less annoying to players. Notably, it now includes the first new Space Wind Visuals, whereby visual effects will periodically appear on top of space wind sources. They also visually move in the same direction that the wind is currently throwing at that source. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/858a3433-607a-4513-9acf-b60b4eb6e745 </p> </details> # Changelog 🆑 - add: Added visual effects to Space Wind, allowing players to see motes of dust being blown about by wind, which provides an early warning that space winds are in effect. - tweak: tweaked the default "aggression" values of space wind to make it half as angry and sensitive. - add: Added a new equation modeling character height and mass as a means of resisting being knocked down by space wind. The taller and heavier you are, the more resistant you are to being knocked down by air currents. This also means that air currents no longer automatically knock you down. - add: Harpies and Moths can now use their wings to fly around in air currents. - tweak: Tweaked the mass of various items and objects so that they are more or less resistant to space wind. Particularly tools, armor, lockers, and air canisters. - tweak: As a significant performance optimization, Space Wind no longer applies on Lavaland. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> (cherry picked from commit 97ef05f574b7f2e7d58df999e9b1c15d0353e725) |
||
|
VMSolidus
|
0acaf0d590 |
Update AtmosphereSystem.MAS.cs
(cherry picked from commit 082c82274f15df37b8515fdda56f9aa725a836f2) |
||
|
VMSolidus
|
1cbce6a277 |
Final Space Wind
(cherry picked from commit 11d50351babe5aa800e30358b91fea20e0017359) |
||
|
VMSolidus
|
151e1b60a3 |
TCJ Makes A Rage Performance PR (#2298)
# Description
I got baited by Ectoplasm, so I then spent 3 hours shaving off a
sizeable chunk of this game's performance cost, including by taking 3 of
the "Top 10 frametime consumers", and reducing their performance costs
by 99% each. Along with various examples of slimming down some of the
worst EQE's.
Oh, and I fixed EmitSoundOnMove being desynced with actual movement. As
part of making EmitSoundOnMove use 99% less CPU time, it was also
synchronized with the MoverController.
# Changelog
🆑
- fix: Fixed items such as tactical webbing, bell collars, and hardsuits
being desynced with character movement.
- tweak: Made various large performance improvements.
(cherry picked from commit 684e8175443167beb0e20e3323a05b5f493b3374)
|
||
|
DEATHB4DEFEAT
|
7809e1a0e8 |
Fix Friction without Input (#2289)
Problem I had on Parkstation, ported the fix here. Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 6061334d37f3bf89522da9703b607d86d7e67a5b) |
||
|
Spatison
|
2a10c02eb5 |
No spead merge (#475)
* Revert "[GoobPort] WIZ REAL (#465)"
This reverts commit
|
||
|
Kai5
|
091a8ff433 |
[GoobPort] WIZ REAL (#465)
* Уэээээээ * Почти настрадались * Скоро конец.... * СКОРО * Мышки плакали, кололись, но продолжали упорно жрать кактус * Все ближе! * Это такой конец? * Книжка говна * фиксики * ОНО ЖИВОЕ * Телепорт * разное * Added byond * ивенты теперь работают * Разфикс телепорта * Свет мой зеркальце скажи, да всю правду доложи - Я ль робастней всех на свете? * Разное * Еще многа всего * Многа разнава * Скоро конец.... * ЭТО КОНЕЦ * Фикс линтера (ну, или я на это надеюсь) * Еще один фикс линтера * Победа! * фиксики * пу пу пу * Фикс подмастерья * Мисклик * Высокочастотный меч * Неймспейсы * Пул способностей мага |
||
|
Remuchi
|
1e363c7346 |
Revert "Merge pull request #462 from WWhiteDreamProject/revert-460-upstream"
This reverts commit |
||
|
DVONIKS
|
6c19771020 | Revert "Upstream 04.04-18.04" | ||
|
VMSolidus
|
afdc17483f |
Space Wind No Longer Accumulates Infinite Stun (#2276)
Pretty much exactly as the title says. I had to follow a very long and
undocumented codepath to find out what Refresh: True does in this
context to verify that it's, "SET The stun cooldown to 2s rather than
add +2s"
# Changelog
🆑
- fix: Space wind no longer causes its victims to accumulate infinite
stun time.
(cherry picked from commit d07a450d76f79b9b02197d9e09e83569e29cac4c)
|
||
|
VMSolidus
|
ee5bc2b261 |
Stop Ectoplasms Complaining (#2245)
# Description
This PR adds a mechanic to various hardsuits and tacsuits, which can now
include optional features such as Integrated Thrusters, or Integrated
Magboots. All the syndicate tacsuits and "Advanced" crew tacsuits have
both. Hardsuits typically have one or the other, rarely both. Vacsuits
never have either, get a jetpack nerd.
While I was at it, I fixed various bugs making these features obnoxious
to interact with, such as hardsuits helmet toggles not showing the
helmet, or turning on your integrated magboots also causing you to start
sucking the air out of your integrated thrusters.
Finally to address players incessantly complaining that "waaah space
wind is too unfair it keeps me in the air too long", I lowered the
maximum time player characters can go without being updated by space
wind to 1 second, down from 2. Base items are untouched, so they'll
remain in the air as per normal.
# Changelog
🆑
- add: Added "Integrated Thrusters" and "Integrated Magboots" as
features that hardsuits and tacsuits can sometimes have. Hardsuits
rarely have both, and sometimes have neither, while the more "Advanced"
Tacsuits such as the CSA series of suits will always have both.
- tweak: Reduced the maximum amount of time player characters can remain
in the air without being touched by space wind again to 1 second, down
from 2. This does nothing if you're actively being thrown.
- fix: Fixed a bug where the hardsuit action to toggle your helmet
wasn't displaying the helmet icon.
(cherry picked from commit b6be634252745fa61e3db3094d94c7f3c234a094)
|
||
|
VMSolidus
|
cff8c0f9f8 |
Yeet Entity Querries (#2127)
# Description WOW. ENTITY QUERIES SURE DO SUCK FOR PERFORMANCE. I CAN'T BELIEVE THESE ARE THE NORM. before:  after:  --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 62cb769b2827895811fa3e0c3039df83ebe77e8f) |
||
|
VMSolidus
|
c9b6b6d535 |
Update AtmosphereSystem.HighPressureDelta.cs (#2126)
# Description
The documentation about this was wrong.
🆑
- fix: Removed an unecessary recursion from atmos system.
(cherry picked from commit 137865a4768a22ea681518bb1a315a260c1beebb)
|
||
|
Spatison
|
d8d8a891c8 |
[Fix] Flammable (#407)
fix flammable |
||
|
Spatison
|
ac47d98d2d |
[Fix] Fire (#366)
fix fire |
||
|
VMSolidus
|
af499da8af |
Last Bugfixes For Space Wind (#2089)
# Description
This PR fixes all remaining bugs with Space Wind, while providing
extremely significant performance improvements by way of aggressive
early exits, and also completely reworking how pressure moved entities
are tracked(The server now caches entities under active air movements).
I haven't profiled it yet, but the performance improvements are
extremely noticeable on the machine I'm running in comparison to before,
which is particularly noteworthy since previous versions of space wind
caused significant frame drops in testing on my monster rig. While this
new update to space wind straight up doesn't even budge the tickrate on
my machine anymore.
I had to also rip out some of Monstermos' Guts, and deprecate the
tileripping system. In the future, Tile-ripping will be handled by MAS.
Also, MAS outright no longer requires Monstermos to work, and can
operate entirely off of the much cheaper LINDA system. However, while
LINDA is cheaper, Monstermos is needed for handling "Extra violent air".
Eventually I can do away with Monstermos entirely, and have it replaced
with an airflow system that outright does not require pathfinding
algorithms.
# Changelog
🆑
- fix: Fixed a bug where items thrown by space wind could remain in air
for as long as 500 seconds. Items thrown by space wind can now remain in
the air for a maximum of 2 seconds past the last time they were thrown.
- fix: DRAMATICALLY IMPROVED SPACE WIND PERFORMANCE.
- tweak: ShowAtmos command now shows vectors representing the exact
direction space wind at a given tile is trying to throw objects! The
length of the lines shown directly correspond to how powerful the flow
of air is at that tile. Shorter lines = shorter throws. Longer lines =
more powerful throws. These are also no longer restricted to compass
directions, and can point in arbitrarily any direction on a circle.
- tweak: Space Wind now no longer has Monstermos as a hard requirement.
It'll be as weak as a toddler without it, but if you're running your
server on a toaster, you can turn off Monstermos and still have working
space wind.
- tweak: Wreckages in space are now never airtight. I'm sorry, but this
was basically the cost I had to pay in exchange for making Atmos no
longer even on the top 20 systems for server tickrate cost.
(cherry picked from commit 2fcc806423a259fd75977b78350c2232a823739b)
|
||
|
VMSolidus
|
d0736f1343 |
Fun
(cherry picked from commit d5caf492621fd45366da3b01bac18133f4e3414f) |
||
|
VMSolidus
|
1216628afd |
More Space Wind Tweaks (#1994)
# Description More fun, chopped out some math that wasn't needed anymore. (cherry picked from commit f8cd91636c1659e782c904d6f48ab8df4323887f) |
||
|
VMSolidus
|
de1822e75b |
Update AtmosphereSystem.HighPressureDelta.cs (#1992)
# Description
I hate that the throwing system doesn't have any overloads for "Nah I
just wanna use the raw vector itself for calculations thank you very
much."
# Changelog
🆑
- tweak: I Hate The Throwing System. Anyway Space Wind should actually
be working properly again.
(cherry picked from commit 42003e44a799d41db2b77e31b5b98b094a35615d)
|
||
|
VMSolidus
|
313783ce5d |
Small Atmos Fixes (#1979)
# Description
This fixes a few issues with SWV5, albeit what I can fix for now until I
have completed work on the Matrix Airflow System.
# Changelog
🆑
- fix: Fixed some bugs with Space Wind related to lockers causing
massive air flow spikes,
- fix: Fixed space wind not being calculated correctly for stations
which get gravity from their planet, such as Glacier.
- fix: Fixed an issue where Space Wind wasn't respecting the cosmic
speed limit of 30 meters per second.
(cherry picked from commit e06811b3310e15b8afba9792e36296c6b373a11e)
|
||
|
Spatison
|
a3a8c195e5 |
Upstream 09.03-15.03 (#349)
* Trait Cost Balancing (#1906) <!-- 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]? --> Makes a lot of disabilities give more points (based off community and personal opinions), and makes some very strong traits cost more points. # 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 --> 🆑 - tweak: Narcolepsy gives 6 points instead of 2 - tweak: Pacifist gives 8 points instead of 6 - tweak: Muted gives 6 points instead of 4 - tweak: Sluggish gives 5 points instead of 3 - tweak: Snail Paced gives 8 points instead of 5 - tweak: Blood Deficiency gives 6 points instead of 5 - tweak: Hemophilia gives 4 points instead of 2 - tweak: Clumsy gives 4 points instead of 1 - tweak: Bad knees gives 5 points instead of 3 - tweak: Will to live costs 3 points instead of 1 - tweak: Tenacity costs 4 points instead of 3 - tweak: Steadfast costs 6 points instead of 4 - tweak: Bionic Arm costs 10 points instead of 8 - tweak: Bionic leg costs 8 points instead of 6 --------- Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> (cherry picked from commit d38eb0b536a34475feefa8253b9a3ed128e57f4d) * Automatic Changelog Update (#1906) (cherry picked from commit 8a2626ef6b62508a6479525555522b516e090feb) * Lightbehaviour Bug Fix (#1908) <!-- 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]? --> Description. Fix bug affecting torches, flares and glowsticks that made them not emit light when turned on as described by [this issue.](https://github.com/Simple-Station/Einstein-Engines/issues/1685) <!-- 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> https://github.com/user-attachments/assets/799631e0-bcf1-4008-9683-3d0ba7c02a24 </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 --> 🆑 - fix: Torches, flares, glowsticks now able to emit light again (cherry picked from commit b25e3447148948ee658d1b81dac0d1e076641fcc) * Automatic Changelog Update (#1908) (cherry picked from commit 83fbb13c3aab8fedb1e56f73b949ac1a458eee41) * Mining Shuttle & Dignitary Stuff for Arena (#1893) <!-- 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]? --> <p> Adds the mining dock & mining shuttle console for travel to lavaland. Adds NTR office with the NTR locker mapped. Also adds the BSO locker to bridge without an office cause BSO is not worthy. Map render under images. NTR office is south east of brig. Just has a desk and a bed. No fax as the NTR already has their own fax, I feel like having a second fax would increase where the NTR would need to look for faxes. Referring to the shuttle that takes one to lavaland as mining shuttle, not the pathfinder. </p> <!-- 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>  </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 --> 🆑 no cl no fun (cherry picked from commit e481e2f182f162b78e22524dfe6988b2135bd32f) * Automatic Changelog Update (#1893) (cherry picked from commit f59bd7df32f6942f3b2646c1e3a08ee88343301d) * Fireplace Construction (#1897) # Description Porting - Allow Construction of Fireplaces and Bonfires Ported from - https://github.com/Goob-Station/Goob-Station/pull/1646 Yeah it's a port of a port. Yes there was sofas, benches and banners, I've very lazily stolen just the fires. Sofa might be nice but that's lot more code pinching. --- # TODO - [ ] Pray it works --- # Changelog 🆑 - add: Recipes to build Fireplaces and Bonfires --------- Signed-off-by: Raikyr0 <Kurohana@hotmail.com.au> (cherry picked from commit 90485d5a0c49f76950d61e42c3cc596f988dc982) * Automatic Changelog Update (#1897) (cherry picked from commit c7327f55f8576267f30a384d4a84fd85f357d52f) * Terminus (#1881) # 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]? --> Added a new weapon, the DT-8 "Terminus" It's a large melee weapon capable of firing a spread of disabler rounds on alternate fire. It's an arsenal tech research, and uniquely can only be wielded by onis. (I'm being bribed to make this) Also, I had to move the OniComponent.cs file to shared. I'm not sure if that borked anything but tell me if it does. (PS. Thank you VMSolidus for helping me make this ten times less shitcoded.) --- # 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] Textures complete - [x] Add lathe recipe - [x] Add to research --- <details><summary><h1>Media</h1></summary> <p> ! </p> </details> --- # Changelog 🆑 SolsticeOfTheWinter, OtherPersonPlaceHolder - add: Added a new weapon for oni security players, the terminus. --------- Signed-off-by: Solstice <solsticeofthewinter@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 3fdf1102dc20af7bd724e449808d2d38571e62c2) * Automatic Changelog Update (#1881) (cherry picked from commit 9de8ab79e61227620833b88f5c616c63f38c9a86) * Add RPD and Pipe Stacking (#1857) # Summary To add the RPD into the game for both atmos and CE's to use. Introduce pipe stacking as well since the RPD will introduce better atmos configuration. Most of the code was ported over from goob LRP. With some of it being touched up on and adding a bit of quality of life to the RPD. This was a PR originally made for goob-mrp but requested to be moved to EE. Check out the detailed commits here: https://github.com/Goob-Station/Goob-Station-MRP/pull/96 --- # Description ## RPD From the original PR made on goob-station the RPD has been ported over. It is similar to the RCD where you will be able to make pipes/vents/pumps/mixers quickly. Each dial on the main radial will bring up specific pipes like ie pipes-> corner, t-shape -cross shape. The RPD starts out in the CE and Atmos lockers with 50 charges. Each construction and deconstruction cost 1 charge. There is also one extra compressed matter in the starting lockers for both CE and Atmos for the RPD. You can research the recipe of the RPD with the reverse engineering machine. The recipe cost of the RPD is a bit more compared to the RCD.  ## Pipe Stacking With the introduction of the RPD, it was fair to check for pipes that overlapped when making new pipes. But with introducing the code from LRP goob station it was decided to bring over the pipe stacking feature too. You can make certain components pipe stackable or allow if you can put multiple of the same pipe on the same tile. If you want you change a pipe to be non-stackable by using the component type: PipeRestrictOverlap Here's an example of pipe stacking. You can make a simple scrub loob tighter or keep it normal. The freedom is given.  Here is an extreme example. This compact design creates a ton of frezon. Obviously, replace the trit miner with an actual burn chamber.  ## Belt overlay I decided to add a simple belt overlay sprite to the game for the RPD. Here's what it looks like outside the belt and inside the belt  ## RPD Borg Module I decided to add experimental RPD that will self-charge. The only way to get this RPD is through admeme spawn or being a borg. The starting charge of the Borg module is 25 and will self-charge at the same rate at 10 seconds per charge. I also added an admeme version that charges at 1 second per charge. Here is what the borg module looks like  The borg module can be researched in the t2 industrial branch as the same research for the RCD module.  --- # credit Original RPD PR: https://github.com/Goob-Station/Goob-Station/pull/1203 Original Pipe Stacking PRs: https://github.com/Goob-Station/Goob-Station/pull/391 https://github.com/Goob-Station/Goob-Station/pull/389 Prevent stacking pipes (#28308) - Original Link is dead. --- # TODO - [X] Add RPD - [X] Add RPD to reverse engineering - [x] Add toolbelt equipped sprites - [x] Add Pipe Stacking - [x] Add an experimental RPD module for engie borgs. --- # Changelog 🆑 - add: Added RPD, glory to atmosia! - tweak: RPD now spawns in Atmos and CE lockers - tweak: Extra compressed matter has been added into both Atmos/CE lockers for more RPD/RCD uses - add: You can research RPD with the reverse engineering machine. - add: A belt overlay sprite to the CE and utility toolbelt. - add: Pipe Stacking ported over from LRP Goob station. Compress those frezon factories! - add: Toolbelt overlay sprite for the RPD. - add: RPD Borg module researched in t-2 industrial advanced tools. --------- Co-authored-by: Nathaniel Adams <60526456+Nathaniel-Adams@users.noreply.github.com> (cherry picked from commit b32710c94628f90e4b2c43796ac3ab81892926f3) * Automatic Changelog Update (#1857) (cherry picked from commit 3270ee0327054fd0187cb03756d23a1a84d7916c) * SS13 Combat Parity Part 0.5: Stun Meta [PREREQUISITE] (#1914) # Description Ports Stun Meta from [/Goob-Station#788](https://github.com/Goob-Station/Goob-Station/pull/788) Splits stuncrit into knockdown and paralysis, like on 13. knockdown lets you crawl on the floor, and paralysis is the same as current stamcrit. The stun baton has been buffed, doing 15 stamina damage per swing, and 40 stamina damage overtime. This lets you stamcrit someone in two baton swings, but it takes a few seconds before they actually fall down to the ground. About the same amount of time as 4 baton swings back to back. This PR also reverts #809, since I plan on reworking shoving entirely soon. (also for my sanity. wouldn't have been able to port stunmeta otherwise.) ## Condemn Trillions Required for the rest of the SS13 Combat Parity changes listed [here](https://discord.com/channels/1218698320155906090/1348171706061033502) # TODO * [x] Await merge * [x] Gaming # Media  # Changelog 🆑 Eagle * tweak: Stamina Crit has been split into Knockdown and Paralysis * tweak: Stun batons now do 15 stamina damage on hit, and 40 over time (cherry picked from commit b8045750e91b8e43fcf91deaeb49b295a0984cdc) * Automatic Changelog Update (#1914) (cherry picked from commit cbadf45b9e1bbb8cbb122a579e9c37a3234d506b) * Miscellaneous Fixes From White Dream (#1911) # Description Ports the following PRs: https://github.com/WWhiteDreamProject/wwdpublic/pull/271 https://github.com/WWhiteDreamProject/wwdpublic/pull/282 https://github.com/WWhiteDreamProject/wwdpublic/pull/255 https://github.com/WWhiteDreamProject/wwdpublic/pull/254 https://github.com/WWhiteDreamProject/wwdpublic/pull/246 https://github.com/WWhiteDreamProject/wwdpublic/pull/223 https://github.com/WWhiteDreamProject/wwdpublic/pull/220 https://github.com/WWhiteDreamProject/wwdpublic/pull/219 https://github.com/WWhiteDreamProject/wwdpublic/pull/213 This is a rather huge variety of fixes to be honest. # Changelog 🆑 White Dream - fix: Fixed airlock opening and closing visuals - fix: Fixed Weather spamming infinite sounds. - fix: Cockroaches no longer spam organs when stepped on. - fix: Fixed the timer on the Return To Round button - fix: Fixed Return to Round not remembering how long it's been since you died if you re-enter your body. - fix: Fixed harpy flight visuals not showing for other people. - fix: Fixed disabler bolts not going through windows like other kinds of lasers. - fix: Fixed Vim Harness being free - fix: Fixed handcuffs not respecting your arm length. - fix: Made tending wounds not as message spammy. - fix: Fixed shuttle windows not preventing you from being electrocuted by grills under them. --------- Co-authored-by: vanx <61917534+Vaaankas@users.noreply.github.com> Co-authored-by: vanx <discord@vanxxxx> Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> (cherry picked from commit ced8a565a32cfa340140674c073d90a2a6002799) * Automatic Changelog Update (#1911) (cherry picked from commit 89f27f4b2f3882ba97132d69f9d6477cea3195d1) * Faction Clothing Bug Fix (#1917) <!-- 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]? --> Fixed bug that made ClothingAddFactionComponent not add the faction of the clothing to the mob when the clothing is equipped. The bug is described in greater detail in [this issue](https://github.com/Simple-Station/Einstein-Engines/issues/1228). --- <!-- 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> https://github.com/user-attachments/assets/41fe9411-0eac-478d-956c-b094f211f565 </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 --> 🆑 - fix: Fixed bug that made ClothingAddFactionComponent not work. (cherry picked from commit 639f46a68b84ad6d0655ec318ccc62fa3061c5cd) * Automatic Changelog Update (#1917) (cherry picked from commit b4c488af30ad9e21e41b409282aeac1f8ae37c9e) * Crafting Curtains and Tables No Longer Consumes Entire Stack (#1916) <!-- 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]? --> Stolen from https://github.com/Fansana/floofstation1/pull/152, courtesy of cynical24. When you craft a curtain or make a table into a _fancy_ table, it doesn't take the entire stack of carpet. This should hopefully stop me from having to return to the HoP to ask for another 10 carpet. --- # 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] general thievery of text (with permission) --- <!-- 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>  </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 --> 🆑 - tweak: you don't use the entire stack of carpet now when crafting colored curtains or fancy tables. (cherry picked from commit 508dbc35d3576be768122604d39194ee715ab02a) * Automatic Changelog Update (#1916) (cherry picked from commit f4641de5073d3cf1ccc54a5599281bb6025149fc) * Markings From Impstation 2 (#1925) what the funny title says <!-- 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]? --> Adds some markings from Impstation (Again, who would have thought it'd be Impstation again?), ports the merciful IPC wings from Goob LRP, adds some markings to arachnids, a bunch of markings for Reptilians, and a new hairstyle. --- # 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 --> - [ ] Task - [x] Completed Task --- <!-- 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> </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 --> 🆑 Diggy - add: New markings for arachnids, reptilians. - tweak: Allows IPCs to pick up overlay markings such as the gauze stuff, Onis can now have the curved horn marking humans can have. (cherry picked from commit b955652cf18f1a11e7d48206f32c8d3e24e819bd) * Automatic Changelog Update (#1925) (cherry picked from commit 78149f74ac386a81b4ecb46679db29c9e5f1946e) * Fix Vulpkanin Markings (#1894) # Description Vulpkanin no longer wear their undergarments "Superman Style" # Changelog 🆑 - fix: After lengthy retraining, NanoTrasen has taught Vulpkanin that underwear is meant to be worn inside pants, not outside them. (cherry picked from commit 190dddf7c59537ffc2781f3d8f7bcb16e5a449fb) * Automatic Changelog Update (#1894) (cherry picked from commit a7138473115dfe767b822eb2b24179a04f6133e5) * Fairer Turrets (#1923) # Description It had basically always bothered me, and evidently a lot of other people that turrets were previously "Unfair enemies". They had perfect aimbot accuracy, tracked targets instantly at any angle, and were nigh-indestructible. It was telling that players were pretty much only ever killed by turrets once or twice, and then they figure out that the turrets are outright impossible to beat in a fair fight, so they end up resorting to underhanded tactics like using an RCD to wall the turret off. Or use a pickaxe to go around them. I previously added a new turret for the SAN dropship, and with it had tried out a very different approach for "Fairer Turret" balancing. A more reasonable healthbar, no instant tracking, and no perfect accuracy, The players enjoyed these a lot more than the original turrets. Plus they were more visually interesting firing an inaccurate spray at their targets. <details><summary><h1>Media</h1></summary> <p> I'm on my lunch break at college right now, so no media. </p> </details> # Changelog 🆑 - tweak: Adjusted turrets to be a more "Fair" fight. They no longer have perfect aimbot accuracy, they don't track targets instantly, and they also have a "More fair" healthbar that can reasonably be shot through by someone with good enough weapons and armor, (cherry picked from commit 6bdd73efe210d6e556e6accbc89cb9134f716e2e) * Automatic Changelog Update (#1923) (cherry picked from commit bedcd65d4d8324a651101a978ba90d46d4199cfa) * Fix A Minor Test Fail (#1902) Just a random event that had a tiny chance to spawn an Abstract entity. (cherry picked from commit f49712f82569d7e5f0a486d00130216dc73520bd) * Throw Errant Into The Spider Pit (#1896) # Description @Errant-4 by request in your comment. I had annihilated this before during the NyanoCombat reworks, but during a recent wizmerge most of said reworks were accidentally reverted. This is the one that was brought back, comment and all. So this PR fixes for a second time a problem left by the old combat system. # Changelog 🆑 - fix: Power attack and light attack damages are no longer swapped. Signed-off-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 4b988b2b01e379d5a2c6c8eae72f70c00876d024) * Automatic Changelog Update (#1896) (cherry picked from commit 505765017a164ca20582571f92f5ec95ff3e5579) * Nerf .45 (#1895) # Description Somehow I didn't realize that .45 magnum, despite being a common ammo type available to a lot of people, deals literally double the damage of all other comparable smallarms. No wonder people were complaining about the Universals being comically overpowered. This PR normalizes their damage so that it's still "More than other equivalent small arms calibers", but not ".45 is more than double the damage of 9mm". # Changelog 🆑 - tweak: Nerfed universals and other .45 auto guns. I get the meme that .45 is better than 9mm, but not "More than double" the damage of 9mm. (cherry picked from commit f7f49f67d69e6a19a3b83eec1d4cb4b0b7ca93a1) * Automatic Changelog Update (#1895) (cherry picked from commit cfd95ca7c4237030cebba16cf1d81798a5d801a6) * More Lavaland Fixes (#1892) # Description Apparently the lavaland ore crates are supposed to have an ore magnet, but this didn't work because they're missing something from the ore bags. So this fixes that. Also I made sure the lavaland's ores actually have the same naming conventions as our regular ores. # Changelog 🆑 - tweak: Ores mined from lavaland now have names matching their real-world counterparts. - fix: Fixed the lavaland ore crates not having working ore magnets. (cherry picked from commit 2f02dd1a0621437587d143641b4a66ef59d87bab) * R25 Rifle Tweaks (#1869) # Description This PR tweaks the stats of the R25 rifle so that it isn't completely useless. Its accuracy when wielded has been improved so that it can more consistently hit targets at between half and a full screen length away. As a tradeoff, its cooldown between bursts has been increased so that its DPS isn't comically overtuned. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/7b862f2a-09c3-450b-9482-a6ce69b4c971 </p> </details> # Changelog 🆑 - tweak: Increased the accuracy-when-wielded of the BRDI-R25 rifle. As a tradeoff, it has a longer cooldown between hyperbursts. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Gameplay Adjustments** - Updated the weapon's handling by refining its firing angles. - Adjusted the burst cooldown period to alter the firing rhythm. <!-- end of auto-generated comment: release notes by coderabbit.ai --> (cherry picked from commit be595f4fbe52e612dbaf58363287e9d483442a12) * Automatic Changelog Update (#1892) (cherry picked from commit 2cc6e37b996d5074affebd7d8813778b3f9824d2) * Automatic Changelog Update (#1869) (cherry picked from commit fd9c5bb1bfddb94e8aa8d4ecfcb4587629110949) * Footstep Netcode Fixes (#1909) # Description Port of https://github.com/WWhiteDreamProject/wwdpublic/pull/298 --------- Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> (cherry picked from commit 36627e2e655471e118867c1ae05870b1cb9c0be4) * Automatic Changelog Update (#1915) (cherry picked from commit a8994b38b0ade548152a5868a0ab87fd727da81d) * Embeddable Projectile Fixes (Courtesy Of White Dream) (#1907) * embed children * locale * fix * Update Resources/Locale/ru-RU/weapons/throwing/throwing.ftl * // WWDP MY BELOVED # Description This is a port (and general cleanup of) https://github.com/WWhiteDreamProject/wwdpublic/pull/278 Plus clearing a bunch of compiler warning causing things, and also a fix for one of our Heisentests. This PR mainly fixes issues with embeddable projectiles being potentially unintentionally destroyed when the thing they are embedded in gets destroyed. Which can be disastrous for example if my energy sword embeds into a wall, and also destroys that wall, which destroys my precious energy sword... # Changelog 🆑 Spatison - fix: Embeddeable projectiles are no longer always destroyed when the thing they are embedded in gets destroyed. Energy Sword throwing enthusiasts may rejoice now that their precious sword is safe. Co-authored-by: vanx <61917534+Vaaankas@users.noreply.github.com> Co-authored-by: vanx <discord@vanxxxx> Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> (cherry picked from commit 2c30abbb072238ed7478c9716a66db58f69ddc67) * Automatic Changelog Update (#1907) (cherry picked from commit a97ae4aa2fdaf1bf70149fa994682debd2162779) * Health Analyzer UI Fix (#1928) <!-- 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]? --> Fix the bug described by [this issue.](https://github.com/Simple-Station/Einstein-Engines/issues/1820) --- <!-- 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>  </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 --> 🆑 - fix: Health analyzer's doll is now in the normal size. (cherry picked from commit ce489662c54195cd3f5865f5003d40fe3ba7c0d3) * Automatic Changelog Update (#1928) (cherry picked from commit 0b4b338af37f2222065063364b76db3c63fa8025) * Magma Hand (#1927) <!-- 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]? --> Sprited by Greenwall, YML'd by myself. The Magma Hand is a slime-like creature that you can encounter in Lavaland. It's very hostile, but you _can_ pet 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] Add to Lavaland spawning list --- <!-- 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> Its blood is sulfur!  Its attacks burn you! https://github.com/user-attachments/assets/0bf21207-1dc2-4cf5-9b9b-89a558488963 Ice makes it die very quickly! https://github.com/user-attachments/assets/4c742c6e-ac5e-462f-9f1e-e05ce0fcaa0b   </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 --> 🆑 Greenwall - add: Magma Hand! Sprite by Greenwall, YML by Timfa. Bring a water gun filled with ice, and you'll be fine! (cherry picked from commit 545a20fd19a25f833cc32e21c6f0f53f7f872e22) * Automatic Changelog Update (#1927) (cherry picked from commit f8c127f1432d24f98e5eeeb4099fa2899db74c15) * Cyber Eye Changes (#1876) <!-- 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]? --> Removes the flare shielding trait, instead adding welding arc protection to the diagnostics hud, and giving the medical hud a built in chem scanner. No trait will give you access to immunity to flashes however, and you will instead be required to have proper eye protection on again to counteract it. This makes securities lives a lot better, and makes the flash a viable tool again. # 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 --> 🆑 - remove: Removes flare shielding - tweak: Adds eye protection to diagnostics hud - tweak: Adds chemical analyser to med hud - tweak: Increases med hud and diagnostics hud costs to 2 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Gameplay Balance** - Reduced the negative impact for the `FlareShielding` trait, offering a milder penalty. - Removed the flash immunity effect from the `FlareShielding` trait to streamline its behavior while retaining it in the `FlareShieldingModule`. - Updated requirements for the `Blindness`, `Nearsighted`, and `Photophobia` traits by removing the dependency on the `FlareShieldingModule`. - Adjusted point values for several traits, reflecting a more significant negative impact for others. - Introduced new components, enhancing the functionality of various traits. - **Feature Enhancements** - Expanded the description of the `CyberEyesMedical` trait to include a Chemical Analysis Hud. - Updated the `CyberEyesDiagnostic` trait description to incorporate flare shielding for improved eye protection. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> (cherry picked from commit 516c53e8ea97680b8029b79dae9fab0a229d0709) * Automatic Changelog Update (#1876) (cherry picked from commit 085163904a3bc64c2217553afe5e43a8938cfc8c) * Space Wind Version 5 (FINAL) (#1765) # Description MY ASCENSION IS COMPLETE, I HAVE DEFEATED THE ATMOS SYSTEM. MY POWERS HAVE GROWN TO NEW AND UNFATHOMABLE HEIGHTS. THE EQUATIONS FOR SPACE WIND ARE NOW PERFECTED. I HAVE BECOME THE PHYSICS CHAD THAT CAN NOW ACCOUNT FOR FRICTION AND AIR RESISTANCE. SPACE WIND HAS BEEN PERFECTED. THERE IS NO MORE WORK FOR ME TO DO ON IT. # TODO <details><summary><h1>Media</h1></summary> <p> PROOF THAT MY EQUATIONS HAVE BEEN PERFECTED. https://github.com/user-attachments/assets/b3eb43b2-e8db-4f75-a142-2c86308e8113 </p> </details> # Changelog 🆑 - add: Added Space Wind V5. This version of space wind now accounts for the coefficients of friction and gravity as a calculated way to resist space wind. There is no more guesswork on if space wind should be able to throw an object. Additionally, thanks to a standalone module from Matrix Airflow System, space wind is capable of calculating airflow at arbitrarily any point in a room, regardless of whatever garbage Monstermos is saying. (cherry picked from commit a5151c7622c424af6fd7e4c0b916e8ddda75c3df) * Automatic Changelog Update (#1765) (cherry picked from commit ba32a82331ffba42919ff57b48c1d80ba02c1343) * Fix Oni (#1935) # Description I didn't notice during the last PR that someone added an override for the Tags component of Oni, otherwise I'd have said something about it. You can't add a tag component to a species because it overrides a massive shitton of tags that are needed for player characters to be able to do certain things, such as DoorBumpOpener... # Changelog 🆑 - fix: Fixed Oni not being able to do a ton of things that required hardcoded tags. I fucking hate the tag system. (cherry picked from commit 3950fb0a6c9cbb9febb30b00f183a8d049f0ca0c) * Automatic Changelog Update (#1935) (cherry picked from commit 12876a1ce113a68a79d2cae79e99a6748446c13e) * Rev Manifesto Inhand Use Cooldown (#1936) <!-- 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]? --> Add a two second cooldown on the Revolutionary Manifesto's secondary use (the purely cosmetic one) to not make it cause chat spam. I made this change from web and have NOT tested it yet (unless I checked the checkbox below in the TODO section! --- # 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 --> - [ ] TEST IF IT WORKS --- # 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 --> 🆑 - tweak: Tweaked rev manifesto to not spam chat anymore (cherry picked from commit 3a6634125445a3a71ab33dae090942ce3216d340) * Automatic Changelog Update (#1936) (cherry picked from commit 0ba6aae78f5ee3804f8eaf30afc2e35bafc8e17c) * More Tolerable Default CVars (#1945) # Description I can't believe we never cleaned these up. Yea so our codebase made an astoundingly fucking poor first impression on BPL during their huge playtest, and most of these CVars were to blame. In particular is the godawful Ramping Event Scheduler having "Murder the station with ventcritters every 10 seconds at the 30 minute mark" as its settings. # Changelog 🆑 - tweak: Disabled Monstermos Tile Ripping by default. - tweak: Default settings for Ramping Event Scheduler no longer throws "Ventcritters every 10 seconds, 30 minutes into the round". (cherry picked from commit ef5dc3441aa3b7c62d771039c3e1a93ba04a0d32) * Automatic Changelog Update (#1945) (cherry picked from commit 0fce50daf5ba999e3bc9b8c97e8e7b8791fb7f7e) * BRDI Repaints (#1957) <!-- 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]? --> A downstream port of https://github.com/TheDenSS14/TheDen/pull/306 providing Blue and Red paintjobs for the Blueshield and Head of Security BRDIs respectively. --- # 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 --> 🆑 - tweak: Gave the BSO and HoS BRDIs a fancy paintjob. (cherry picked from commit 4f23e0d40549fc3780d1dd94f7fea2ff83e37c24) * Automatic Changelog Update (#1957) (cherry picked from commit 2d7e39eca59cee8c8c883501c8f185bcb8bff4cb) * ADT Markings Port (#1951) Truly the PR of all time... <!-- 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]? --> The markings by themselves have localization or whatev. When you color them they will however appear as marking_etc_etc. Yes, i'm aware it's lazy, but i'm not doing it for over 80 markings, just not feeling it, this is really just a test to see if it gets allowed without some locale files setup. --- # 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 --> - [ ] Task - [x] Completed Task --- <!-- 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 --- # 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 --> 🆑 Diggy - add: Most markings from ADT, along with two new hairstyles, new markings for Shadowkin (Despite all my hate for them). - fix: Shadowkin ears are now colorable again, fuck around and find out if you want your Shadowkin's ears to be pink with red or something. (cherry picked from commit a36b5dc2404578c64a93a9881714f00180c1da02) * Automatic Changelog Update (#1951) (cherry picked from commit cd81f90db975061f9d968b45beab9a461834f4c1) * Cyberiad 1.0: Service Rework (#1938) <!-- 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]? --> Changes Box to Cyberiad, with the service area receiving a rework, in the future there will be more updates in the depts, with the next one probably being the Sec. Make some fixes on Gax and Bagel. I changed the maintainer of some maps from "Estação Pirata" to "Ichai". I am not part of the Estação Pirata --- <!-- 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>  </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 --> 🆑 Ichai - add: Cyberiad added to the rotation. - fix: Gax: Fixed missing window in CE office, Fixed walls in SM to prevent radiation leaks. - tweak: Port changes to Bagel from GoobStation - remove: Box is no more. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 3da2771a5509b189b4599a2323e9df5d7b9fb562) * Automatic Changelog Update (#1938) (cherry picked from commit 755fc9912d4152dca446477ea2693ed91aac59c1) * R-25 BRDI Back Slot Sprites (#1962) <!-- 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]? --> Added back slot and suit storage sprites for the R-25 BRDI. --- # 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 --> 🆑 - add: Added back worn sprites for the R-25 BRDI. (cherry picked from commit 2cf4957ccd3ed2e0a673c7a7c774f4d779428cb5) * Automatic Changelog Update (#1962) (cherry picked from commit d6ba9f7c0da450e0b8ae6623b33e6933360ae43c) * Remove Random Stencil Clear On Left Leg (#1955) <!-- 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]? --> I don't know why this was being done, but it didn't seem to do anything and I know for a fact it was causing issues with shaders that were applied on all humanoid layers, so... "Imaginary Technique: Shitcode Removal" go. If anything breaks, it's 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] Check that the game didn't incinerate itself. --- <!-- 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>  </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 --> no cl Signed-off-by: Eris <eris@erisws.com> (cherry picked from commit e674f782e24da7a7825520ca650473f155e9e4c1) * fix upstream --------- Co-authored-by: EctoplasmIsGood <109397347+ectoplasmisgood@users.noreply.github.com> Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> Co-authored-by: Paulo Artur Pinheiro Viana Villaça <112904295+algumcorrupto@users.noreply.github.com> Co-authored-by: astriloqua <129308840+astriloqua@users.noreply.github.com> Co-authored-by: Raikyr0 <Kurohana@hotmail.com.au> Co-authored-by: Solstice <solsticeofthewinter@gmail.com> Co-authored-by: Solaris <60526456+solarisbirb@users.noreply.github.com> Co-authored-by: Eagle-0 <114363363+eagle-0@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Tirochora <leotabletdb@gmail.com> Co-authored-by: BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com> Co-authored-by: Timfa <timfalken@hotmail.com> Co-authored-by: Rosycup <178287475+Rosycup@users.noreply.github.com> Co-authored-by: Ichaie <167008606+ichaie@users.noreply.github.com> Co-authored-by: Eris <eris@erisws.com> |
||
|
Spatison
|
8a95ee85bf |
Upstream 28.02-03.03 (#268)
* More Tajaran Markings (#1834) <!-- 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]? --> Description. Adds separate eye colors to Tajaran and makes most of the markings from "Fashion Update: Earrings & Makeup" available to Tajarans --- <!-- 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>   </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 --> 🆑 Tonk - add: Tajarans now have separate eye, wrist, tattoo, and makeup markings --------- Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit e45008ddf8a529c2126907ecac8ffff2a74058de) * Automatic Changelog Update (#1834) (cherry picked from commit 0091c1ebdc4bc768c0906049fa9d417d962d1839) * Cybernetics Trait Changes (#1828) # Description Changes/buffs to Cybernetic Traits. Some lesser used traits get some love, while some other stuff gets some logical re-balancing. Feel free to point out if some shitcode is broken or need explaining. --- # TODO - [ ] I got ideas cooking that I don't know how to code --- # Changelog 🆑 tweak: Striking Calluses no longer require you to be one of 3 jobs and Human. Also increased the +1 damage to +2. tweak: Bionic Spinarette SHOULD no longer have a hunger penalty and costs less. tweak: Platelet Factories heal rate buffed from 0.07 to 0.35, airloss from 0.7 to 0.25 and healing cap increased from 200 to 400. tweak: Decreased the cost of Thermal Vision to be in line with Night Vision. tweak: IPC Platelet Factories healing cap increased from 200 to 250 tweak: Cyber-Eyes Omnihud now pickable by Command too. fix: Fixed name and description of Cyber-Eyes Modules for Night Vision and Thermal Vision. remove: Mind over Machine from Cyber-Eyes Modules. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - "Striking Calluses" now delivers increased unarmed strike damage, enhancing combat performance. - **Documentation** - Trait names and descriptions have been updated for greater clarity and consistency, including changes to "Cyber-Eyes" terminology. - **Chores** - Redundant trait options were removed from the selection pool to streamline gameplay. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: Raikyr0 <Kurohana@hotmail.com.au> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit a480c6605ebdfdd32d87a9001f2aef8303433a8d) * Automatic Changelog Update (#1828) (cherry picked from commit 365dd4353a06854120e0a38ff05f193bad48bbc7) * Shadowkin Age Fixes & Plus Plushies (#1684) # Description Shadowkin middle-aged increased to 80, old age lowered to 175, max age lowered to 250. Shadowkin can now collect their goofy little plushie from a variety of sources --- # TODO - [x] Adjust Shadowkin age brackets - [x] Add Shadowkin plushie to crates and stuff --- # Changelog 🆑 ShirouAjisai - add: Added Shadowkin plushie to crates and stuff - tweak: Tweaked Shadowkin age brackets <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced a new "shadowkin plushie" loadout item, enhancing customization options. - Expanded the collectible pool by adding a new plushie available in multiple game areas, including reward systems and random spawners. - Enhanced the variety of items available for the `PresentRandom` entity with the addition of the "shadowkin plushie." - **Adjustments** - Refined life-stage parameters for the Shadowkin species, adjusting age thresholds to better define maturity. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: SixplyDev <einlichen@gmail.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: ShirouAjisai <zaneromeave319@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit fb3d00036f6a21d7fa3c4b41341cd61b1e41e0d0) * Automatic Changelog Update (#1684) (cherry picked from commit caf8572352d38f51b15d21f0e1f92434f869dd14) * Trait Add Tag (#1846) # Description Added TraitAddTag Function, which for example can be used to add Spidercraft to the Spinerette trait. # Changelog 🆑 - add: TraitAddTag Function <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Entities now receive automatic tag assignments at spawn, enhancing the system's trait interaction and overall categorization capabilities. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: Raikyr0 <Kurohana@hotmail.com.au> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> (cherry picked from commit b1acdc4017dc1181b7f557351e82ef1df93635c2) * Automatic Changelog Update (#1846) (cherry picked from commit 9622d443d5308eda14231c3b3bb3130884465272) * Arachne SpiderCrafting (#1847) # Description Added SpiderCraft Tag to Arachne # Changelog 🆑 - add: Added SpiderCraft to Arachne <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced a new "SpiderCraft" classification for the Urist McArachne entity, expanding its behavior and interactions related to spider-specific mechanisms. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: Raikyr0 <Kurohana@hotmail.com.au> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> (cherry picked from commit ff4146f879d397993eee22a2a4807e986e404641) * Automatic Changelog Update (#1847) (cherry picked from commit 91d40483c2c49f86d7b2609a5ac9cd7b30d16c00) * Add Centcom Disabler (#1845) <!-- 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]? --> it self recharges a bit. It's also green. It's also a steal target, because it's green. I noticed the Nanotrasen Representative has a disabler in his locker by default, but does not get to pick one in a loadout. I figured I'd remedy this, by giving him a shiny green Disabler that slightly recharges on its own. It deals the same stamina damage as the normal Disabler. The only differences are: - Green - Steal Target - Slightly higher rate of fire - Slightly recharges itself (half as slow as the antique pistol) - Admits Centcom doesn't trust you with lethals in its description --- <!-- 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>   https://github.com/user-attachments/assets/f7eaff3d-b8b9-4954-9688-fb9ef0d04588  </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 --> 🆑 - add: Added CentCom disabler as loadout option for the Nanotrasen Representative. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Expanded loadout options for the Nanotrasen Representative role with a dedicated weapon configuration. - Introduced the "CentCom disabler," a new self-defense weapon option with advanced features. - Updated localization entries to reflect the new representative weapon grouping. - Added a new steal target group for the Nanotrasen representative's weapon. - Enhanced visual assets with updated animations and states for the new weapon. - Introduced new objectives related to the Nanotrasen Representative role, enhancing gameplay experiences. - Added the "Nanotrasen Representative" job title to localization. <!-- end of auto-generated comment: release notes by coderabbit.ai --> (cherry picked from commit 143d24951a200ab94f3e4e88d3a3a90eeb8856ca) * Automatic Changelog Update (#1845) (cherry picked from commit 7ca0757334ee9a1d87c9cbf1f9cc02a860ecc136) * Plant Analyzer Port (#1849) <!-- 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]? --> Ported directly from https://github.com/Goob-Station/Goob-Station/pull/1685 I tweaked the sprite, and changed its usage of a Papersystem. I can't speak for the code quality, since I didn't write it, but I'm willing to fix things so long as I have the capability to do so. --- <!-- 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>    https://github.com/user-attachments/assets/0189567a-57ca-4e9d-ba0d-74e622e1d30d https://github.com/user-attachments/assets/25ea6100-1458-4804-98e4-5f70b6bfcd45 </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 --> 🆑 - add: Port Plant Analyzer from botanySupremacist, who took it from ian321 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced a comprehensive plant analyzer interface that displays detailed plant health, tray data, and environmental conditions. - Added an in-game report printing feature for easy access to analysis results. - **Enhancements** - Refined yield calculations and plant metabolism behaviors. - Integrated the analyzer item into crafting recipes, vending machines, and locker inventories. - Expanded localization for clearer, user-friendly plant analysis information. - Added new localization strings for printer status feedback. - Introduced new classes and messages for improved data handling and user interaction within the plant analyzer system. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: Timfa <timfalken@hotmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> (cherry picked from commit 47a55408ad92af463159dea3325edd0c9c9611ce) * Automatic Changelog Update (#1849) (cherry picked from commit 4da1efdfd293d5df1c8bd889c621eea94ed5fed8) * Mind Role Entities (#31318) * Mind Role Entities wip * headrev count fix * silicon stuff, cleanup * exclusive antag config, cleanup * jobroleadd overwerite * logging stuff * MindHasRole cleanup, admin log stuff * last second cleanup * ocd * minor cleanup * remove createdTime datafield * now actually using the event replacement I made for role time tracking * weh (cherry picked from commit 24fae223e698b09cf9928c4a0f2f1dc774f266ab) * Fix error (cherry picked from commit d33bf89a62ae2f5d51f3af01b4ae2ef54341b5c5) * Update SharedContentIoC.cs (cherry picked from commit a50fed2fee56b57d0507a58ebf7bc13de82ad9d2) * dragon antag refactor (#28217) * remove dragon system usage of GenericAntag * add AntagRandomSpawn for making antags spawn at a random tile * add AntagSpawner to make an antag spawner just spawn an entity * add antag prototype for dragon since it never had one * make dragon spawner a GhostRoleAntagSpawner, remove GenericAntag * make dragon rule use AntagSelection and stuff * remove dragon GenericAntag rule * add back to spawn menu --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit c0a56377bc5b9563de973d04f92d7d6923ca9145) * Cultist Mind Roles (cherry picked from commit 585e26103a67cc2bd185faaa468ddc5840a8e9c3) * Update midround.yml (cherry picked from commit b78d24ce6bb7f8cb4a85a89f6f974fbce1d83055) * Update ghost_roles.yml (cherry picked from commit 22df7509b5c5113afc8f1ba168223b0756de5d47) * Solarian Alliance Content (#1851) # Description This PR acts as a proper introduction to players for the Sol Aliance faction, a major antagonist group from my old home server's lore. To do so, I've ported a large number of assets from Aurora.3 to this repo, as well as created a new Midround Antagonist called "Deserters", which shows off this group to players. <details><summary><h1>Media</h1></summary> <p>    </p> </details> # Changelog 🆑 - add: A new Midround Antagonist has been added to the game. The "Solarian Deserters" are a group of highly trained soldiers who haven't been paid for far too long, whom have come to the station to loot it for everything valuable. - add: Lore guidebook entry for the Solarian Alliance, a majorly antagonistic faction. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced the "Solarian Navy Deserter" role with detailed localization, objectives, and traits. - Launched a dynamic shuttle event featuring interactive elements like secure doors, turret defenses, and specialized equipment. - Expanded gameplay with new storage options, tactical helmets, uniforms, identification cards, and door access tailored for the Sol Alliance. - Added a new NPC faction and game events enhancing combat and role-play dynamics. - Introduced various clothing items and uniforms associated with the Sol Alliance, including tactical gear and dress uniforms. - Added new metadata and structured entries for various clothing and equipment assets. - **Documentation** - Enriched lore and guidebook entries with expanded nation details, emphasizing the Solarian Alliance. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> (cherry picked from commit 6d919038f3845bb4008a17e1d068196779162f4a) * Automatic Changelog Update (#1851) (cherry picked from commit ffaf99ca4b01e63f6bb98731e630f066fad25909) * Supermatter Atmos Mapping Assets (#1859) # Description This adds "High Flow" variants of all existing atmos devices, which are useful for supermatter engines. I also added the ability for FixAtmosMarkers to optionally accept a gas mixture directly, as opposed to the stupid hardcoded gas mixes that they were limited to using previously. # Changelog 🆑 - add: Added high pressure variants of atmos devices intended for supermatter engines. - add: Added engineering locked high security doors, also for use in supermatter engines. - add: Fix Atmos markers can now accept a gas mixture directly for modifying their tile. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Enhanced atmospheric commands now dynamically use specific gas mixtures for more flexible performance. - Introduced a new supermatter coolant entity, offering an alternative liquid nitrogen-like option. - Added several high-pressure and high-flow gas components, including pumps, filters, mixers, vents, and injectors. - Updated map elements by refining door access prototypes and labels for improved in-game clarity. <!-- end of auto-generated comment: release notes by coderabbit.ai --> (cherry picked from commit b9c3c8b366c15b5f09cfd641c90b09254f06de94) * Automatic Changelog Update (#1859) (cherry picked from commit 468a263863f17772e6233032e5099d6c83764616) * Rerotate Arena (#1853) <!-- 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]? --> Rerotates Arena. Adds an AI satellite, and maps a few station maps, cameras, and psionic registry computers. Adds myself as the maintainer for it. Do note that I am still learning how to map. Please state any changes that is wished to be seen before it is ready to merge. It is 3AM, I need sleep. --- # 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] Space cleanup - [x] Psionic Registry Computers - [x] AI Satellite & Related Stuff --- <!-- 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>  </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 --> 🆑 - add: Arena is back <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - The Arena map is now reactivated with updated configurations and active maintenance. - Enhanced gameplay details and role assignments have been enabled for a more engaging experience. - The configuration for the Arena map has been fully activated, including various roles and attributes. <!-- end of auto-generated comment: release notes by coderabbit.ai --> (cherry picked from commit 534a058eb489ceb4abaadac7e4943ed2baaa8c67) * Automatic Changelog Update (#1853) (cherry picked from commit 3b30c0a1fe8dc5e10c3cb0536e26d101893663a2) * Port Grab Intent From Goob (#1856) # Description After months, Grab intent is finally ported to EE, as a result of a 4 hour Adderall induced code binge. ## This PR is more shit than code. Required for CQC, an attempt to port that will come later. @Erisfiregamer1 requires this for [Changelings](https://github.com/Simple-Station/Einstein-Engines/pull/1855). Thanks to Gus for the Goobstation pr, and to Spatison for the original port on WWDP Tests on my local repo worked. # TODO * [ ] Await review * [ ] pain # Media  # Changelog 🆑 Eagle * add: Ported Grab Intent from Goobstation <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Enhanced pulling and grabbing interactions now feature multiple stages that impact how actions and collisions feel. - Virtual item handling during throws and drops has been refined for more dynamic in-game outcomes. - Alert visuals have been updated to provide nuanced feedback depending on the intensity of pulls and grabs. - Player movement and breathing mechanics have been fine-tuned for more realistic behavior. - New localization strings deliver clearer, context-sensitive notifications for grab-related actions. - Introduced a new component and system for managing entities thrown while grabbed, including damage handling and visual effects. - New event classes enhance interaction handling for virtual items during grabbing actions. - **Bug Fixes** - Improved logic for stopping pull actions to ignore grab states when necessary. - **Chores** - Added metadata for new textures related to alerts in the user interface. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 18722e86f3190632026127af111dcc0d10d4af49) * Automatic Changelog Update (#1856) (cherry picked from commit 309ab74013fed2be64d9fb0457631210d860644b) * Port Role Types (#1860) Ports https://github.com/space-wizards/space-station-14/pull/33420 This is the last requirement before we can start mass-porting new antags. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Enhanced role displays in player and character interfaces with a new "Role Type" column. - Updated admin overlay options, including a classic antagonist label. - Expanded ghost role behaviors for various entities, offering more dynamic gameplay. - New localization entries for role types and UI settings for sounds and layout customization. - Added new mind roles and role types, improving role management and gameplay interactions. - Introduced new events for player spawning processes to enhance gameplay scenarios. - **Refactor** - Streamlined role management and update processes for improved reliability and performance. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com> (cherry picked from commit e10c51cdb39845ed1f2bb9b08f0b226cefbd402e) * Rock And Stone <!-- 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]? --> Ports Lavaland and required systems from Goobstation. --- # 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 over _Lavaland - [x] Port over required codepatches - [-] Test locally (Should be fine) - [X] Pass tests --- <!-- 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>  </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 --> 🆑 - add: Lavaland has been ported! <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced a dynamic mining voucher interface allowing players to redeem various mining kits. - Enhanced shuttle docking systems with an updated console interface for smoother FTL transitions. - Added immersive boss music management for enhanced in-game boss encounters. - Expanded Lavaland gameplay with new procedural map generation, weather events, and storm scheduling. - Integrated new interactive commands and UI improvements for advanced weapon upgrades, Hierophant boss actions, and research features. - Added new components and systems for managing various gameplay elements, including damage squares, tendrils, and block charges. - Implemented new localization entries for improved player experience across various game features. - Introduced new components for managing mining vendors and vouchers, enhancing the interaction with mining kits. - Added a new system for managing the deployment of shelter capsules in the Lavaland environment. - **Tests** - Added integration tests to validate Lavaland planet generation and map initialization. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit f2f5d4610db795a124b37780230eec5d5ca0264a) * Automatic Changelog Update (#1844) (cherry picked from commit 990878b9ed60b4e22388038b63714ec2dc693bbf) * fixs * fix * fuck --------- Co-authored-by: Tonk-GCR <190437025+Tonk-GCR@users.noreply.github.com> Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> Co-authored-by: Raikyr0 <kurohana@hotmail.com.au> Co-authored-by: SixplyDev <einlichen@gmail.com> Co-authored-by: Timfa <timfalken@hotmail.com> Co-authored-by: Errant <35878406+errant-4@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: astriloqua <129308840+astriloqua@users.noreply.github.com> Co-authored-by: Eagle-0 <114363363+Eagle-0@users.noreply.github.com> Co-authored-by: Eris <eris@erisws.com> |
||
|
VMSolidus
|
3b8eff7ead |
Remove Barotrauma Gibbing You Instantly. (#1708)
# Description
Yes this is a spite PR. I found out Barotrauma gibs you pretty much
INSTANTLY. So this removes the ability for Barotrauma to damage body
parts.
# Changelog
🆑
- fix: Space no longer gibs you instantly.
(cherry picked from commit fcad75d6dd3e231ab7870e5b0f6bfc5453122203)
|
||
|
Skubman
|
618bb61d2b |
Allow Cloning Living People (#1679)
# Description
Allows living people to be cloned. Implements (but does not cherry-pick)
https://github.com/Goob-Station/Goob-Station/pull/932. Whether living
people can be cloned or not can be set with a new CVar
`cloning.allow_living_people`.
Also prevents Plasmamen from self-igniting while being cloned in a
cloning pod. (Lore reason: They are literally submerged in fluids while
being cloned)
Fixes a bug in `EndFailedCloning` that caused the server to crash if the
used biomass was too low:
|
||
|
Skubman
|
a46b4f2b5a |
New Species: Plasmaman (#1291)
# Description Adds the Plasmamen as a playable species. Plasmamen are a skeletal species who depend on Plasma to live, and oxygen is highly fatal to them. Being exposed to oxygen will set them on fire, unless they wear their envirosuits. ## Species Guidebook <img width=500px src="https://github.com/user-attachments/assets/a1ef91ef-87b2-4ae0-8b5c-922a0c34777f"> <img width=500px src="https://github.com/user-attachments/assets/110f0fa0-7dc4-410b-a2c0-a517f0311484"> **SPECIAL:** - Plasmamen speak the language Calcic, a language they share with Skeletons. ## Shitmed Integration Plasmamen are the first ever species designed with Shitmed in mind, with one of their core mechanics (self-ignition) powered entirely by Shitmed. Whether or not a Plasmaman ignites from oxygen exposure depends only on their body parts. A Plasmaman with only their head exposed will not burn as much as an entirely naked Plasmaman. You can **transfer** Plasmaman body parts to non-Plasmamen through **surgery** so that they also ignite from oxygen exposure. Meanwhile, a Plasmaman with a non-Plasmaman head can expose their head without self-igniting. https://github.com/user-attachments/assets/0aa33070-04be-4ded-b668-3afb9f4ddd7c ## Technical Details This also cherry-picks https://github.com/space-wizards/space-station-14/pull/28595 as a quality-of-life feature to ensure Plasmamen keep their internals on upon toggling their helmet with a breath mask on. ## TODO ### RELEASE-NECESSARY <details> - [x] Port more envirosuits / enviro helms (job-specific) and their sprites - [x] Remove breath masks from default plasmaman loadouts because the envirohelms already allow them to breathe internals - [x] Change default plasma tank to higher-capacity version - [x] Prevent plasmamen from buying jumpsuits and helmets other than envirosuits - ~~[ ] **Client UI update for loadout groups min/max items and default items**~~ - [x] Plasmaman-specific mask sprites from TG - [x] Disable too cold alert for plasmamen - [x] Create/port sprites for these jobs - [x] Courier - [x] Forensic Mantis - [x] Corpsman (Resprite security envirosuit) - [x] Prison Guard (Resprite security envirosuit) - [x] Magistrate (No Paradise envirosuit so use new colorable envirosuit) - [x] Blueshield (Port from Paradise and tg-ify?) - [x] NanoTrasen Representative (No Paradise envirosuit so use new colorable envirosuit) - [x] Martial Artist (use new colorable envirosuit and make pure white) - [x] Musician (use new colorable envirosuit) - [x] Reporter (use new colorable envirosuit) - [x] Zookeeper (use new colorable envirosuit) - [x] Service Worker (use new colorable envirosuit) - [x] Gladiator - [x] Technical Assistant - [x] Medical Intern - [x] Acolyte / Research Assistant - [x] Security Cadet - [x] Assistant - You know what. These intern jobs are fine. They can use their normal equivalent's envirosuits. - [x] Logistics Officer (use new colorable envirosuit) - [x] Adjust sprites to be closer to actual job - [x] Captain (Shift color to be closer to ss14 captain) - [x] ~~CMO (Remove yellow accents)~~ - [x] Port HoP envirogloves sprite - [x] unique sprite for self-extinguish verb - [x] Refactor conditional gear stuff to live only in StartingGearPrototype with `SubGear` `List<ProtoId<StartingGearPrototype>>` field and `List<Requirement>` field for sub-gear requirements - [x] Add starting gear for paradox anomaly, and antags and ghost roles - [x] Paradox - [x] Nukies - [x] Disaster victims - [x] Listening post operative - [x] Make all envirosuit helmets have a glowing (unshaded) visor - [x] Envirosuit extinguish visuals - [x] JobPrototype: AfterLoadoutSpecial - [x] Set prisoner envirohelm battery to potato, command/sec/dignitary to high-powered - [x] Set base envirosuit extinguishes to 4, sec 6 and command 8 - [x] Improve plasmaman organ extraction experience - [x] Body parts now give 1 plasma sheet each, while Torso gives 3 - [x] Organs can be juiced to get plasma - [x] Make envirohelm flashlights battery-powered - [x] Plasmamen visuals - [x] Grayscale sprites for color customization, and set default skintone color to Plasmaman classic skintone - [x] Plasmaman eye organ sprite - [x] Add basic loadouts - [x] Add way to refill envirosuit charges (refill at medical protolathe after some research) </details> ### Low Importance <details> - [x] Envirogloves - [ ] (SCOPE CREEP) Plasma tanks sprite (only normal emergency/extended, rather low priority) - [ ] (SCOPE CREEP) Modify envirosuit helmet sprites to have a transparent visor - [ ] Glowing eyes/mouth marking - [x] More cargo content with plasma tanks / envirosuits - [x] Plasmaman survival kit like slime - [x] Additional plasma tanks - [ ] (SCOPE CREEP) Plasmaman EVA suits - [x] ~~Add envirosuits to clothesmate~~ - [x] Add more plasma tanks to random lockers and job lockers - [x] Turn envirosuit auto-extinguish into extinguish action - [x] move self-extinguish verb stuff to shared for prediction of the verb - [x] move self-extinguisher stuff away from extinguisher namespace - [x] unique sprite for self-extinguish icon - [x] ~~IDEA: purple glowy fire extinguisher ~~ - [x] on self-extinguish, check for pressure immunity OR ignite from gas immunity properly - [x] See envirosuit extinguish charges in examine - [x] Milk heals on ingestion - [x] Plasma heals on ingestion - [x] Self-ignition doesn't occur on a stasis bed - [x] ~~Self-ignition doesn't occur when dead~~ - [x] Guidebook entry - [x] Make self-ignition ignore damage resistances from fire suits - [x] ~~Make self-ignition ignore damage resistances from armor~~ - [x] ~~Unable to rot?~~ - [x] Make the envirosuit helmet toggle on for the character dummy in lobby - [ ] (SCOPE CREEP) One additional Plasmaman trait - [x] ~~Showers extinguish water as well as water tiles~~ - Unnecessary as stasis beds now prevent ignition, allowing surgery on a plasmaman on stasis beds. - [x] Unique punch animations for Plasmafire Punch/Toxoplasmic Punch traits - [x] Actually remove toxoplasmic it's just slop filler tbh - [ ] Talk sounds - [ ] Normal - [ ] Question - [ ] Yell - [x] Positive moodlet for drinking milk / more positive moodlet for drinking plasma - [x] Increase moodlet bonus and also minimum reagent required for the plasma/milk moodlets - [x] Increase fire rate base stacks on ignite cause putting out your helmet for a few secs isn't that dangerous due to the fire stacks immediately decaying - [x] I think halving firestack fade from -0.1 to -0.05 might work to do the same thing too - [ ] (SCOPE CREEP) Get bone laugh sounds from monke 'monkestation/sound/voice/laugh/skeleton/skeleton_laugh.ogg' - [ ] (SCOPE CREEP) When EVA plasmaman suit is added, 25% caustic resist - [x] Envirosuit helmet - [x] Equivalent of 100% bio / 100% fire / 75% acid resist - [x] Envirosuit - [x] Equivalent of 100% bio / 100% fire / 75% acid resist - [x] Envirogloves - [x] Equivalent of 100% bio / 95% fire / 95% acid resist - [x] Put breath mask back on - [x] Refactor: put body parts covered data into component instead of being hardcoded </details> ## Media **Custom Plasmaman Outfits** All of these use the same **absolutely massive** [envirosuit RSI]( |
||
|
Eris
|
d6f3265e83 |
MODsuits (Port From Goob #1242) (#1640)
# Description Ports MODsuits from Goobstation PR https://github.com/Goob-Station/Goob-Station/pull/1242. The PR author has confirmed that he is okay with me doing this. --- # TODO - [X] Port in sprites - [x] Port in YMLs - [X] Port code - [x] Port code PATCHES - [x] Update EE with required fixes --- <details><summary><h1>Media</h1></summary> <p> ## Modsuit crafting https://github.com/user-attachments/assets/8ff03d3a-0fc1-4818-b710-bfc43f0e2a68 ## Modsuit sealing https://github.com/user-attachments/assets/6671459a-7767-499b-8678-062fc1db7134 </p> </details> --- # Changelog 🆑 - add: Modsuits have been ported from Goobstation! --------- Signed-off-by: Eris <erisfiregamer1@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit cb06c41fc07275e1f15af916babb44368c0c26c2) |
||
|
sleepyyapril
|
a4ab8448b9 |
Mapping Mini-Wizmerge & New Central Command (#1610)
# 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]? --> Ports https://github.com/space-wizards/space-station-14/pull/32294 Ports https://github.com/ss14-harmony/ss14-harmony/pull/310 (and everything needed for it to function) Early-merges https://github.com/space-wizards/space-station-14/pull/34302 Adds the ability for multiple central command maps that get randomly selected. Tested and works. --- # 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 --> 🆑 Several contributors - add: Added a new central command map that is randomly picked alongside the old one (thank you to Spanky from Harmony) - add: Added Advanced SMES for mappers. - add: Added the atmospheric network monitor for seeing what the temperature, moles, and pressure is on every pipe everywhere through a computer. - add: Nukie med bundle now contains a compact defibrillator. - add: Ported a better mapping editor. - add: Added the throngler plushie. - remove: Removed the Throngler as a possible loot spawn for gamble crates. --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 9272f65b64392f66a7cd4fd7c84bb152dc93b65a) |
||
|
VMSolidus
|
89e8b3eb6d |
Small Space Wind Optimization Hotfix (#1550)
# Description I realized only afterwards that there was another place I could have optimized this, by normalizing the throw vector before we iterate over every entity on the tile. Which significantly cuts down on what might otherwise be an internally very complicated step. # Changelog No changelog, this isn't player facing, just an optimizing hotfix. (cherry picked from commit 6584a625edd606c73a382f50229682cb32cfb27e) |
||
|
VMSolidus
|
e7c44b4319 |
Space Wind Version 3 (#1537)
# Description I promised I would return to this code when I had gotten down the basics of Calculus, and so I have. This PR reworks Space Wind to be even more efficient, while also making it run significantly smoother. Previously, my last optimization to this system involved replacing the need to take the square root of a large float a few thousand times per tick by adding an early exit, cleverly rearranging the math so that it multiplies a few times instead of square rooting, and changing it to use the throwing system. That is no longer necessary, it now operates on the Derivative of said function with respect to time. It's no longer necessary to square anything. This new space wind is significantly smoother than before. <details><summary><h1>Media</h1></summary> <p> Final refinements of V3 courtesy of review by Mu Alpha Theta. https://github.com/user-attachments/assets/a48d43ae-7b79-4d83-81d5-028dd4e8c6c3 </p> </details> # Changelog 🆑 - add: Added Space Wind Version 3. Smoother motion, better performance. - add: Monstermos rip tiles has returned as a default CVar. - tweak: Floor Tiles once again are embeddable projectiles. (cherry picked from commit a8cb5a9703df0b38a3fefa87aca1ee24e7c9aba8) |
||
|
sleepyyapril
|
885ee5a831 |
Wizmerge for Station AI (#1351)
<!-- 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 the adding AI is now up to y'all because i'm not touching loadout code for name datasets, but it shouldn't be too bad from here --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com> Co-authored-by: Saphire <lattice@saphi.re> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com> Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net> Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Julian Giebel <juliangiebel@live.de> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: TGRCDev <tgrc@tgrc.dev> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: Fildrance <fildrance@gmail.com> Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com> Co-authored-by: archrbx <punk.gear5260@fastmail.com> Co-authored-by: Radezolid <snappednexus@gmail.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: EmoGarbage404 <retron404@gmail.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: neuPanda <chriseparton@gmail.com> Co-authored-by: neuPanda <spainman0@yahoo.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com> (cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb) |
||
|
gluesniffler
|
2a33691a1c |
Ports Shitmed Updates From Goob (#1387)
Lots of stuff. Also moved everything I could to the _Shitmed namespace
as I do in Goob. Will make future ports way faster
# Changelog
🆑 Mocho
- add: Added some fun organs and other thingies, check out the Goob PRs
if you want more details.
- fix: Fixed tons of issues with shitmed. Too many for the changelog in
fact.
(cherry picked from commit 3c9db94102cb25b28a83d51ac8d659fa31fe7d12)
|
||
|
Spatison
|
7c4bf63a33 |
[Feature] TG Gases / TG Газы (#147)
* 237.2.0 * feat: /tg/ gases * Revert "237.2.0" This reverts commit |
||
|
Spatison
|
0e0ffb6d14 |
Upstream (#142)
* Fix Power Attacks Being Faster Than Left Clicks (#1252) # Description This fixes some stupid math. Power attacks are now correctly slower than left clicks. Previously they were faster. # Changelog 🆑 - fix: Power Attacks now correctly apply a penalty on swing speed, and are no longer faster than left clicking. (cherry picked from commit 049a995f64c42734e5286229b524161a730aaea9) * Automatic Changelog Update (#1252) (cherry picked from commit 8a88bfd11f1384fa2fb01fd7ace6477202a68499) * Tweak Wizden Trait Descriptions (#1260) # Description Converted the descriptions of most wizden traits to a more formal and roleplay-oriented style, also clarifying some aspects of other traits in the process. --- TODO: - [ ] Test this --- # Changelog 🆑 - tweak: Tweaked the descriptions of most Wizden traits to be more vivid and descriptive. --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> (cherry picked from commit 411cb213ac9ab2e6a0b790e72b25a142a4945217) * More Trait Functions (PushMarkup & AddArmor) (#1253) # Description This PR effectively "Reworks" several of the Bionic Traits through use of new modular TraitFunctions. These being, **TraitPushDescription**: Ensures that an entity has the new ExtendDescriptionComponent, then writes to said component. ExtendDescriptionComponent serves as a new highly modular "One stop shop" for any system wanting to add text to the shift-click examine window. It even accepts arguments for text color, font size, and whether or not a person must be standing within touching distance to "See" the provided texts. It accepts arbitrarily any number of descriptions. **TraitAddArmor**: This takes advantage of a new functionality for the DamageableSystem, whereby entities are able to have more than one DamageModifierSet. This allows arbitrarily any number of traits to add as many modifier sets as desired, without fear of any compatibility issues. These can be both negative and positive, and as Skubman has pointed out, this can also be used to create negative traits that make a character more vulnerable to a given damage type! Additionally, most of the Bionics Traits have been reworked. CyberEyes has been split into two modules, one for the base implant, and one for the Flash Protection. Dermal Armor has been reworked using TraitAddArmor, so that it no longer replaces your original modifier set, and instead stacks multiplicatively with whatever your original species modifier set was. Thus, it can now be taken by any species. # TODO <details><summary><h1>Media</h1></summary> <p> TraitPushDescription  TraitAddArmor  </p> </details> # Changelog 🆑 - add: Five new functions for the Trait System, AddArmor, PushDescription, ModifyMobThresholds, AddSolutionContainer, and ModifyStamina. - tweak: CyberEyes Basic System has been split, now Flash Protection is a separate module. - add: Dermal Armor no longer replaces your original species damage resistances. It now stacks multiplicatively with your original resistances. - tweak: Dermal Armor can now be taken by any species, not just Humans. - add: Dermal Armor, and Bionic Arms can now be revealed by a close examination. Shift click on someone within touching distance will reveal if they have these "Obvious" cyberware. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com> (cherry picked from commit 29d2cb1ed85ab089d83c702f7405e938a0d9374c) * Automatic Changelog Update (#1260) (cherry picked from commit 8d54aa2fffdd3726e948d6d228287b01c0a81413) * Feat: Anomaly Scanner Data Copying (#1250) # Description Makes it so that using one anomaly scanner on another transfers the anomaly data onto the used scanner. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: You can now touch one anomaly scanner with another to copy the anomaly scan data from it. (cherry picked from commit 0574be444b90137808c07f85e10b59c464f054cf) * Automatic Changelog Update (#1253) (cherry picked from commit 6fa8d6817fa81e6d6d20b61f5ec4b7b96fdb185b) * Automatic Changelog Update (#1250) (cherry picked from commit 1b5704535ce42041c068d201cdb447af42004c20) * Rename "Pierce" Typo to "Piercing" (#1267) # Description Oops. Some files refer to the non-existent **Pierce** damage type when the proper name is **Piercing**. # Changelog 🆑 Skubman - fix: Piercing damage can now dismember body parts, just like Blunt and Slash damage. (cherry picked from commit 992b2e486855cea6646cf5d4af51ca8cbf61b29d) * Buff Medical Due to Shitmed Changes Cherry-Pick (#1259) <!-- 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]? --> + Buffed applicable medication heal values. + Buffed applicable medication stack sizes. + Slightly buffed dylovene, burn, and brute chems. + Buffed applicable medication doAfter delay from 3s to 2s. --- ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> This change was made with the advent of the new Limb Damage system. This PR seeks to achieve making SS14 Medical more equivalent to SS13 Medical when it comes to healing damage values. This was done as Bruise Packs and Ointment only heal 5 Brute or 5 Burn respectively when applied to a limb. When each limb has a 100 Crit threshold, this can make it extremely hard even with surgery to heal limbs in the absence of Chemicals. Furthermore on higher pop, this will lead to people burning through applicable meds even faster than before Limb Damage was implemented. It would take 34 bruise packs to heal someone with 170 Blunt spread out across their limbs, with this change it would reduce that to 12 bruise packs. Full list of numerical val changes: - Healing component doAfter Delay reduced. was 3s, now its 2s. - Applicable medical items now have a max stack size of 15 (was 10). - Ointment heals 15 of each burn type, 10 caustic (was 5 of each burn type, 1.5 caustic) - Mesh now heals 20 of each burn type (was 10 of each burn type). - Bruise Packs now heal 15 of each brute type (was 5 of each brute type) - Sutures now heal 20 of each brute type (was 10 of each brute type) - Bloodpacks now heal 2.5 Bloodloss & restore 10% bloodlevel (was .5 Bloodloss and 5%) - Gauzes now heal 15 Slash and 20 Pierce (was 5 Slash and 10 Pierce) - Dylovene now heals 1.5 Poison per .5u (was 1 Poison per .5u) - Bicaridine now heals 2.5 Brute per .5u (Was 2 Brute per .5u) - Dermaline now heals 2 Burn per .5u (was 1.5 Burn per .5u) - Epinephrine now heals 1 Burn & 1 Brute per .5u (was .5 for each per .5u) - Kelotane now heals .5 Burn per .5u (was .33 Burn per .5u) - Omnizine now heals 3 Burn, Toxin, Airloss, and Brute per .5u (was 2 per .5u) - Lacerinol now heals 4 Slash per .5u (was 3 per .5u) - Bruizine now heals 4 Blunt per .5u (was 3.5 per .5u) # 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] Cherry-pick Medical changes merged in Goobstation --- <!-- 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 --> --- ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> Should values be overtuned, they can be reduced in a future PR or before this PR is merged. **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - tweak: Increased applicable medication heal values. - tweak: Increased stack size of applicable medications. - tweak: Slightly increased dylovene, burn, and brute chemicals heal values. - tweak: Decreased Medical item application time from 3s to 2s --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit b431d24f86f94433ea0c53982db83e40ef1d3f2c) * Automatic Changelog Update (#1267) (cherry picked from commit 02dd8ab06333a5b2dabe03845bfd6719ca09ef48) * Automatic Changelog Update (#1259) (cherry picked from commit 09d59007d4c55ee9f7daa0f56cae672c51951843) * The Blood Cult (#1001) <!-- 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 Adds a new game mode - The Blood Cult. Hail to Nar'Sie! --- # TODO - [x] Gamemode - [x] Roles - [x] Runes - [x] Constructs - [x] Structures - [x] Forge - [x] Archives - [x] Altar - [x] Pylon - [x] Structure - [x] Placement System - [x] Airlocks - [x] Repulsor system - [x] Construction system - [x] Items - [x] Eldritch Whetstone - [x] Construct Shell - [x] Mirror Shield - [x] True Nar'sian Hardened Armor - [x] Flagellant's Robe - [x] Eldritch Longsword - [x] Zealot's Blindfold - [ ] Night vision system - [x] Shuttle Curse - [x] Veil Shifter - [x] Void Torch - [x] Reagents - [x] Holy Water - [ ] Actions - [x] Cult Magic - [x] Stun - [x] Teleport - [x] Electromagnetic Pulse - [x] Shadow Shackles - [x] Twisted Construction - [x] Summon Combat Equipment - [x] Summon Ritual Dagger - [x] Blood Rites - [ ] Cult Leader Magic - [ ] Final Reckoning - [ ] Mark Target - [ ] Eldritch Pulse - [ ] Construct's Magic - [ ] Artificer - [ ] Summon Cult Floor - [ ] Summon Cult Wall - [ ] Greater Conjuration - [ ] Summon Soulstone - [ ] Wraith - [ ] Phase Shift - [ ] Juggernaut - [ ] Shield - [ ] Gauntlet Echo - [x] Cult leader selection system - [ ] Rending/Apocalypse rune placement markers EXTRA: - [ ] Spirit Realm rune - [x] Eldritch language - [ ] Conceal magic - [ ] Ru locale --- <!-- 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>  </p> </details> --- # Changelog 🆑 - add: Added Blood Cult Gamemode. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 150020866ddd383f297dfccd7717017c23222d82) * fix * Automatic Changelog Update (#1001) (cherry picked from commit a179e186fa812e5dbce34983e11ef7af56ccdcf4) * Engine Update v237.2.0 (#1270) <!-- 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]? --> Updates to engine version v237.2.0. Fixes disposals systems breaking and not using the proper direction. --------- Co-authored-by: sleepyyapril <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> (cherry picked from commit dcc1c38fb729b00fdb15b79b38372f3e1e8bc951) * [QoL] Show Oni Damage Bonus In Damage Examine (#1268) # Description Examining an item's damage values as an Oni now calculates your bonus damage, and it also works with all of the Oni combat traits. ## Technical details `OniSystem`, instead of adding melee damage through `MeleeHitEvent`, now adds damage through `GetMeleeDamageEvent`, the same event that examining melee weapon damage raises through `GetDamage`. ## Media **Normal damage values** <img src="https://github.com/user-attachments/assets/9de255ef-29e6-4119-93cc-356349812a6f" width=300px> **Oni damage values** <img src="https://github.com/user-attachments/assets/18d44aaf-5a70-4ba9-a8c8-be29e92d7267" width=300px> # 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 --> 🆑 Skubman - tweak: As an Oni, examining the damage values of weapons now takes into account the melee damage bonus from your species or trait. (cherry picked from commit 613e7937392d5d4fd9bf906f571adc237c706367) * Automatic Changelog Update (#1268) (cherry picked from commit 5fe4b1e94b987f787807cc10df06f667b87d124e) * Loadouts V4 (#1164) # Description # TODO - [x] Custom name/desc/color tint, toggleable individually per-loadout - [x] Fix them not changing correctly between profiles in-editor - [x] Preview colors in the lobby - [x] Allow the users to null the color themselves (and default it to such) - [x] Pick what should be allowed to be recolored - [x] Guidebook links - [x] Make an example - [x] Special components for loadouts - [x] Heirlooms - [x] Pick what should have heirlooms - [x] Decimate lag - [x] Fix live character preview - Maybe do characters per job - Rethink unusable --- <details><summary><h1>Media</h1></summary> <p> <!--  --> https://github.com/user-attachments/assets/bcf61517-6b64-40d2-b299-7462e2469fe2 </p> </details> --- # Changelog 🆑 - add: Players can set custom names, descriptions, and color tints for their loadout items - add: Certain loadouts may have Guidebook pages shown in the editor - add: Players can pick a list of loadout items to have one randomly be their family heirloom for a mood bonus or deficit if they are carrying it - fix: Loadouts have almost as little lag as possible (hopefully none) - fix: Everything properly updates your character editor's live preview --------- Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> (cherry picked from commit f0463062812428625da9e8adad60c8a567fdacbe) * Automatic Changelog Update (#1164) (cherry picked from commit 57917a746f514aba3f142d870a9280c9b1eb9a4f) * [Fix] Added Robust.Xaml to the Project Solution (#1266) Mirrors https://github.com/space-wizards/space-station-14/pull/31573 Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> (cherry picked from commit 1d65d548e69862295926fb08aee962d8fbd0b5c4) * Update Credits (#1274) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> (cherry picked from commit 39f4ad8a8884bc5bb9e64530b1a708ea41b4de32) * Fixes Make Cultist Admin Verb to Act on Target Not Self (#1289) There's a small error on the admin verb for blood cultists which made the verb only work on self. This fixes it. (cherry picked from commit 6c2b2a8a4ab7c7b0c5e18d796ccd94d09b087509) * IPC Instrument Menu Fix (#1287) <!-- 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]? --> Fixes IPCs being unable to use the midi menu. --- # 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 --> 🆑 - fix: Fixed IPCs being unable to use the midi menu. (cherry picked from commit f133b9b7cf175815a3c6de59d541e12f0fc60790) * Automatic Changelog Update (#1287) (cherry picked from commit 92a6e099fca1581ea8a0cfd16bf7f13ae8d1108a) * Change Target Doll Icon For Ashen Theme (#1282) # Description  (cherry picked from commit 327247585612d9d65e20b8b856864701ceb1c933) * Fix Applicable Medication Stack Bug (#1278) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> ## About the PR <!-- What did you change? --> - Fixed a bug where applicable medication stacks would revert back to 10 after 1 use. ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> - Did you know maxstacks were stored in a separate YML? Me neither, until now. **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> <!-- --> 🆑 - fix: Fixed a bug where applicable medication stacks would revert back to 10 after 1 use from full. Signed-off-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com> (cherry picked from commit d4879f9129ae484f24f57eb642cc7d600f2323e0) * Automatic Changelog Update (#1278) (cherry picked from commit 8d485e8c0d4e3932835aeed210388e85988a0213) * Re-Enable Language Color and Font (#1294) # Description Re-enables language font and colors showing up in chat messages. The language font/colors were bugged after adding language names in chat (https://github.com/Simple-Station/Einstein-Engines/pull/1165) I also overhauled the format for chat messages to be more aesthetically pleasing, and made sure chat bubbles use the language color/font. ## Media **Nekomimetic**   **Bubblish**   **Tau-Ceti Basic (Default Language)**   **Rootspeak**   ## Changelog 🆑 Skubman - fix: Language colors and fonts will show up in text messages again, both on in-person messages and on the radio. - tweak: The text on chat bubbles now uses the color and font of the language being spoken. - tweak: The language prefix before the name on chat messages now uses the language's color. (cherry picked from commit 1a9763528a9b15f11f474a2fa7ecfdde98aa9a15) * Automatic Changelog Update (#1294) (cherry picked from commit 7d802e35dc45c37016681c3a009bdaebe2707178) * Shitmed Update 2 - [Insert Snarky Remark] (#1271) # Description  Honey wake up, another shitmed PR with 5 features and a trillion bugs! I love bloat. --- # Known Bugs - A lot of shit with changelings lol - Markings suddenly disappear from your entity apparently at random. Wizden exclusive issue as of now. - Fire heretics explode when ascending due to part damage shitcode (sorry) - Some exceptions/null point references at round end, tentatively related to salvage corpses. - Slots having wonky behavior due to not being networked. More of a broad issue with how I implemented them initially. - Arachne are FUCKED with surgery, I was incredibly tempted to set them to roundstart: false, but I'll try to hotfix it this week. --- # Changelog 🆑 Mocho, Deltanedas - add: Ported Ghetto Surgery from Deltanedas! - add: Ported fishops organs from Deltanedas! - add: Added different step durations to each surgery step. - add: Added a T2 research for advanced surgical tools - add: Added a T3 research for an omnitool for surgery. - add: Added Surgical and Advanced Surgical modules for Mediborgs - add: Mediborgs can now perform surgery! - add: Added lobotomies as an operation. Godspeed you psychopaths. - add: Added cybernetic arms, legs and eyes. - add: Added EMP weaknesses to all cybernetic parts (the day of reckoning will come for IPCs soon) - add: Losing your eyes now blinds you. - fix: Fixed a few species that did not inherit from BasePart's, thus taking damage types they shouldn't on their limbs. - fix: Fixed harpy lungs not being usable in surgeries. - fix: Fixed biosynthetic and other printable parts not allowing you to attach body parts to them. - fix: Fixed fire being able to destroy your chest. - fix: Fixed entities being able to take over your body by just inserting a brain or another head on top of you. - fix: Fixed some shitcode that didnt let rejuvenate or godmode work properly. - fix: Fixed bionic arm, and cybernetic eyes traits not working properly due to shitty networking. - tweak: Increased tend wounds's speed by double, and bumped up the values on its calculations. DEATH TO TOPICALS, LEAVE THOSE TO TIDERS. - tweak: Beheading an entity now doesnt let it move, speak, and forces it to the ground immediately (literally 1984!!11!!) - tweak: Changed sprites on most surgical tools to now use /tg/ sprites. - tweak: Unbound shitmed targeting doll keybinds by default (did you know we have those). --------- Signed-off-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: goet <6637097+goet@users.noreply.github.com> Co-authored-by: Saphire Lattice <lattice@saphi.re> (cherry picked from commit 2eafa0d47e7b9a3270ae797f82dd7b1772dffb15) * Admin Tooling Cherry Picks (#1290) <!-- 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]? --> Link to every PR I cherry-picked: 1. https://github.com/new-frontiers-14/frontier-station-14/pull/2283 2. https://github.com/space-wizards/space-station-14/pull/29219 3. https://github.com/space-wizards/space-station-14/pull/30075 4. https://github.com/space-wizards/space-station-14/pull/28639 5. https://github.com/space-wizards/space-station-14/pull/32527 6. https://github.com/space-wizards/space-station-14/pull/28030 7. https://github.com/space-wizards/space-station-14/pull/28178 The main purpose of this PR is the first cherry-picked PR. It adds the ability for admins to reply to ahelps via discord using an HTTP POST request. See all relevant details in the initial PR by Myzumi. --------- Co-authored-by: Myzumi <34660019+Myzumi@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: to4no_fix <156101927+chavonadelal@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> (cherry picked from commit b8e75dae0e25301da4ffdd1f6ca5b4aebdf5a2b8) * Automatic Changelog Update (#1271) (cherry picked from commit d58d397a69fc2bb5b2bbce9280a978d5d899bba0) * More Loadout Equipment (#1281) # Description This PR adds a bunch more equipment selections for Engineering loadouts, plus Suit/Skirt selections for the jobs that were missing it. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: All engineering roles have had their equipment loadouts significantly expanded upon. Engineers can now buy construction materials with their loadout points. - fix: All engineering jobs now have their Suit/Skirt selection via loadouts. - add: Salvage techs can now select from a variety of knife options to start their spess adventures with. - add: Epistemics staff now have *some* equipment selection options that they share. More to come when I finish making the Potentiometer. (cherry picked from commit 0bd9a9ea81c2e6e9ef775a131b547b8b861548b1) * Automatic Changelog Update (#1281) (cherry picked from commit c7f1b4fa3c57f3650154150e1c30ce28e3302230) * Dynamic Hostname System (#1296) <!-- 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]? --> Change your hostname whenever map, preset, or runlevel changes! Variables given on all hostname locale strings: - {$mapName} - The name of the current map. - {$preset} - The name of the current preset. - {$originalHostname} - What you originally had game.hostname set to, before updating. --- <!-- 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>     </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 --> nah (cherry picked from commit de98c2aec2c072abeb6c81c74b830d72e29ba0c8) * Religious Headgear For Character Customization (#1297) # Description This PR adds a few articles of various kinds of religious headgear to loadouts, namely a Hijab, Turban, and Kippah. All 3 are whitescale items that are set as colorable, allowing players to make them whatever color is desired. Farida can finally have the pink Hijab she was always supposed to have. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: Added various articles of religious headgear to loadouts, such as Hijab, Kippah, and Turban. All of these are set to allow custom colors. (cherry picked from commit e46a8636eb235e627023cdd3d42428b34c134353) * Automatic Changelog Update (#1297) (cherry picked from commit 56be69053045a2d2184c975c2325889df69838e0) * Don't Require Running in Release to Test Mood (#1257) (cherry picked from commit f2871885b6dd13b418dfd7ff55ffe0559a4f7044) * Update Credits (#1300) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> (cherry picked from commit 9ef825252a0dc0054b1ba9626e7283d296150f3b) * Start of Lore Documents (cherry picked from commit dfb12e53abf1ef5d767240a19b28ba12dd35ef9b) * Finally Done (cherry picked from commit 2a8bf58dfc61f24796a55940e4a7ab6be3ced3ec) * Automatic Changelog Update (#1298) (cherry picked from commit 8a368bbdce5dd05adae998ec55f15fd5ff04b52f) * Fashion Update: Earrings & Makeup (#1299) # Description Adds **38** new earrings, **31** new face markings, and **16** bracelet/watch markings, based from Aurorastation cosmetics. Each earring, bracelet, and watch marking is applied to just one side of the body, allowing for greater customizability and mixing-and-matching markings. Most notably, the new face markings unlock **full customization of every pixel** in the 5x4 pixel space of the face. Examples of this are shown below. Arachne now have access to **more than a hundred** markings above the leg, after not having any markings in their 2 years of existence. ## Media ### Pauline <img height=270px src="https://github.com/user-attachments/assets/8316effb-34b3-4fa1-a80f-af2a3cd670c2"> <img height=270px src="https://github.com/user-attachments/assets/be75770a-c5bb-46a7-afb4-2ec54bd5a5e5"> **Head (Side):** Drop Earrings (Left), Drop Earrings (Right) **Left Hand:** Left Bracelet ### Red and Blue <img height=270px src="https://github.com/user-attachments/assets/8c1356fc-6eaa-484f-afb6-5ace7f45d895"> **Head:** Cheek Spot (Left), Eye Corner (Left), Cheek Spot (Right), Eye Corner (Right) **Head (Side):** Double Gemstone Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Watch (Colorable) **Left Arm:** Left Arm Bracelet **Right Hand:** Right Watch (Colorable) **Right Arm:** Right Arm Bracelet ### Pink <img height=270px src="https://github.com/user-attachments/assets/ae376cc3-7cd5-4e91-a3a0-ebe48202f5e6"> **Head (Side):** Hoop Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Bracelet **Left Arm:** Left Arm Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Psychic <img height=270px src="https://github.com/user-attachments/assets/eaa8069a-2e51-4456-a315-414aa64cd41a"> **Head:** Bindi, Full Blush **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Hand:** Left Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Cyclops <img height=270px src="https://github.com/user-attachments/assets/55e67db9-0aa4-488d-a25b-32e8fd92044b"> **Head [Eyes]:** Bindi, Glabella, Nose Tape **Head [Cover for mouth area]:** Lip Corner (Left), Lip Corner (Right), Cheek Spot (Left), Cheek Spot (Right), Lips **Head (Side):** Cross Earrings (Left), Cross Earrings (Right) ### 😂 <img height=270px src="https://github.com/user-attachments/assets/4001b95a-60e1-431c-8463-1e2904cf767a"> ### Arachne  **Head:** Left Arachne Eye, Right Arachne Eye, Lips, Neck Cover (Slim Thick) **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Arm:** Left Robotic Arm from Hesphiastos Industries **Left Hand:** Left Robotic Arm from Bishop Cybernetics **Right Arm:** Right Arm Bracelet **Right Hand:** Right Watch (Colorable), Right Nail Polish ## Technical Details I did a quick fix in [MarkingsSet.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fashion-update-markings?expand=1#diff-54373833c74b35579f9b3293d5bb0c17eda0d214c11f27dcb40c334ef8c6b513) to handle a list index out of bounds error where the number of default markings was lower than the maximum allowed markings, like with Onis who have a default horn but can wear 2 earrings. # 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 --> 🆑 Skubman - add: 80+ new markings have arrived, including earrings, makeup, bracelets, and watches. Sashay over to Character Setup to personalize your character like never before! - add: The Arachne species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, gauze, and more! - tweak: The available points for Head (Side), Left Hand, and Right Hand markings have been increased for most species to support the new markings. - tweak: The Nail Polish markings have been moved from the Overlay category to the Left Hand and Right Hand categories. (cherry picked from commit 932f9e31eab9b2c11c4429b7c9c36effc327e733) * Automatic Changelog Update (#1299) (cherry picked from commit b05ab8e0d1e8aa043a60ca96843061f4778136e6) * ♂️ Add Male Arachne (#1301) # Description Adds the ability for Arachne to be male. Also in this I added chest/arm Arachnid markings for Arachne to use. I enabled footstep sounds for Arachne since it doesn't seem that they were intended to have silent footsteps. ## Media <img height=160px src="https://github.com/user-attachments/assets/04e3b066-e75c-4ee7-bfd6-762c2defcaf8"> <img height=160px src="https://github.com/user-attachments/assets/d4582c12-72d8-413f-92e6-145cb90c76c3"> ## Changelog 🆑 Skubman - add: Arachne can now be Male instead of only being Female. They can now also wear Facial Hair. - add: Arachne can use Arachnid chest and arm markings. - fix: Arachne will now have footstep sounds instead of being quiet when moving. (cherry picked from commit 1bab6b8844c679897b3a695b363620589292d783) * Automatic Changelog Update (#1301) (cherry picked from commit 5476ee090bd735d7791b4ae7f1e8aeea674cd55a) * Add Localization for Senior Physician and Senior Engineer (#1302) <!-- 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]? --> Adds localization for the Senior Engineer and Senior Physician roles that were recently enabled. --- # 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 --> n/a --- <!-- 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>   </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 --> 🆑 zelezniciar - fix: Fixed Senior Engineer and Physician names not appearing correctly (cherry picked from commit 4bf762411e866952c0257ce7d255b2610d7a3a21) * Automatic Changelog Update (#1302) (cherry picked from commit 9169818f60ef0cf156bb1b095d66e5e9d0b4575b) * Make Cultist Constructs Speak Eldritch (#1303) # Description Fixes cultist constructs only speaking Universal and not being able to understand anyone else due to a missing `LanguageKnowledgeComponent`. ## Changelog 🆑 Skubman - tweak: Cultist constructs and soul shards now speak Tau-Ceti Basic and Eldritch. Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 8573914e8b6183197abc250d3e8f3c186194b0a6) * Automatic Changelog Update (#1303) (cherry picked from commit 114ecde8384ae3d98350aa80d38b96766dc49cfa) * Fix Lobotomy (#1306) # Description Fixes several bugs in the lobotomy procedure. The lobotomy effect is now stored in the brain instead of the body, so transferring a lobotomized brain will still give the lobotomy effects, and a brain transplant to a body where a lobotomy occurred no longer applies the lobotomy effects. The "Mend brain tissue" procedure to reverse a lobotomy has been unlocked after a bug prevented it from showing in the surgery UI. Lobotomies now add the `ClumsyComponent`, which makes the lobotomized target as clumsy as clowns. ## Technical Details This deletes [SurgeryComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-3786e2be1879fd877a8b501352bbd92baa3a17aecfa4a62827ad41497deb0fd7) which was only used for the lobotomy procedures (incorrectly, it was checking for `OhioAccentComponent` in the body part) in favor of [SurgeryPartComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-7e180742b3a6f00b9f867d3ee4e8891dd00587dc4a2da8ad5e199180a387d18d) and [SurgeryBodyComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-249e5a937ba929ffc76f85e8a43f17918afc9ba866e81f4ea4eba2c90fd0c408). These two components are currently unused as the lobotomy procedures use a new condition component checking for the brain's `OrganComponent.OnAdd` field, but they provide a way to check for components on the body part and on the body, respectively. ## Media **Lobotomy**  **Mend brain tissue**  **Remove organ step picture**  ## 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 --> 🆑 Skubman - add: The lobotomy procedure makes the target clumsy like the clown. This makes them bonk when climbing tables and makes guns they're shooting blow up on their face. - tweak: The lobotomy step now requires a scalpel instead of a drill. - fix: Enabled the "Mend brain tissue" surgical procedure on a lobotomized target. - fix: The lobotomized effect is now stored in the brain instead of the body. The same brain stays lobotomized throughout brain transplants, and transferring a normal brain to a body where a lobotomy occurred no longer applies the lobotomized effect. - fix: The lobotomy procedure now shows the proper popup during the lobotomization step. - fix: Removed the ability to perform lobotomies on bodies without a brain. - fix: The "Remove organ" surgery step on the UI now properly shows the retractor sprite instead of the hemostat. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 1895f3addc871e3ad18845c22c61f422f9807107) * Automatic Changelog Update (#1306) (cherry picked from commit 71c641283a13fc79c68f8ad23fa1397052b7e74b) * You Can Now Drag People Into Deep Friers (#1279) <!-- 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]? --> You can now drag entities like people into deep fryers. Yes, this will cook them. Yes, you can cannibalize your own dead crew. --- # 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 --> - [ ] Add a doafter - [ ] Add a popup warning everyone of what you've done --- <!-- 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> obs is broken part 295 </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 --> 🆑 - add: You can now shove people into deep fryers by drag-dropping them onto it. --------- Signed-off-by: Eris <erisfiregamer1@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 82b2b28f3ee0f534b7f32fe54a70ba58d9ebbe1c) * Automatic Changelog Update (#1279) (cherry picked from commit cbc76ef649396a827a6c3b38b83c4a20f1affc7b) * Revert "Emp Flashlight (#5)" This reverts commit |
||
|
Spatison
|
a2557f75a6 | Upstream (#129) | ||
|
DEATHB4DEFEAT
|
47b10a01b0 |
Catch-Up Cherry Pick 2 (#944)
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml |
||
|
Remuchi
|
24f26f21dd |
[Upstream] Апстрим фич и фиксов с Einstein Engines. (#39)
* Remove the Stupid Station Records Check From News (#739) # Description It was never used but caused annoyance all the time: the listening post could never use the news console and ghosts/centcom officials/skeletons could never publish news because of it. (This was not tested, I recommend either waiting til I test it or making someone else test it before merging) # Changelog 🆑 - fix: You no longer need to have a station record to publish news. Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> * Morale System (Port From White Dream) (#620) # Description This Feature has been graciously provided for Einstein Engines to port from the White Dream codebase. Mood is a system for tracking a character's current Mental State, which fluctuates throughout the round as a result of various events that can modify it. Each consisting of a single line event that can be trivially inserted into any other system, and a yml configured "Moodlet", which is applied to said character. Moodlets can be temporary or permanent, and can also modify a characters mood in either positive or negative directions. Things like, "Being Hungry", "Being Injured", "Petting a cute animal", "Being Hugged", all create a Moodlet. Mood can provide buffs or debuffs, primarily to movement speed. In fact Mood's movement speed modifier actually completely replaces the movement speed modifiers from Hunger & Thirst. Instead Hunger & Thirst create a negative moodlet that persists until you eat and drink, which _can_ give you a speed penalty. But you might for instance diminish the negative effects by seeking out other positive sources. Or they might just get worse, who knows what could happen? # Media Mood takes the form of a series of Moodlets, which modify your character's internal Mood stat. It's kinda like a healthbar, but for your mental state. Whenever you gain a moodlet, it appears in a popup. White text for standard moodlets, red text for negative moodlets. By clicking on your mood icon, text will show up displaying all of your currently active Moodlets. https://github.com/user-attachments/assets/3e9420bb-3a43-4d97-9127-31d704c15287 New traits!  Permission from Codeowners:  # TODO - [x] Refactor the Crit Threshold modification, and Movement Speed Modification to make it more granular. # Changelog 🆑 VMSolidus & Skubman - add: The Mood System has been ported from White Dream. Mood acts as a 3rd healthbar, alongside Health and Stamina, representing your character's current mental state. Having either high or low mood can modify certain physical attributes. - add: Mood modifies your Critical Threshold. Your critical threshold can be increased or decreased depending on how high or low your character's mood is. - add: Mood modifies your Movement Speed. Characters move faster when they have an overall high mood, and move slower when they have a lower mood. - add: Saturnine and Sanguine have been added to the list of Mental traits, both providing innate modifiers to a character's Morale. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: Angelo Fallaria <ba.fallaria@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> # Conflicts: # Content.Server/GameTicking/Rules/TraitorRuleSystem.cs * Automatic Changelog Update (#739) # Conflicts: # Resources/Changelog/Changelog.yml * Automatic Changelog Update (#620) # Conflicts: # Resources/Changelog/Changelog.yml * Psionic Refactor Version 2, Part 1 (#731) # Description Finally, after many long months, and this project surviving a complete restart from square one, I have now made actual, real progress on an actual proper "Refactor" of Psionics. This PR primarily moves ALL of the logic for initializing Psionic Powers into highly configurable YML. The initialization of psionics is no longer handled by components, and is instead now handled entirely by a centralized system. To even further cut down on component bookkeeping, nearly all logic needed for generating Psions has been moved to the PsionicComponent. The PotentialPsionicComponent now no longer exists. Additionally, and although they are not currently implemented(I will do so in the next PR after this), I have also laid the groundwork for substantial reworks to the other aspects of Psionics. Power generation, casting stats, feedback messages, non-action powers, and so on. It's actually possible to now add a psionic power that does not add any active abilities at all, rather by adding one or more components, thus enabling purely Passive Powers. Or a combination of the two, active-powers with a passive component. # Media https://github.com/user-attachments/assets/0fd6b9a4-7d84-4e6e-980a-9d7dd4264f6f # Changelog 🆑 - add: Latent Psychic has been added as a new positive trait. - tweak: Psionics have received a substantial refactor. While no new powers have been added this patch, this initial refactor lays the groundwork so that new psionic powers will be easier to create. - tweak: Latent Psychic is now fully required to become psionic, or to interact with Oracle. - tweak: Psychics can now have more than one active power. - remove: Mimes are no longer Psionic. - tweak: Chaplain, Mantis, & Mystagogue all receive the Latent Psychic trait for free, automatically. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> # Conflicts: # Content.Server/Zombies/ZombieSystem.Transform.cs * Automatic Changelog Update (#731) * Fix Overlays (#756) # Description Overlays have a funny bug where the calls to update them are global. Meaning if any single person gets a bad enough mood to greyscale themselves, everyone globally gets greyscaled. This bug was also present on Dogvision and Ultravision, and had the same cause. Frontier luckily had a fix for those two, and the fix works here as well for the Mood Overlay. # Changelog 🆑 - fix: Fixed an issue where Overlays(Dogvision, Ultravision, Mood) would apply globally to all entities when updating. * Automatic Changelog Update (#756) * Missing Psychic Trait Strings (#758) # Description I accidentally deleted these at some point, so here they are again.  No changelog because I don't want to publicly admit the error. :) --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Action Blacklists (#760) # Description  I noticed that EntityTargetAction prototypes have a Whitelist field, but no Blacklist field. This turned out to be trivial to add, and now it's no longer necessary for Psionic powers to hardcode in C# that they can't affect anyone psionically insulated or Mindbroken. In total only 3 powers had this change, but new powers in the future that affect a target can now arbitrarily blacklist any component(Most likely, PsionicInsulation and Mindbroken. :)) All of this, just to remove 9 total lines of C# hardcoding. # Changelog 🆑 - add: Actions no longer need to hardcode in target blacklists, and can now blacklist entities in YML. This is notably useful for Psionic powers, which all share a common feature that they can't target people with Psionic Insulation (Or have been Mindbroken). * Automatic Changelog Update (#760) * Psionic Powers Add Components With Arguments. (#763) # Description While coding another Psionic Power feature, I discovered that the current implementation of iterating over components does not carry over arguments for the components. So I copied over the method used by Traits exactly-as-is, and just changed the names of the variables to accommodate the PsionicSystem. # Changelog 🆑 - add: PsionicPowers that add a Component now also allow for adding a Component with Arguments. This works exactly like the trait system's implementation of components. * Automatic Changelog Update (#763) * DeltaV/DS14 IPC Port (#744) <!-- 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]? --> Ported over IPC from DS14, with the fixes from DeltaV. --- # 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 - [ ] Check for errors (Local tests wouldn't run on this one) --- <!-- 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> </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 --> 🆑 - add: Added IPC as a playable species. --------- Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Daniela <43686351+Day-OS@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#744) * Update MoodSystem.cs (#761) # Description MoodSystem was lacking a Component Shutdown to yeet the alert, so it was causing intermittent test fails. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Traits Refactor (#765) # Description I decided traits weren't flexible enough, so I refactored them to also optionally add Actions(Activatable Abilities), and PsionicPowers(Going through the PsionicAbilitiesSystem). Neither of these have any current implementations, I'll leave that to other people. Trait Components are by extension no longer a hard requirement, although if you add a blank trait that adds nothing, you have only yourself to blame. But doing so won't crash the game or throw an error anyway. # Changelog 🆑 - add: Traits can now add Active Abilities to a character. - add: Traits can now add Psionic Powers to a character. * Automatic Changelog Update (#765) * Made Stamres Show in Resistances View Take 2 (#767) <!-- 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 title for some reason something went horribly wrong [here](https://github.com/Simple-Station/Einstein-Engines/pull/766) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog no cl no fun --------- Co-authored-by: whateverusername0 <whateveremail> * Minor Ifrit Health Rework (#762) # Description Closes #754 Ifrit is a fire spirit, he really shouldn't be taking 1.5x fire damage. This makes sense and should help with players accidentally killing themselves with the fire ball. For balance, the cold damage modifier was changed to 0.5x, unsure if it should be lower. Minor passive regeneration has also been added, since there isn't another way to heal other than the Mystagogue sitting there hitting them with the book of mysteries. # Changelog 🆑 - tweak: Ifrit has received some damage resistance changes --------- Signed-off-by: stellar-novas <stellar_novas@riseup.net> Co-authored-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#762) * Xenoglossy (#772) <!-- 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 Adds xenoglossy to the power pool. I originally planned it for cataloguer but it looks like that doesn't exist anymore. <!-- 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 --> # 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 --> 🆑 Rane - add: Added Xenoglossy to the psionic power pool. --------- Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#772) * Increase Trait Point Granularity (#775) # Description Since we now have a LOT of Traits, and soon to be another fresh batch of Traits coming in now that they've been refactored to offer even more options, it's come up that Traits are kinda hard to balance with the current combination of point costs and allotted starting points. To help alleviate this problem, I've both doubled the point values of every trait in the game, as well as doubled the default allotted starting points. There is now more room to balance trait costs against each other. I have not however actually made use of the new range of point costs yet, and would like to consult with other contributors and maintainers on which traits need to be adjusted. # TODO - [ ] Go over trait point costs again to address balance. - [ ] Do this again in 6 months when we have 200 traits. # Changelog 🆑 - tweak: Trait points have been made more granular by both doubling the available number of trait points, and increasing the base cost of all pre-existing traits. * Automatic Changelog Update (#775) * Fix Heisentests (#778) # Description Attempt number 5000 to get the Heisentests to STOP. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Fix RGB Moths (#777) # Description Magic single line Yml Fix obtained by digging through DeltaV's Blame **GO!** # Changelog 🆑 - tweak: Moths can now be colorful again. * Automatic Changelog Update (#777) * Remove DV AGPL License Headers (#781) # Description They're confusing. Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> * Return Of The Cataloguer (#779) # Description Cataloguer has returned to Epistemics as the newest 4th member of the "Crew Aligned Wizards Club". The Cataloguer is a variation on the Librarian role, which automatically starts with the new Xenoglossy Psionic Power, which allows him to know and speak all languages. Additionally, the Cataloguer is now once again a member of Epistemics instead of Civilian, and has had Epi added to his access. On all maps that previously did not have a Librarian spawner, one Scientist spawner has been replaced with a Cataloguer. # Changelog 🆑 - add: Cataloguer has been re-added to the game as a new roundstart Psionic role. The Cataloguer is a unique role that will always start with the Latent Psychic trait, as well as the new Xenoglossy power, which allows him to know and speak all languages. * Automatic Changelog Update (#779) * Psionic Power Feedback Messages (#776) # Description This PR implements the previously planned feature whereby obtaining a Psionic Power plays some form of notification to alert the player that they have gained a new ability. Since some Psionics like Xenoglossy are purely passive, it's very important to give an indication to players what's going on. To that end, PsionicPowerPrototype has been expanded to include new datafields related to Initialization Feedback. There are now three kinds of feedback messages: Popup, Feedback, and Metapsionic. All feedback will only play for powers obtained during the round, rather than for entities that innately start with powers. - Popups will appear over your character's head as a small, brief message. These should be no more than a sentence at most. - Feedback will appear in the Chat window as a message only visible to the Psion themself. These can be as much as a paragraph in length. - Metapsionic messages are coming in their own separate PR: https://github.com/Simple-Station/Einstein-Engines/pull/774 In a separate PR, I also wish to add Audio feedback as well. # Media I apologize that the video has been bitcrunched to a point that the chat window can't be read. https://github.com/user-attachments/assets/11e30e91-8fc6-48a2-b6a5-9ecf7127065e # Changelog 🆑 - add: Gaining a new Psionic Power can now display messages to alert the player, both as a short popup, and optionally a lengthier message sent to the user's Chat window. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> * Automatic Changelog Update (#776) * Allow Playing Multiple Announcement Sounds at Once (#740) # Description @VMSolidus said he had issues with SuperMatter announcements not playing correctly. --- <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/e0cbbe77-00ce-4c9e-837a-00c91fee8623 </p> </details> --- # Changelog 🆑 - fix: Announcements can play multiple sounds now (you can revert to the old behavior in sound setting if you want though) * Automatic Changelog Update (#740) * Add Insulation to Robots (#773) # Description Soulless Robots didn't have PsionicInsulation, which meant they were eligible targets for powers such as Mindswap. This is a pretty simple fix. # Changelog 🆑 - fix: Robots and other mechanical creatures are now correctly immune to non-physical psionic powers. * Implement Mind Contests (#757) # Description Now that the initial Psionic Refactor is out of the way, this is my first new standalone Psionics PR, filling in the MindContest function that was added over a month ago(but was set to always return 1f as a placeholder). Mind Contests are unique among the Contests System in that they do not treat the lack of a Psionic Component as a failure condition, and instead as a variable. No changelog because MindContests are not currently used anywhere, all I'm doing is adding the actual function logic. * Added Language and Healing Components to IPC Entities (#786) # Description This pull request introduces two new components to the IPC entities: 1. **LanguageKnowledge**: This component allows IPCs to speak and understand Galactic Common and RobotTalk. Previously, IPCs were limited to Universal language, which caused communication issues with the crew. With this addition, IPCs can now effectively communicate using the Galactic Common and RobotTalk languages. 2. **WeldingHealable**: This component enables IPCs to heal themselves using a welding tool. Given the nature of IPCs as robotic entities, this feature is essential for self-maintenance and ensures they can stay operational even after sustaining damage. These changes aim to improve the functionality and immersion of IPCs within the game, allowing them to better integrate and interact with other entities while also providing them with the ability to self-repair. --- # TODO - [x] Add `LanguageKnowledge` component to IPC entities to support Galactic Common and RobotTalk. - [x] Add `WeldingHealable` component to IPC entities for self-repair with welding tools. # Changelog 🆑 - add: Added the ability for IPCs to speak and understand Galactic Common and RobotTalk languages. - add: Enabled IPCs to heal themselves using welding tools via the WeldingHealable component. Signed-off-by: v0idRift <163446847+v0idRift@users.noreply.github.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#786) * Fix supermatter.ftl (#790) supermatter .ftl was broken, this fixes it. <!-- 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]? --> Easly fix the supermatter .ftl files that was not set correctly, why? i dunno. now its works. --- # 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 --> 🆑 - fix: Supermatter Annoncements Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> * Automatic Changelog Update (#790) * Fix Door Access (#798) # Description Somehow all the doors accesses broke. Seems somebody used the AccessReader Component on the door instead of the door electronics. This PR fixes all the doors that I could find that were broken. # Changelog 🆑 - fix: Fixed most door accesses including: Lawyer, Mantis, Corpsman, Boxer, Clown, Mime, Musician, Reporter, Library, Zookeeper, Salvage and Psychologist. * Automatic Changelog Update (#798) * Cherry-Pick PR #27113 (#803) # Description This is a cherry-pick of https://github.com/space-wizards/space-station-14/pull/27113 Which fixes a bug that has been reported here where the FixGridAtmos command does not work. # Changelog 🆑 - fix: Fixed the FixGridAtmos command. Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> * Automatic Changelog Update (#803) * Return Of The Pibble (#789) # Description This PR Rebases one of Nyanotrasen's funniest features: The Pibble. I mean "Lab Mix", according to the description. Lab Mixes are comically muscular dogs famous for their ability to attack and destroy Felinids, Mailmen, and more recently Harpies. Watch out, there is also a rare variant of Lab-Dachshund Mix, colloquially known as the "Ventbull", which can occasionally be found roaming the station's vents. Please keep your children, Felinids, and Birbs at a safe distance. # Changelog 🆑 - add: Lab Mixes have been added to the game as a new random animal. Be sure to keep Felinids and Harpies away from them. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#789) * Make IPC Sounds Great Again (#811) # Description This PR brings back Ekrixi IPC sounds, and rebases IPC sounds on top of silicons. Duplicate of #810 [due to](# "Due to your attempt to evade your ban, you are banned indefinitely. You may appeal your ban, but only at least 6 months after your last ban evasion attempt, and only with a voucher of good behavior from another SS13/SS14 server.") `master` branch skill issues. <details open><summary><h2>Media</h2></summary> None </details> --- # Changelog 🆑 router - add: Added more sounds to IPCs. IPCs can now also whistle, whirr, beep, boop, ping, chime, buzz and buzz twice. - fix: IPCs no longer have the default wilhelm sound. - tweak: Silicon deathgasps are now darker. * Automatic Changelog Update (#811) * Add IPC's Missing Components (#793) # Description IPCs were missing Offer Item, Laying Down, and Carriable. # Changelog 🆑 - fix: IPCs can now lay down, offer people items, and be picked up and carried. * Automatic Changelog Update (#793) * Temporarily Disable Telegnosis (#795) # Description Telegnosis is broken, and so I'm temporarily disabling it. # Changelog 🆑 - fix: Temporarily disabled Telegnosis pending a lengthier update. * Automatic Changelog Update (#795) * IPC Missing Deathgasp (#800) # Description IPC were missing a deathgasp, so I wrote one for them.  # Changelog 🆑 - fix: IPC now have their own unique deathgasp message. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#800) * Make Shoving and Stamina Great Again (#809) # Description First off, shoving was broken badly. It would roll shoving chance twice, meaning that you had only about 6% chance to actually shove someone, and it would only remove 6% of their stamina. Additionally, stamcrits have always pissed me off by just how stupid they were. Also, some of the code in the stamina system had highly misleading names, which has led vmsolidus to implement mass contests the wrong way there. This PR introduces changes to fix those issues: - Shoving only rolls the shove chance once. - Shoving deals 50 * shove chance stamina damage, as intended, without depending on target's stamcrit threshold. In the future it should depend on the weapon used (claws, fists, etc), but for now it's fine. - Shoving advantage ranges were re-evaluated. Mass difference now can give 0.5x-2x advantage, and health difference can give 0.75x - 1.25x. Stamina difference still gives a neglectable 0.9x - 1.1x advantage. - The stamina slowdown is now added and calculated dynamically using MovementSpeedModifierSystem, which means the slowdown will no longer disappear 3 seconds after receiving damage, and will not stack (however, it now scales with stamina damage). - When you exit stamcrit, you start at (100 - epsilon) stamina damage. There still exists another check that prevents you from getting re-stunned in the next ~5 seconds (maybe we should remove that too?), but the slowdown and combat disadvantages will apply as they are supposed to. This means you can no longer stand up after being exhausted to the point of fainting on the ground and immediately rush back into combat. In addition to that, I also did the following: - Re-added the mass contest to EscapeInventorySystem. It seems like it's been nuked when the new mass contest system was being implemented and never added back. - Fixed the mass contest in carrying again <!-- 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> https://github.com/user-attachments/assets/076b3c3b-cdd1-4ec7-969d-2564c814a40e </p> </details> --- # Changelog 🆑 - fix: Shoving once again works correctly, and mass difference matters a lot when shoving someone. - fix: The time it takes to escape one's hands once again depends on the mass difference between the escapee and the holder. - tweak: Exiting stamina crit now leaves you with 0 stamina. You can't be immediately stunned again, but you will suffer from slowdown and combat disadvantages! * Automatic Changelog Update (#809) * Thieves Outside of Traitor (#799) # Description Mirroring a PR from Floof that I was much too lazy to cherry-pick. This just changes gamemodes outside of tator and rev to allow thieves if it makes sense to. --- # Changelog 🆑 - tweak: Thieves are now in Survival, Hellshift, and Extended. Signed-off-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> * Automatic Changelog Update (#799) * Telepathy (Minor)Refactor (#819) # Description This PR re-introduces a feature that was present in the Psionic Refactor version 1, that of the Natural Telepath trait. Where before Natural Telepath was treated as an "Upgraded" version of Latent Psychic, now it is a standalone trait that makes use of new functionality, where traits can add psionic powers directly, as opposed to relying on just adding components. To accomodate for this, the Telepathy functionality has been modified such that it no longer makes the expectation that PsionicComponent users have the ability to coherently speak telepathically, and instead checks for a specific TelepathyComponent. Since Telepathy is added to a Psion via their ActivePowers list, it is also eliminated when the Psion is mindbroken. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: TelepathyComponent has been split off from the PsionicComponent, now as it's own standalone feature. - add: Telepathy has been added as a new Psionic Power - add: Natural Telepath has returned from Psionic-Refactor V1, now using new functionality from the trait system that allows traits to buy psionic powers directly. - add: Latent Psychics who have neither bought Natural Telepath, nor acquired Telepathy during the round, can sometimes hear snippets of conversation from telepathic chat. - tweak: The cost of Latent Psychic has been reduced from 6 to 4 points, this is to accommodate for the loss of Telepathy as a bonus feature for all Psionics. Since Natural Telepath is a 2 point trait, this gives a net 0 change in trait points for anyone who wishes to keep being a roundstart Telepath. - tweak: Psionic Mantis, Mystagogue, Chaplain, and Cataloguer are all Naturally Telepathic, and thus get the new trait for free. * Automatic Changelog Update (#819) * Psionic Insulation Trait (#820) # Description This PR brings back the x-Waveform Misalignment trait from Psionic Refactor version 1. There's not really much to say here. Having this trait means that you are completely immune to most psionic powers and effects, with the only exception of the physical effects of Elementalist abilities. It is also an extraordinarily expensive trait, the most expensive in the game by far. This trait will get even more useful when Cultists, Wizards, and Heretics are brought into the game. # Changelog 🆑 - add: x-Waveform Misalignment has been rebased from the Psionic Refactor v1. x-Waveform Misalignment is an extraordinarily expensive trait that grants full immunity to nearly all psionic powers and effects, both positive and negative. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#820) * New Interaction System (#733) # Description This implements the New Interaction Verb System™©, designed to allow defining verbs using yml and make adding new verbs way easier than it was before. This was initially designed just to bring back generic no-op interactions like hugging, but can now be used to create way more unique interactions for all the different entities. In the core of the system lies InteractionVerbPrototype. Besides defining the obvious qualities of the verb itself, such as the name, description, interaction constraints, it also has several important properties: - The requirement of the verb - what is required for the verb to show up as "enabled" in the context menu and be allowed to be performed. There's just one requirement slot, but using the ComplexRequirement class you can use multiple requirements and choose whether they are combined via boolean or, boolean and, or something in-between. - The action of the verb - it defines its own IsAllowed (whether the action is applicable to the target entity at all), CanPerform (called before and after the potential do-after), which defines whether this exact attempt at performing the action succeeds and shows a success popup, or fails and shows a fail popup, and finally Perform, which tries to perform the action and return a boolean result, which determines... well, what was stated before. Similarly to requirements, there are complex and conditional actions which can be combined into whatever monstrousity you can imagine... In fact, it is entirely possible to build a turing-complete programming language out of actions! - Effects, specifically three of them: one that is shown when the interaction performs successfully, one that is shown when it fails, and one that is shown when the do-after for the interaction begins succesfully (which means the first CanPerform check of the verb has succeeded). Each one of them defines a popup (configuration for which is stored in a different prototype) and a sound. Those are also designed to be highly customizable: you can choose who sees the popup and where, and more. Verbs can be global or local. Global verbs are added to any entity should it meet the prerequisites and pass all the necessary checks (which are also designed to be highly configurable). Local verbs are defined in OwnInteractionVerbsComponent and InteractionVerbsComponent of the user and target respectfully. At the moment of writing there are 8 built-in global verbs and 1 non-global verb, not including abstract verbs: - 3 no-op actions that are made for RP purposes, that is looking at someone, hugging someone, petting someone. The latter two may be later used to modify the target's morale should the PR for it be merged. - 2 actions related to standing: one for forcing someone down, and one for helping them get up, waking them up and removing 2.5 seconds of stun in addition to that (before you could click someone with empty hand to remove 1.5 seconds of stun - I removed that in favor of the new system) - 1 action for making someone who's laying down (on the bed or otherwise) to sleep. - 1 actions for falling asleep yourself (no need for bed or bag or whatever to tell you that you can sleep - this does not provide any healing properties or anything like that, purely an RP feature). - 1 action for pinching yourself - made simply with the intent of testing some possibilities of the new system, I decided to keep it because it's a bit funny. Local actions include: - An action for knocking on windows, doors, windoors, computers, machines. More are to be added to this list as the progress continues. # TODO - [X] Implement the core of the system - ~~Add more, way more actions. Possible ideas include: [slapping/kicking someone, hugging toys/plushies, pressing random buttons on a computer, ... ]. I could use some ideas for that.~~ - skipping for now, we can do it in follow-up prs to clutter this one less. - [X] Port all InteractionPopupComponents to the new system, and remove their old usages from non-animals. - [X] Introduce contests and a way to configure them (could reuse RangeSpecifier for that; certain actions such as pushing down/helping up would benefit a lot from this). - [X] Hide chat logs for people who cannot see the action being performed. - [X] Implement cooldowns - [ ] Cleanup. <details><summary><h1>Media</h1></summary> <p> Note: this video was made before a few important fixes were made. https://github.com/user-attachments/assets/17b616dd-4bc8-4af3-916c-6a5d16c77064 Newer video - demonstrates various actions and shows that chat logs cannot be seen if the source of the logged popup is outside the view. https://github.com/user-attachments/assets/d6228855-fb7f-45d1-812f-56afe10f3f86 </p> </details> --- # Changelog 🆑 - add: A new interaction system has been implemented. The right-click menu now provides a wide variety of different interactions with different entities. Some old default interactions, such as hugging, knocking, fence rattling, have also been moved to that system. --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> * Automatic Changelog Update (#733) * feat: translation for new interaction system * fix: fix interaction system changing state action to ours * Glacier Real (#1169) (#728) * glacier real * troll * atmosia tweaks * 1 less can of plasma not too op * replace troll generator with solar crate * add StationSurface to glacier * add surface map * biome stuff upstream #28017 * unpause after loading * fix no terrain * comment out the surface spawning * shipyard * glacier justiceroid * updateprototype and cleanup * fix random shit * untroll * courier * add to test :trollface: * fix * futureproofing * hot loop inlet lmao * tweak some pumps in atmosia * carpy and make salv locker lighting better * Edit lights, move salv dock, add justice maints, edit entity names for casing consistency, other minor edits --------- <!-- 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 Ports Glacier from DeltaV. Justice department has been yeeted. # Changelog 🆑 - add: Glacier Returns. --------- Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> * Automatic Changelog Update (#728) # Conflicts: # Resources/Changelog/Changelog.yml * Rebase Saltern (#804) # Description Saltern, now featuring a full Epistemics department, and a Supermatter engine. :) <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: Saltern has been added to the map rotation. Now featuring a compact Supermatter engine, full Epistemics department, and a significantly expanded Chapel and Library. * Automatic Changelog Update (#804) * Core Supermatter (#792) # Description **Walks into a room** **Slaps down CORE, but with Supermatter** **Doesn't elaborate** **Leaves** <!-- 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>   </p> </details> # Changelog 🆑 - add: Core has been added to the list of maps in rotation. This time featuring a custom Supermatter Engine * Automatic Changelog Update (#792) * Fix InnatePsionicPowers For Mapped Entities (#824) # Description InnatePsionicPowers needed to be moved from ComponentStartup to MapInitEvent, which is a deceptively named event that ALSO functions identically in use to ComponentStartup, except that it's safe to use for entities that are mapped in, in addition to joining the round or being spawned in. Whereas ComponentStartup isn't allowed to modify or add components for any entity that is mapped(which includes Spawners apparently). This change allows for entities like Oracle and Sophia to make use of InnatePsionicPowers, which is done by request from Rane, who for mysterious reasons wishes for the two divine statues to be both Prayable, and have the Noospheric Zap Power. I have also verified by ingame testing that this does infact apply to people who join after the map is initialized, as well as things pre-existing on the map. So Oracle still gets her powers, while a latejoining Mystagogue still gets his. # Changelog 🆑 - fix: InnatePsionicPowers now operates on MapInitEvent instead of ComponentStartup, meaning that it can now be safely used on entities that are mapped in instead of spawned. - add: Oracle and Sophia are now recognized as Divine, and as such are creatures that can be prayed to. * Automatic Changelog Update (#824) * Update Credits (#837) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> * Disable Mood In Debug (#806) # Description MoodSystem has a Race Condition against DeleteAllThenGhost. # TODO - [ ] Run the tests 10 times in a row to see if DeleteAllThenGhost will appear. * Diagonal Window Smoothing (#805) # Description Diagonal windows weren't updated to use the new smoothing when we added a bunch of new sprites designed around connected textures. This PR fixes that for all diagonal windows.  # Changelog 🆑 - add: Diagonal windows now use connected textures. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#805) * Maximize Default Description Limits (#788) # Description The current in game UI can reasonably support names up to 48 characters in length, as well as descriptions up to 1024 characters long. Any longer, and the UI requires a scroll bar. This change is present on Cosmatic Drift, which uses the same character UI we currently have. I've had many people requesting this change, and while I am aware that we wish to at some point update to a new character UI(such as Parkstation's UI), but a stopgap here is still nice, and it's just two Const variables. # Media  # Changelog 🆑 - tweak: Character names can now be up to 48 characters in length. - tweak: Character descriptions can now be up to 1024 characters in length. This is the maximum size descriptions can be without the menu having a scroll bar. And while we'd like it to be bigger, we're going to want to get a new UI for this in the future! * Automatic Changelog Update (#788) * Bot for Changelog (#833) 🆑 - add: Changelogs should be shown in Discord now --------- Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: TAZIKLIK <73418250+TAZIKLIK@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Update actions_changelogs_since_last_run.py (#841) Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Added Jukebox (#26736) (#802) <!-- --> # Description <!-- --> Adds super cool super nice Jukebox to the bar! Ran off .ogg files, can use any royalty free song. --- <!-- --> <details><summary><h1>Media</h1></summary> <p> ![Example Media on]  </details> --- # Changelog <!-- --> 🆑 Kacey, Nova - add: Added Jukebox with basic songs. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: iNVERTED <alextjorgensen@gmail.com> Co-authored-by: DJBIGYAPPA420 <antoniobryandiii@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#802) # Conflicts: # Resources/Changelog/Changelog.yml * remove: wrong changelog * remove: wrong changelog * fix: a few more incorrect translations * Psionic Extraplanar Creatures (#829) # Description Certain things in the game were intended to be classed as Psionic(And mostly without powers), but were apparently lacking the components. To clarify, ANYTHING that comes from an alternate layer of reality, alternative plane of existence, extra dimensions, other universes, bluespace, etc, is intended to have a PsionicComponent to abstract represent their nature as a magical being of some variety. The importance of this is largely related to the use of Metapsionics to detect them, but also for the valid target lists for Anti-Psychic abilities, such as the bonus damage from the Anti-Psychic Knife. While here, I've also added the "Loto Oil Slime" from Psionic Refactor Version 1, now that Reagent Slimes(as Extraplanar creatures brought to this world by Liquid Anomalies) have a PsionicComponent. needs https://github.com/Simple-Station/Einstein-Engines/pull/824 # Changelog 🆑 - add: Revenants, Reagent Slimes, and Ore Crabs are now considered to be Psionic(But cannot gain powers randomly). This is due to their status as "Magical And/Or Extraplanar Creatures", which makes them valid targets for anti-psychic abilities such as the Psionic Mantis' Anti-Psychic Knife. - add: Some Reagent Slimes can now contain Lotophagoi Oil. * Automatic Changelog Update (#829) * Cloning Refactor (#735) # Description Since Cloning code is effectively abandonware by it's original codeowners, and I was the last person in this entire game to update it, I am technically the codeowner of Cloning. And by extension, it's also my responsibility to maintain the Cloning code. I've been putting this off for awhile due to how busy I've been with other projects, but since I'm now waiting on all my other refactors to be reviewed, I decided to finally sit down and comprehensively refactor Cloning. In addition to massive substantial code cleanup(Cloning machines no longer run on Frametime for one!), here's most of the changes. - Cloning Pods must be powered for the entire 30 second duration of the cloning process. - Said "30 second duration" is no longer hardcoded. Although no methods currently exist to reduce it. I plan on revisiting this after I bring back Machine Upgrading. - Cloning can now FAIL partway through. If the cloning pod is Depowered, Unanchored, or Emagged, it will automatically swap to the "Gore" state. - When in a Gore state, Cloning Pods will destroy the entity they were trying to clone, replacing them with a pool of blood and ammonia that scales with the mass of the entity that was to be cloned! - Clones come out of the pod with a significant quantity of Cellular damage, and are almost always in need of resuscitation. Consider using Cryogenics to "Finish" your clones. Doxarubixadone is literally named after this process, and is a perfectly suitable cryo chem for resuscitating clones. <details><summary><h1>Media</h1></summary> <p> New gore sprites for the Metem machine, because it can now have gore mode.  </p> </details> # Changelog 🆑 - add: Cloning & Metempsychosis Machines have been refactored! - add: Cloning can now fail at any point during the cloning process, turning the would-be clone into a soup of blood and ammonia. - add: "Clone Soup" scales directly with the mass of the entity you're attempting to clone. Fail to clone a Lamia, and you'll be greeted with an Olympic swimming pool worth of blood when the machine opens. - add: Cloning will fail if at any point during the procedure, the machine is depowered, unanchored, or emagged. - add: Clones come out of the machine with severe Cellular damage. Consider using Doxarubixadone in a Cryo tube as an affordable means of "Finishing" clones. - tweak: Cloning Time is now increased proportionally if an entity being cloned is larger than a standard human(smaller entities are unchanged) - tweak: The cost to clone an entity can now be configured on a per-server basis via CCVar "cloning.biomass_cost_multiplier" - tweak: The Biomass Reclaimer can now be toggled to round-remove ensouled bodies or not via CCVar "cloning.reclaim_souled_bodies" - add: The effects of Metempsychosis now scale with a Psion's relevant caster stats. More powerful psychics are more likely to get favorable results from being forcibly reincarnated. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#735) * Delete All Then Ghost Fault Tolerance (#787) # Description  I'm putting this here as an option to deal with our Heisentest problems, by making the tests "Fault-Tolerant" wherever practical, but I don't want this merged without Death and Psprite agreeing to this. For the most part I believe that these tests are failing because they are essentially checking that "Random events are not creating entities", by creating their own enforced Race Conditions. This particular test is repeatedly failing because the Mood System has no way of deducing that it's in a test. Even though the alleged issue is a nothingburger.  Tests absolutely shouldn't have been designed around race conditions. # Changelog No changelog because this isn't playerfacing. * Update Issue Templates (#797) # 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]? --> Rewrites the issue templates and removes the redundant security vulnerability issue Also, sorry Death, titles are now sentence case to maintain consistency with the auto generated security policy one Blame GitHub not me </3 --- <!-- 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> Here's the old one, can't make issues on a fork so I can't show how it looks now.  </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 --> N/A Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> * Add PR URL to Changelogs and Make Author a Header (#843) 🆑 - add: New changelogs should now show links to their PRs - tweak: Changelog authors should now be a header instead of bold text - fix: Changelogs shouldn't send random amounts of old changelogs --------- Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#843) * Update actions_changelogs_since_last_run.py (#846) string didn't become int 🆑 - fix: oatnsdaoersoaetaroeoertnsirlea Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Psychognomy (#808) <!-- 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 Psychognomy is a passive power that gives you a descriptor on the origin of a telepathic message. There's enough of them that are ambiguous enough. I also changed Oracle and Sophia a little bit, giving them innate psionic powers. 🆑 Rane - add: Added Psychognomy. - tweak: Reverted Sophia name change. - tweak: Minor tweaks to psionic chat eligibility and formatting. - add: Some new utility has been added to player-controlled Oracle or Sophia. NPC functionality later :^) --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#808) # Conflicts: # Resources/Changelog/Changelog.yml --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Signed-off-by: stellar-novas <stellar_novas@riseup.net> Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: v0idRift <163446847+v0idRift@users.noreply.github.com> Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Signed-off-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Co-authored-by: Daniela <43686351+Day-OS@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: stellar-novas <stellar_novas@riseup.net> Co-authored-by: Rane <60792108+Elijahrane@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: v0idRift <163446847+v0idRift@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: Fansana <116083121+Fansana@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: router <messagebus@vk.com> Co-authored-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Co-authored-by: TAZIKLIK <73418250+TAZIKLIK@users.noreply.github.com> Co-authored-by: DJB1gYAPPA <whyeven42@gmail.com> Co-authored-by: iNVERTED <alextjorgensen@gmail.com> Co-authored-by: DJBIGYAPPA420 <antoniobryandiii@gmail.com> Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> |
