mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +03:00
c8c8bb7a363288f6191e1e02a879f7c1938e897c
341 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Spatison
|
3183a7afe7 |
Battle ship 2 (#1080)
* fix * fix replay * fix label |
||
|
Spatison
|
698c6a1079 |
Merge pull request #1076 from Spatison/battle-ship
Battle ship |
||
|
Nemanja
|
3598317469 |
fix and buff the handheld mass scanner (#31284)
(cherry picked from commit 65c0b699f283d848c94fd26eb7a061643e749109) |
||
|
Spatison
|
a24a3fc46f | Up shuttle speed from 20 to 60 (#1052) | ||
|
Gersoon
|
b785d17562 |
Map update and fix (#1010)
* base * +battleships * finish * 1 * Apply suggestions from code review --------- Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> |
||
|
ScarKy0
|
674d10c9f1 |
Cargo Mail System (#35429)
* shitcode init * biocoding, SpawnTableOnUse, Moving shit to shared * server :( * fixes * ok works * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * Discard changes to Content.Shared/Forensics/Components/FingerprintMaskComponent.cs * Discard changes to Content.Shared/Forensics/Components/FingerprintComponent.cs * Discard changes to Content.Server/Forensics/Systems/ForensicsSystem.cs * Discard changes to Content.Server/StationRecords/Systems/StationRecordsSystem.cs * Discard changes to Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * big stuff * preperation * temperory spawning thing for testing * Update CargoDeliveryDataComponent.cs * kinda proper spawning idk god save me * cleanup (kinda) * preparation 2.0 * stuff i think * entity table work * renames * spawn ratio based on players * comment * letter tables * more spam * package tables * comment * biocodedn't * builds correctly * cleaning * Update deliveries_tables.yml * labels * package sprites * mail teleporter * revert testing value * fix test * fix other test * i love tests * mail teleporter enabled by default * random cooldowns * fixtures * Discard changes to Content.Shared/FingerprintReader/FingerprintReaderComponent.cs * Discard changes to Content.Shared/FingerprintReader/FingerprintReaderSystem.cs * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * Discard changes to Resources/Locale/en-US/fingerprint-reader/fingerprint-reader.ftl * clean * fuck paper scrap * oops * fuck SpawnTableOnUse * mail teleporter board in QM locker + addressed review * oops * clean * sound on delivery spawn * address review * partial review address * partial review addressing * addressing partial review * pratarial revivew address * misprediction hell * stuff * more stuff * unrelated * TODO * link * partial review * DirtyField --------- Co-authored-by: Milon <milonpl.git@proton.me> (cherry picked from commit 3281f408eb58c91ceb7b72ea556ba29e4760b9a1) |
||
|
Tayrtahn
|
7f3b436dc1 |
Fix prototypes so they pass analyzer checks (#35435)
(cherry picked from commit 6f925dd61083a3fd377e5d12549ac908985e855f) |
||
|
Gersoon
|
043624e28a |
VelikoFixVelikoFixaVelikoFixa (#738)
* VelikoFixHZChego * VelikoFixVelikoFixaVelikoFixa * +meta |
||
|
Spatison
|
0f88cb6f4f |
Upstream 12.07-23.07 (#695)
* Make All Jetpacks Go on Suit Storage + Combat First Aid Kit Easier to Find (#2501) make all jetpacks go on suit storage aswell Signed-off-by: Ghost581 <85649313+Ghost581X@users.noreply.github.com> (cherry picked from commit f3e58032028de79a9ede1171ec27b7b0dec6f087) make combat FAK easier to find Signed-off-by: Ghost581 <85649313+Ghost581X@users.noreply.github.com> (cherry picked from commit d989dd1edb40837037e6eded435b66c0764bf1b3) * Automatic Changelog Update (#2501) (cherry picked from commit 3179e7d346aadf0735a1262d99db5c84373b4a14) * Automatic Changelog Update (#2492) (cherry picked from commit e113f7e9eb8d5b39b3457b9aee93e2a97505e2af) * PDA Passport Slots (#2499) # Description By request from Ghost581 on behalf of Hullrot. I'll let the image speak for itself. Your passport won't automatically spawn in the PDA, but to be honest it's a space station 13 tradition that the ID shouldn't spawn there either, so I don't wanna hear any complaints about it lol.  # Changelog 🆑 - add: Added a PDA slot for storing your character's passport. Signed-off-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 016768d5e66b012d17c830c12b75e1cc18f6215a) * Automatic Changelog Update (#2499) (cherry picked from commit 9d5ddc78a360a4418f97c472fe55228338947683) * Fix Traits Anticheat (#2502) # Description Traits Anticheat was not accounting for traits having variable slot occupancy, and was treating the "0 slot traits" as if they always had a slot cost of 1. This PR corrects this by making it count the actual slot costs of traits for the purpose of checking for illegal totals. # Changelog 🆑 - fix: Fixed a bug with Traits Anticheat incorrectly triggering if the player had selected enough 0 slot traits. (cherry picked from commit 13eb1351b81f16fe26dc3fa14c9b05a8da600a31) * Automatic Changelog Update (#2502) (cherry picked from commit 3620f0ae93dae51ca425ef51802273270993ccae) * Update Credits (#2504) Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> (cherry picked from commit d1611704b5e69e66997e62d728e8a07c61a101b4) * Fix SpaceWindv5 Wall Smoothing (#2506) Update AtmosphereSystem.MAS.cs (cherry picked from commit b4c3450331e4f2b8f4f5aabb6761d6ad13ad369f) * Automatic Changelog Update (#2506) (cherry picked from commit b3b26a48554cb528f5f4eb43cffafd8dd2dcbdb4) * Fix Wizden's Division By Zero Error (#2507) Update GunComponent.cs (cherry picked from commit f36d91391b5c5a18c2f95da0ff3c2f1ea52b6914) * Disable Contraband Examine (#2511) Who fucking added this? (cherry picked from commit ce2a85ccc1ca1d146f3ed627c4483d8b3db34d90) * fix: emergency shuttle docked announcement (cherry picked from commit 559b37d747e14698c2e4fcf4359f45dee0ad8aea) * fix: non-functioning mining shuttle (cherry picked from commit 4fc049036a1a8c6839d9bfc8c35f6a8374d79059) * Disable shadows for observer pointlight (#36897) no shadows (cherry picked from commit b3b6d4731078950d3e3a8b1558ec0ab7d6cbbcb1) (cherry picked from commit 470ded5b22e7a1a8d4296ba210cd05f5c217f138) * Fix observer pointlights being broken (#37335) (cherry picked from commit dfc8934782045106b07ccf1de6ee4e66d4aa4cb2) (cherry picked from commit 11e0ed317b662f80ca7e4a754e183b18cde3506b) * Automatic Changelog Update (#2512) (cherry picked from commit 0cc861ac096ad5005f36528b7c02c8e612f5df37) --------- Signed-off-by: Ghost581 <85649313+Ghost581X@users.noreply.github.com> Co-authored-by: Ghost581 <85649313+Ghost581X@users.noreply.github.com> Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> |
||
|
Spatison
|
9854f225cf | fix upstream: part 1 | ||
|
ElectroJr
|
ad6b81233d | Refactor map loading & saving (#34020) | ||
|
MilenVolf
|
8643496b9a |
Localize planet dataset names (#33398)
* Localize planet names (borer) * DatasetPrototype -> LocalizedDatasetPrototype * Apply requested changes (cherry picked from commit 2002de9bb01e53e70b00fea5b3f4ffeed55a3cfa) Signed-off-by: Spatison <137375981+Spatison@users.noreply.github.com> |
||
|
Eris
|
75a463cf5d | Saving changes 1 | ||
|
Eris
|
110e22aa2f | a | ||
|
Thomas
|
65fca27321 |
Disable Arrivals message for Cryosleep (#30888)
* Disable arrivals message for cryosleep late arrivals * Provide silent to PlayerSpawnCompleteEvent * Fix typo * Move message to event and into arrivals system |
||
|
Pieter-Jan Briers
|
de98315595 |
Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496)
* Extend shuttle dock time if the shuttle doesn't dock at evac. If the shuttle can't dock at evac for *some reason*, it will instead try to dock at another port on the station. And if that fails it goes somewhere random on the station. Because of the chaos and confusion caused by this, many people will frequently not get to the shuttle in time under these circumstances. This sucks for everybody. To alleviate this, the shuttle launch timer will now be extended if the station doesn't dock at its ideal spot. The default values (controlled via CVar) are 1.667x and 2x respectively for "wrong dock" and "no dock at all" scenarios. The code around here was a mess, so I fixed that too. "CallEmergencyShuttle" has been renamed to "DockEmergencyShuttle", the overload that did the actual docking has been renamed to DockSingleEmergencyShuttle. Code has been split into separate dock -> announce methods so we can calculate shuttle delay in between the case of multiple stations. Also made the "shuttle couldn't find a dock" text announce the time until it launches and fix the shuttle timers not triggering for it. * Minor review |
||
|
IProduceWidgets
|
ddbfb5aa59 |
Centcom & FTLDestination cleanup (#30226)
* centcomm name and ftlcomp * networking microopstimization * go sleep. * map names and arrivals (cherry picked from commit af65af836a319e5481929a3a6ef19ca719a5c0eb) |
||
|
Mervill
|
c9918f33fe |
Replace obsolete code in shuttle systems. (#31408)
* Format DockingSystem.Shuttle * arrivals system * docking system * shuttle console system * emergency shuttle system * shuttle system * thruster system * Fix compile error |
||
|
chavonadelal
|
3363a02172 |
Nozzle Direction Localization (#29849)
(cherry picked from commit b511d8e18033a0f2a4ce1c83e8cd866901a353fc) |
||
|
IProduceWidgets
|
b5ad59e61c |
Prevent gridfill from leaking (#30395)
dont forget to set the airtights when the tights are aired (cherry picked from commit 925d1e3ac81c0914b41868b9367f718428312810) |
||
|
Mervill
|
d772904f06 |
Remove unused IoC dependency references. (#31704)
Remove unused IoC dependencies (cherry picked from commit 3414abb970bc1cd31f1653c82da5ede40e94b10e) |
||
|
MilenVolf
|
c804c54e19 |
Localize emergency shuttle's direction for announcements (#28340)
Localize emergency shuttle direction (cherry picked from commit 5172114dbbe4ca95ad54c57a2d7be3fa3700838c) |
||
|
metalgearsloth
|
00a21e4ee7 |
Fix dungeon spawn + ftl overlap (#31413)
* Fix dungeon spawn + ftl overlap * Better fixes |
||
|
Simon
|
45d7c12689 |
Fix warnings in ShuttleSystem.GridFill.cs (#30253)
* Fix warnings in ShuttleSystem.GridFill.cs * remove the thingie --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit 0ef5f668e27ffaa0deb4db1e1232b8f524a58639) |
||
|
metalgearsloth
|
e8b20125bd |
Move vgroid much closer (#29943)
* Move vgroid much closer General feedback is map spam + it takes too long to get to. This is somewhat "close" (considering 1/4 of the distance is the vgroid itself) but without a jetpack / shuttle it's going to be an endeavour. * Decrease max * Tweaks * godzilla * Update Content.Server/Shuttles/Components/GridSpawnComponent.cs (cherry picked from commit 093054f7e372288291fc570b7259a8c5e5d9e0a4) |
||
|
Mervill
|
e6fa747f95 | Don't show Station Event announcements to players in the lobby. (#30886) | ||
|
Nemanja
|
1408d6c712 |
Replace IClickAlert with events (#30728)
* Replace IAlertClick with events * whoop * eek! |
||
|
MilenVolf
|
3c71b9f66e |
Add direction relative to station for emergency shuttle's docking & nearby announcement (#28164)
* Use nav beacon location for emergency shuttle's docking announcement Location of the shuttle relative to the nearest nav beacon in docking announcement message of the emergency shuttle * Add directions relative to station (cherry picked from commit de8b6631245cc6a7a3641f43b68c61e077a06bf8) |
||
|
Errant
|
6fda92d3f2 |
Fix replayghost spawning location (#30252)
Fix replayghost spawn (cherry picked from commit bf1450fdc85f978c0d1b313fab551d85a98087a5) |
||
|
metalgearsloth
|
fe916376b3 | VGRoid support (#27659) | ||
|
Will-Oliver-Br
|
6c121b22dd |
Port Pod Dock Fix (#2439)
# Description Port fix for pods escape from [Harmony](https://github.com/ss14-harmony/ss14-harmony) Prs: https://github.com/ss14-harmony/ss14-harmony/pull/364 https://github.com/ss14-harmony/ss14-harmony/pull/372 --- <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/0ca72881-fb99-4544-8e4b-44b929cd0f6a </p> </details> --- # Changelog 🆑 Zap527, spanky-spanky and Will-Oliver-Br - fix: Escape pods now correctly dock at centcomm. --------- Co-authored-by: jajsha <corbinbinouche7@gmail.com> Co-authored-by: Spanky <scott@wearejacob.com> |
||
|
Leon Friedrich
|
7c9cb44466 | Use non-generic TryComp() for metadata & transform (#28133) | ||
|
vanx
|
b28b6dd36d |
[Add] CVar to disable early shuttle launch recall (#598)
* igyouiviuv * white cvar --------- Co-authored-by: vanx <discord@vanxxxx> |
||
|
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)
* эмалированная репа * локалка, ветка и коммит * Компилить тяжело и неуютно * Зато уютно набегать * и тихо капает ОЗУ * и гит растрёпанный, как блядь |
||
|
RedFoxIV
|
af21168537 |
Fuselage rust (#551)
* the definition of insanity * the definition of insanity * the definition of insanity * we have hullrot at home * maybe the real hullrot was the friends we made along the way * john hullrot * i am going to hullroooooot * it's hullrotver * we're so hullback * we're rotting the hull with this one * hullmerge * the hullrot is leaking * never gonna rot you up * hullfresh * john starsector * god i wish we had grid collision damage |
||
|
ilmenwe
|
432042e945 |
Logger Sawmill Cleanup (#2413)
# Description Cleaned up Logger obsolete compiler warnings in non robust code. Should probably be changed to a ISawmill reference in classes to avoid repeated lookups in heavy logging logic. --- # Changelog 🆑 - tweak: Logger to Logger.GetSawmill("name"); --------- Co-authored-by: ilmenwe <no@mail.com> (cherry picked from commit 2e8ffd971716d38dc6d5a520bebdf88b743045a3) |
||
|
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
|
4e13279a9b |
Planet Maps Prep For Glacier Rework (#1774)
# Description Goddamn do I love Adderall. This PR lays the entire groundwork needed for the "Glacier Rework", and it does so by fixing every problem I could think of between FTL and StationBiome that was preventing it from being a reality. Essentially, I'm hitting several birds with one stone by refactoring both systems to be a LOT more flexible. You can technically say that this basically is also partly enabling Lavaland maps, since I conveniently included options in the StationBiomeComponent to generate dungeons. Technically a planet map should probably also have a RestrictedRangeComponent added to it so that players can't wander so far from the station that they generate a truly excessive number of entities. Yes, this does infact mean you can now run Nukie gamemodes on planet maps. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/7a3730af-c521-42d4-8abd-5aa5989c369c </p> </details> --- # Changelog 🆑 - add: Shuttles can now take off and land from planet surfaces. They however will still respect exclusion zone beacons set by stations. Maybe in the future there might be a special shuttle (drop pod) that is set to ignore these exclusion zones. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> (cherry picked from commit fb4ca1af6a48eda92f15b5a70273e27c2c352f22) |
||
|
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) |
||
|
sleepyyapril
|
c298cac7b3 |
Fix Even More Issues (#1559)
 Resolves #1529 # 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 interactions not respecting identity. - fix: Potentially fixed spawning issues. - fix: Fixed borgs, animals and aghosts being able to enter cryosleep. --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> (cherry picked from commit 0f51c3756ec939fa7edd8e637f09fe84999cafea) |
||
|
sleepyyapril
|
3145622d6b |
FTL Fixes (#1539)
This does cause it to warp onto the wrong airlock (at arrivals), but that's a map issue. (Yes, I tested 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 --> 🆑 - fix: Fixes arrivals destroying all nearby doors/walls/etc. --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: Gansu <68031780+GansuLalan@users.noreply.github.com> Co-authored-by: aa5g21 <aa5g21@soton.ac.uk> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit cc858242c5c2d75faa09169f85ca50043dc4ea7c) |
||
|
sleepyyapril
|
67ea5d8c3e |
Station AI Features and Fixes (Also General Fixes) (#1525)
<!-- 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]? --> Check the changelog for the full list. --- # 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 Holopads (unmapped) - add: Intellicards are now useful for removing/adding a Station AI's brain. - add: Added the Communications Console to Station AI actions. - add: AI now has a warp point. - add: Added more things for the AI to press. - add: More AI laws have been added. - fix: Fixed the mail system - fix: Fixed AI actions - fix: Fixed invalid spawns for station AI breaking and ruining your ability to play it. - fix: The Station AI's name will now properly send in "arrived to the station" announcements. - fix: Changed the CPR sound to simply not loop until fixed. - fix: Fixed unlocalized messages being sent for the random sentience event. --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: Zachary Higgs <compgeek223@gmail.com> Co-authored-by: MendaxxDev <153332064+MendaxxDev@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 3e8a7d9b00e19e160321eb81d69a884189dfa4e6) |
||
|
Spatison
|
a255206cb3 | fix upstraem | ||
|
neuPanda
|
c2e063c3de |
Porting over My Cruise Control Code From Frontier (#1482)
porting over my cruise control code from frontier with some minor bug fixes. also had to fuck with the passive dampening system because the notsorobust toolbox has hurt its self in confusion Description. redid the port from frontier removing unnecessary complicated and confusing content. replaced hard coded values with cvars patched issues with the passive dampener system causing dampener states to reset added regions to cvar file to make it easier to look threw reverted text so that its more ship based, your not driving a car this is my original work so re-licensed my work under my name rather than frontier blanket who is licensed to use edit agpl3 🆑 - tweak: tweaked friction remover system - fix: fixed inertia dampening system resetting or effecting the wrong grid - remove: Removed overcomplicated alterations Co-authored-by: neuPanda <spainman0@yahoo.com> (cherry picked from commit e389dffcdd74812cfc1c372aff8cbccd74dd24ee) |
||
|
metalgearsloth
|
994c82a71c |
I managed to get both AI Latejoin and Prisoner Latejoin working at the same time
(cherry picked from commit 0b0e9a8892d1df6e2fb72d81f3a5b51e64fc1f5e) |
||
|
VMSolidus
|
f25c7f4181 |
Lamia & Segmented Entity System (#11)
## About the PR This is a draft PR for an upcoming new playable species, the Lamia. Lamia are an older species from the 2022 era of Nyanotrasen, and were previously abandoned code that was dropped from the game on October 13th, 2022. I was able to locate what I believe to be the last remaining branch containing Lamia, from a defunct server repository that ran an October 12th, 2022 build of Nyanotrasen. Thus I began a project to refurbish this code for use on modern SS14. The Lamia I wish to PR are only recognizable from the original Lamia in that they share the Tail Segment System. That is, they prominently feature a completely unique mechanic whereby their body is composed of multiple entities linked together in a chain. The original version of this code had a great many bugs related to the game's physics system, and it was severely limited by the Robust Toolbox engine at the time. In the year since Lamia's abandonment, Robust Toolbox has gone through many iterations and improvements, and has deprecated large parts of the physics system that old Lamia utilized. ## Redesigns from the original 2022 Lamia, AKA Nyanotrasen Lamia. Vs. DeltaV Lamia The original Nyanotrasen Lamia were made with several limitations in mind. Their size was heavily restricted by the physics engine at the time, we aren't beholden to that same limitation anymore. Thus DeltaV Lamia are vastly larger than the Nyanotrasen Lamia, featuring a tail that is 5 tiles in length, with fully functional physics collisions. They were also not able to wear Hardsuits due to limitations of the SpriteComponent, and thus were instead designed around having a "Barotrauma resistance". On DeltaV code, we can arbitrarily state that species use different optional sprites for items, therefore its possible to have for example a Nukie Hardsuit, with its equipped-outerwear state, equipped-outerwear-lamia, equipped-outerwear-lamiainitialsegment, equipped-outerwear-lamiasegment, and so on. The Lamia Segments can simply state that if they equip a hardsuit, they utilize the -lamiasegment sprite option. Therefore its no longer necessary to create an entire new item solely so that snakes can wear a hardsuit. **Positive Traits** - Extreme Size. Lamia are 5 tiles long, and weigh as much as a car. They make a mockery of mass contests, and they can push physics objects around simply by slithering into them. - Significantly larger health bar. A Lamia is put into critical condition at 200 damage, and dies at 300 damage. This is offset by the Lamia having a certain percentage of damage taken by the tail transferred to the main body. - High resistance to forced movement. Space Wind at standard pressure cannot move them. - Unusual hybrid damage melee via their Hypo-Fangs. Lamia bite attacks deal 1 point of armor piercing, 2 points of poison, 2 points of asphyxiation, and inject 3u of Space Drugs. Planned traitor items exist that add a fillable chemical reservoir that they can inject into people with their attacks. **Negative Traits** - Extreme Size. Lamia are literally the size of a, "Broad side of a barn". A blind person could throw a rock, and still hit the Lamia. By extension its essentially impossible for a Lamia to evade attacks. Yea you can take hits, but you're also going to *take* hits. All of them. - Paramedics WORST ENEMY. Since they weigh as much as a car, even Oni struggle to drag them. Even a rollerbed only slightly helps drag a Lamia around. - Vulnerability to AOE damage. An explosion that simultaneously strikes a Lamia's entire tail, plus their body, will deal double damage. - Cannot wear shoes. Although not being able to wear magboots is also offset to their natural high resistance to space wind. - Extreme size also means Lamia are functionally uncloneable. They require 770 units of Biomass, the equivalent of 5.5 Onis, in order to be cloned. ## Why / Balance This PR is part of an ongoing project to add exciting new content to the DeltaV repository, with a focus on keeping the theme of "Monster People" species, per request by admins. ## Technical details The code regarding Tail Segments is actually unfinished, and still needs significant overhauling before this PR can be undrafted. Here's a few concerns: - [x] Implement "Marking Parity" - [x] Make/Commission/Request new markings for the Lamia and her tail segments - [x] Implement "Hardsuit Appearance Parity" - [x] ServerLamiaSystem now utilizes new physics engine options. - [x] "We need to be able to spawn 80 Lamias without slowing down the server -Debug", this is a hard requirement. Having 32 tail segments is not required. I would prefer that we have 32 tail segments, but if we optimize their code for performance and still find out we aren't meeting the 80 Lamia hard requirement, I am willing to reduce them to as low as 16 to 20 segments. - [x] Implement Wizden's upcoming "Shoot Over Corpses unless they're targetted" for Lamia Tails. - [x] Reimplement the mechanic for Segments sharing their healthbar with the Lamia. - [x] Possibly make it so that Lamia can only wear Jumpskirts? I'd want to outright get rid of the layer mask if possible. ## Non-Technical TODO list These are all the TODO's that don't necessarily involve C#, and primarily live in the YAML side of things. - [x] Implement marking customization for Lamia. They should have marking variations for More/Less humanlike versions. Such as a Snake Head(We can re-use the Lizard snake head), Medusa Head, changing how far up the scales go, and if the Lamia has human skin or full scales. I'd like to have tail pattern variations that can be set in the character customization, but that is also pending the VisualizerSystem for tail segments. - [x] Make their hardsuit variants. Not actually difficult, just takes some time. - [x] Finely tune their numerical values. Basically nothing on the YAML side of things is final, and is subject to change pending beta feedback and/or testing. ## Media  One of the downsides of having extreme mass.  Working Collision physics:  Finalized version of the damage system, also featuring significant improvements to the tail systems.  **Changelog** 🆑 VMSolidus, @Elijahrane, and @noctyrnal - add: Lamia have been added to the game as a new playable species! They are currently extremely buggy, and so are by default disabled as a roundstart species. To enable them for (Buggy) playtesting, go to /Species/lamia.yml, and set roundstart to true. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Rane <60792108+Elijahrane@users.noreply.github.com> Co-authored-by: Aiden <aiden@djkraz.com> (cherry picked from commit 1e356fbb38120a850fe5abc8a9ecef57f8c049f1) |
||
|
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) |
||
|
Spatison
|
afaceb8a42 |
Upstream 12.12-26.12 (#208)
* Pistol-Whipping (Guns as Melee Weapons) (#1335)
# Description
Adds the ability to use guns as melee weapons and throwing weapons.
The gun melee attack is a Light Attack done with a right click. The
attack rate is slower than average melee weapons.
The cooldown on melee attacks after shooting has been removed entirely,
so you can right-click immediately after shooting (like in hero shooters
😎). The cooldown on shooting after a melee attack has been set to a
constant 0.5 seconds.
## Balance
Technically speaking, weaving shooting and pistol-whipping lowers your
overall DPS in most cases, because you can't shoot for 0.5 seconds after
doing a melee attack. With _skillful_ usage, however, it provides some
key tactical advantages:
- Preserving ammo by dealing damage without firing a shot.
- Deal stamina damage as a natural effect of dealing melee Blunt damage.
- Most non-pistol guns have increased blunt stamina damage factors to
help with this.
- Bypassing Piercing resists of armors with a higher Piercing resist
than Blunt resist like plate carriers.
- Doing the combo of right-clicking immediately after shooting deals a
big burst of damage.
Pistol-whipping also helps as a last resort when you run out of ammo.
However, it's almost always better to use a proper melee weapon instead
of a gun as a pure melee weapon, because you can't power attack with
guns and the guns' melee attack rate are slower by design than most
melee weapons.
Shotguns benefit the most from pistol-whipping, because their ideal
range is close-range where a melee attack can be performed, and their
low fire rate means they're not affected too much by the 0.5s shooting
cooldown.
Guns have received throwing damage. You can throw guns at the enemy once
you're out of ammo to deal extra damage. I think this makes fights a
little more spectacular to watch.
Melee damage sorted by group (from least to greatest):
1. Revolver
2. Pistol (+ Energy Pistol)
3. Sniper rifle
4. Rifle (+ Energy Rifle)
5. Sub Machine Gun
6. Shotgun
7. Light Machine Gun (L6 saw)
8. Heavy Machine Gun
## Media
**mk 58**
**Kardashev-Mosin (Wielded)**
**Basic Combat**
https://github.com/user-attachments/assets/922998d1-0cd0-4fea-8f0b-365bcff3c12b
**Particle Decelerator Combo (80 damage)**
https://github.com/user-attachments/assets/ce62334a-13dd-46d9-9c0e-453e26bf1261
Combo: Shoot + Power Attack, wait 1.6s then Power Attack + Throw
This combo costs 90 stamina which almost depletes 100 stamina leaving
you vulnerable, so the Vigor trait can help you pull off this combo.
## Changelog
🆑 Skubman
- add: Pistol-whipping has been added. You can press right click with a
gun to perform a Light Attack. Most guns will deal Blunt damage, apart
from the Kardashev-Mosin dealing Piercing/Slash damage with its bayonet.
Weaving bullets and melee attacks correctly will give you the upper hand
in combat.
- add: Guns can now be thrown to deal the same damage as their melee
damage.
(cherry picked from commit 5899f4ea5a978ded0362bdf46185f8fbb1a2607c)
* local #1335
* Fix Interact Verb (#1346)
Finally fixed it.
Interact verbs weren't appearing because this is required in BaseMob.
(cherry picked from commit 3e3ca59850f1a21f2bb8e249455d655ec6b63d2c)
* Fix Ripley Hydraulic Clamp (#1344)
# Description
Fix a bug in `MechGrabberSystem` causing the hydraulic clamps in Ripley
to drop items far away.
---
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/user-attachments/assets/d2c8e951-e391-42d7-b45d-78a275dc8bf2
</p>
</details>
---
# Changelog
🆑
- fix: Hydraulic clamps now drop entities correctly
(cherry picked from commit f0e4612612fe18a126cdf47d712b63bc083b5483)
* Automatic Changelog Update (#1344)
(cherry picked from commit 6dcb367adb769f51bcaf1a647a4ca6c886a10be7)
* Salvage Magnet UI and Character Switching Height/Width Bug Fix (#1347)
<!--
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 fixed it
also added a button "Connect & Go to Lobby" for people testing lobby
stuff!
Resolves #1131
---
# 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 the bug where switching characters made your width/height
change to incorrect values.
- fix: Fixed the salvage magnet opening ten times.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit c4c3e4283ae077fd0f55e4cce31710f31de046f7)
* Automatic Changelog Update (#1347)
(cherry picked from commit 8ff70215d9f6e2a73150b55313333b9d5ca87749)
* Update Credits (#1350)
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 2a7a4719d39b51ffd232c667b1ca49dbce68dce6)
* Fix Bartender Mosin (#1337)
Bartender Mosin was replacing their duffel bag at roundstart.
(cherry picked from commit 3aa430f486dcdf40629468c715092aee0089187c)
* Trait Purchasable Mentalic Powers (#1343)
# Description
This PR adds a few of the "Mentalic" category of psionic abilities to
the Traits System, allowing them to be purchased by any character that
is also a Latent Psychic. These powers are:
- Dispel
- Metapsionic Pulse
- Xenoglossy (Also requires Natural Telepath)
- Psychognomy (Also requires Natural Telepath)
These are all quite expensive, so to help address the "Expensive trait
proliferation", I've increased the points granted by the Blindness trait
to 10. Have fun being a blind wizard. From this point on, we're going to
need to start adding more "High point value" negative traits.
# Changelog
🆑
- add: Dispel, Metapsionic Pulse, Xenoglossy, and Psychognomy can all be
purchased during character creation using trait points.
- tweak: Blindness now grants 10 trait points instead of 6.
(cherry picked from commit acec14d08879ebaf16e5425fccd26d8f066eda55)
* Automatic Changelog Update (#1343)
(cherry picked from commit adddc1df27184f74e5e48e5220e0cd4eeb57084c)
* Pointy Ears For Harpies And Arachne (#1348)
# Description
Like half the art references I have for Harpies have them with elf-like
pointed ears, another half have them with their feather tufts. We have
pointy ears markings, so this PR makes it so that Harpies can have them.
Actually it also gives them to Arachne, for similar reasons(It's an
oddly common thing on Arachne/Lamia art depictions).
# Changelog
🆑
- add: Added a variety of Pointy Ears markings for Harpy and Arachne
characters.
(cherry picked from commit 59a55c9d6ae6772d4ead0e73d5dab7b24c539e53)
* Automatic Changelog Update (#1348)
(cherry picked from commit 99d616953af89462d827fd8ca6e50a92e63e8203)
* Port Cosmatic Drift Arrivals (#1340)
# Description
Done after a lengthy discussion with @OldDanceJacket about mapping
issues, namely the existence of "Walk-In Closets" on maps that take up
an inordinate amount of space that would otherwise be usable for other
purposes. Seriously, Saltern has a 4x6 room that contains >200 medical
uniforms, and is on a map intended only for 15 people(And maximum of 6
medbay personnel). Every map in rotation is like this.
Ostensibly, Loadouts were created to provide a solution to this problem,
by making it so that players choose their DRIP before spawning in, so
that mappers don't need to put in a whole ass room dedicated to medical
uniforms. But Mappers ended up keeping the "Walk-in Closets" even after
Loadouts were introduced to serve as a "Sanity check" in case of events
such as people not choosing their loadouts, or getting hired during the
round by the HoP to work in the medbay, etc. To solve this, me and ODJ
agreed upon adopting Cosmatic Drift's solution to this, by making it so
that the Arrivals Terminal serves as the "Walk-in Closet Hotel" that
every map can just piggyback off of. Nobody needs to make the stupid
closet rooms, on ANY map, because every map is fully guaranteed to have
every closet the players could ever need in arrivals.
# Media
<details><summary><h1>Media</h1></summary>
<p>
Dock
Dorms(Spawn points)
Medbay:
Security
Captain/HOP
Cargo:
Epistemics:
</p>
</details>
# Changelog
🆑
- add: Ported Cosmatic Drift's version of the Arrivals Terminal.
Terminal now includes every version of department clothing and material
lockers that players could ever need, allowing them to try on their
chosen job equipment and drip before departing for the station.
(cherry picked from commit 4509a9d030efb7eb45378824559a3f88c4caf4b4)
* Automatic Changelog Update (#1340)
(cherry picked from commit 9a1cda889a085974f666adb99c753ba4e1392355)
* More Dangerous Mindbreaking (#1249)
# Description
Somehow people weren't getting the memo despite the **HORRIFYING** texts
associated with Mindbreaking, that doing so is an almost comically evil
act akin to murder. So this PR fixes that. By making it even more
obvious.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
🆑
- add: Added a server option for "Scarier Mindbreaking". Mindbreaking
now irreversibly converts a player character into a non-sentient NPC.
- fix: Mindbreaking now only works on Psychics.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit 80f83484e9653f159581ea0dfc82d56256e4947c)
* Automatic Changelog Update (#1249)
(cherry picked from commit 4d87be6ea66356156cdac6e7e9cd70af36daae24)
* Redshirt And Brittle Bone Traits (#1352)
# Description
This PR adds two additional "High Value" physical negative traits, to
help address a growing need for more high point value negatives, since
there is also a very large number of high point positive traits. These
two traits are fairly simple, the first is Redshirt, which decreases
your Dead threshold by 100, and Brittle Bone Disease , which reduces
your Crit threshold by 50. Taking both on an ordinary human would give
+18 trait points to work with, but would in turn give a healthbar of
only 50/100, compared with the standard healthbar of 100/200.
# Changelog
🆑
- add: Added Redshirt and Brittle Bone Disease traits. These give
extremely large negative modifiers to your healthbar, but also grant a
large amount of trait points to work with.
(cherry picked from commit 88edcd05aef76acb10e3d0924dd874eef22c7f71)
* Automatic Changelog Update (#1352)
(cherry picked from commit ed0e56aa446ea9ad9ecae1a1a1685438378b1814)
* Jackboots Slowdown Mitigation (PORT) (#1342)
<!--
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 jackboot slowdown mitigation from [space-wizards
github](https://github.com/space-wizards/space-station-14/pull/30586).
Adds fake version for civilian use.
---
# 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 slowdown mitigation to jackboots
- add: Added fake jackboots for style outside of sec
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit f5d45d790d793acbba7d21258cd206568fe79f99)
* Automatic Changelog Update (#1342)
(cherry picked from commit 03dc85aa7071c70cd9f01392cabf7cb7fb2fa6ac)
* Fix Redshirt & Brittle Bone Traits (#1355)
These were supposed to be negative traits(They give you points), but I
accidentally made them positive traits(They cost points).
(cherry picked from commit ec60940fe5eae5d7d3e969bac132e1da2a659272)
* Example Hub Ad List (#1356)
# Description
this PR extends the list of default advertiser hubs to include every
existing hub except for SSMV(Which is mutually exclusive with the
others). If there are more hubs I have missed, please let me know. This
will allow our servers to appear on as many hubs as possible.
(cherry picked from commit 577126f987ff70ba213f2898ea9e5170b0dc5ea6)
* Saltern Update (#1357)
# Description
I would like to offer my thanks to the Singularity Network Mapping Team
for this update, they've done some great work! This PR launches Saltern
with a significant rework to everything on it except for arrivals.
<details><summary><h1>Media</h1></summary>
<p>
Sorry, Map Renderer is dead right now.
</p>
</details>
# Changelog
Death do NOT change the name given for the Changelog author, the mappers
here have requested that "SiN Mapping Team" be given as the name for
this PR.
🆑 SiN Mapping Team
- add: Saltern has been fully reworked!
(cherry picked from commit a06b4661b08abe6f64460655962b98f4ccb9db07)
* Automatic Changelog Update (#1357)
(cherry picked from commit aab36bfe65d82cff13bb6d8b6a55c2b70a031aa2)
* v237.3.0 (#1354)
the robust toolbox updater!!
https://github.com/space-wizards/RobustToolbox/blob/v237.3.0/RELEASE-NOTES.md
(cherry picked from commit bf1b0d03aede161d62aedfc9166589335a5d7c4c)
* Hotfix Saltern (#1359)
# Description
Small maintenance to do. Bridge needed FixGridAtmos done, and a single
light in dorms needed wiring.
# Changelog
🆑
- fix: Fixed the Saltern bridge being a hard vacuum at roundstart.
(cherry picked from commit 3c1ed56ed3122866b32249006496c37be825c82a)
* Automatic Changelog Update (#1359)
(cherry picked from commit 48413d6a435de700197a4f6ceb1290d61f5130b4)
* Loadouts Debloating (Colorable Items) (#1364)
# Description
This PR cuts down significantly on Loadouts bloat by removing all
specific color versions of colorable items from the loadouts. I left the
original items untouched for compatibility reasons since certain things
in the game still need to be able to spawn a "Blue jumpsuit" etc.
Additionally, to help aid in clarity for players, I've added
localizations for all the generic colorable items so that they have
(colorable) in the loadout names, so that players can tell which items
have the option without needing to click into the customize button on
every item.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
🆑
- add: Added labels to all generic colorable items in loadouts, so that
players can see which items have custom colors as customization options.
- remove: Removed all 'specific color' variants of colorable items from
Loadouts, such as "Blue Jumpsuit" when a colorable jumpsuit exists.
(cherry picked from commit 452b9113f61790e8258b95904361de5ed34a034f)
* Automatic Changelog Update (#1364)
(cherry picked from commit cd5a6f8b5743904dbecbf04e5d70614e4444d149)
* More Colorable Items (#1365)
# Description
This PR adds even more colorable items to loadouts, this time making
entirely new whitescale versions of existing items that did not have one
previously. This replaces several more options for items that had a
whole bunch of specific color entries with a single item that can take
any color.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
🆑
- add: Added colorable variants of fingerless gloves, headbands, berets,
hairflowers, cloth masks, and the neck gaiter.
(cherry picked from commit 0674895a3b6a84c2761eb13c7b5f35bc826fe19c)
* Automatic Changelog Update (#1365)
(cherry picked from commit cc1e52c47c7b27b8da9be5da701580efe42590ca)
* Make the EE Logo Match the Banner (#1361)
# Description
Light mode logo
(cherry picked from commit 35c95a5da3ccb7d23620eaa1aad43022be3d6673)
* Loadout Modular Functions (And Loadout Pets) (#1366)
# Description
This PR implements a reflection based system for applying functions
directly to entities spawned by loadouts. In order to provide an
"Example" use of this system, I have created a "LoadoutMakeFollower"
function, which can be applied to a loadout entity that happens to be an
NPC with the Follower blackboard, making it follow the player who
purchased that loadout.
Basically. Pet mouse. The pet mouse will follow its owner.
Yes I actually have tested this ingame, and it works great. The longest
part about coding this was me spending almost 30 minutes straight
wondering why the mouse wasn't following my character, until I
remembered that I had to make a special "Pet" mouse variant that had the
right HTN root task.
This could be extended to other things. I happen to know that Nuclear14
wanted something like this for a Pet Dog.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
🆑
- add: Loadouts can now apply modular functions to items upon spawning
in.
- add: A new LoadoutMakeFollower function, which lets you buy NPC
followers in loadouts.
- add: added Pet Mice, Cockroach, Mothroach, and Hamster to Loadouts.
All of which use the new LoadoutMakeFollower function.
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit 311b86e012ac7d40363b5027ab51b09c9d2285e2)
* Automatic Changelog Update (#1366)
(cherry picked from commit 18a751d5c3d53cd4ff36728dd585ada37e9175b9)
* Plushies! (#1369)
<!--
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 two new plushies to the game! A harpy plushie and a plushie for
the beloved station pet Morty!
---
# 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: two new cuddly friends to the station! (harpy and morty plush)
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: juniwoofs <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>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit 6fb12233d48de476c2b06415031fa2e9c9a1d327)
* Automatic Changelog Update (#1369)
(cherry picked from commit 5293b92007f7ca81375d9806cccf9be38846c8d3)
* Traits System Anticheat (#1358)
# Description
It turns out that there was no system in place for serverside fact
checking of whether or not people have a legal traits list. Last night a
bug was reported whereby a player used Cheat Engine to give himself
every trait in the game, bypassing the points system entirely. It's not
actually possible to reduce a trait selection down to a legal list
without creating interesting race conditions, which limits my options on
how to deal with it.
So I made it a vote on the Einstein Engines discord, and the vote was
unanimous. PUNISH THE CHEATERS.
<details><summary><h1>Media</h1></summary>
<p>
https://www.youtube.com/watch?v=X2QMN0a_TrA
</p>
</details>
# Changelog
🆑
- add: Implemented Anti-cheat for Traits. Attempting to join a round
with an illegal traits list will result in hilarious consequences.
(cherry picked from commit 2fc1f25bc0daa29e2017490adbdf41f9db4f4927)
* Automatic Changelog Update (#1358)
(cherry picked from commit 9d738c8f36c0762e0ba3942fb26ef25735ade327)
* Make Prisoner Not Shitter Role (#1341)
# Description
Prisoner is consistently the most problematic role in this entire game,
being seen as "The Self Antagging Role", which produces endless amounts
of administrative burden. This is especially a problem with lowpop
servers, or servers that are understaffed with admins. Players just join
as Prisoner, *immediately* break out of the permabrig, and then go on a
self antagging spree. The solution to this was staring us in the face
the whole time. Just give them the same Pacified component that the
Thief antag has. Now it's impossible for them to smash the permabrig
windows, someone has to intentionally let them out, and even if they do,
they will be hard pressed to selfantag when they can't turn on harm
intent.
# Changelog
🆑
- add: Prisoners now spawn with a Pacifier Implant.
(cherry picked from commit 7f8d76ea6f63d334c894fc0f7ada6fd1359408f1)
* Automatic Changelog Update (#1341)
(cherry picked from commit 68cb9ea4888c16056c6cfe9fea17de1a78420374)
* Fix Jittering (#1334)
<!--
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]?
-->
Title.
Ported from https://github.com/Fansana/floofstation1/pull/393
Resolves #1277
---
# 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 jittering displacing your character when shaken.
(cherry picked from commit a13d9640ec77e07b532b729ac540dc95b689c557)
* Automatic Changelog Update (#1334)
(cherry picked from commit bfb32cf24eda47ff3dbd5d4b15b58e25ae597947)
* Basic Soft-Crit Implementation (#1370)
# Description
This PR adds a simple server configuration option for enabling basic
"Soft-Crit", and not much else because oh my god this system is horribly
complicated. When enabled, characters can crawl around very slowly while
in crit, and really not much else. This more or less mirrors how crit
affects character movement in SS13, where you can at least crawl to
relative safety while bleeding to death.
# Changelog
🆑
- add: Added server config options for basic "Soft-Crit". When enabled,
characters who are critically injured can still slowly crawl, but are
otherwise still helpless and dying.
(cherry picked from commit dff8c69f2afff6714b893a7c9572a84bd384ff89)
* Automatic Changelog Update (#1370)
(cherry picked from commit 9430b9046a9a40cc2f96bb3c66251aabbaf9e80a)
* local upstream
* Revert "Make Prisoner Not Shitter Role (#1341)"
This reverts commit
|