mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-18 22:18:52 +03:00
b968a422575dacbf89e496bfa330c2c1534ea97b
37 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
75a463cf5d | Saving changes 1 | ||
|
|
110e22aa2f | a | ||
|
|
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 |
||
|
|
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> |
||
|
|
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) |
||
|
|
994c82a71c |
I managed to get both AI Latejoin and Prisoner Latejoin working at the same time
(cherry picked from commit 0b0e9a8892d1df6e2fb72d81f3a5b51e64fc1f5e) |
||
|
|
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
|
||
|
|
a2557f75a6 | Upstream (#129) | ||
|
|
47b10a01b0 |
Catch-Up Cherry Pick 2 (#944)
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml |
||
|
|
f30e88afc2 |
Fix Arrivals Shuttle (#1040)
# Description
Fixes the arrivals shuttle choosing to correct docking port.
---
- [ ] Fix all maps and place the correct airlock (yeah not gonna do that
in this PR)
- [x] Fixed arrivals shuttle logic
---
# Changelog
🆑
- fix: Fixes the arrivals shuttle choosing to correct docking port.
|
||
|
|
30fa1207b2 |
Update Submodule to 219.2.0 (#536)
Uses the following Cherry-Picks: https://github.com/space-wizards/space-station-14/pull/26994 https://github.com/space-wizards/space-station-14/pull/26518 https://github.com/space-wizards/space-station-14/pull/26279 https://github.com/space-wizards/space-station-14/pull/24946 https://github.com/space-wizards/space-station-14/pull/27188 Requires: https://github.com/Simple-Station/Einstein-Engines/pull/535 https://github.com/Simple-Station/Einstein-Engines/pull/534 --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Jake Huxell <JakeHuxell@pm.me> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: DEATHB4DEFEAT <zachcaffee@outlook.com> |
||
|
|
5ada275547 |
Fix FTL docks not opening (#25808)
(cherry picked from commit 21a95960f0fd04b6d99cd7c6617985a7eb5e9175) |
||
|
|
f102e8ff75 |
Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back Just do it per-tile she'll be right, at least it's done with 1 draw call. * Revamp shuttle console * Bunch of cleanup work * Lables sortito * dok * Pixel alignment and colours * Fix a bunch of drawing bugs * Shuttle map drawing * Drawing fixes * Map parallax working finally * weh * Commit all my stuff * mic * deez * Update everything * Xamlify everything * uh * Rudimentary blocker range * My enemies have succeeded * Bunch of changes to FTL * Heaps of cleanup * Fix FTL bugs * FTL * weewoo * FTL fallback * wew * weh * Basic FTL working * FTL working * FTL destination fixes * a * Exclusion zones * Fix drawing / FTL * Beacons working * Coordinates drawing * Fix unknown map names * Dorks beginning * State + docking cleanup start * Basic dock drawing * Bunch of drawing fixes * Batching / color fixes * Cleanup and beacons support * weh * weh * Begin pings * First draft at map objects * Map fixup * Faster drawing * Fix perf + FTL * Cached drawing * Fix drawing * Best I got * strips * Back to lists but with caching * Final optimisation * Fix dock bounds * Docking work * stinker * kobolds * Btns * Docking vis working * Fix docking pre-vis * canasses * Helldivers 2 * a * Array life * Fix * Fix TODOs * liltenhead feature club * dorking * Merge artifacts * Last-minute touchup (cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082) |
||
|
|
e7a3b82a8d |
Use new ComponentPauseGenerator (#25183)
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components. (cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074) |
||
|
|
ccea85136b |
Random spontaneous cleanup PR (#25131)
* Use new Subs.CVar helper Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe. This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown. * Fix a bunch of warnings * More warning fixes * Use new DateTime serializer to get rid of ISerializationHooks in changelog code. * Get rid of some more ISerializationHooks for enums * And a little more * Apply suggestions from code review Co-authored-by: 0x6273 <0x40@keemail.me> --------- Co-authored-by: 0x6273 <0x40@keemail.me> (cherry picked from commit 68ce53ae17985876d6d112b764b2144964a9f42e) |
||
|
|
9e366f3119 |
Predict two-way levers (#25043)
* Predict two-way levers Annoys me the rare occasions I touch cargo. Doesn't predict the signal but at least the lever responds immediately. * space * a (cherry picked from commit 05a2ddff1cc415c3bdf1e15ef3a2c953bcb5384b) |
||
|
|
922407e2e8 |
Client customization late-join spawner priority for arrivals/cryostorage (#24586)
* Initial commit, requires server restart to take effect * Exposes callbacks directly instead, takes effect immediately * Cleaned up control flow, swapped cvar for client customization * Switched to int, dictionary of callbacks, migration * Update Content.Shared/Preferences/SpawnPriorityPreference.cs * krunkle stan --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit ed0f2aa2213cc47b817476206a2dd0b4e7c176b1) |
||
|
|
1075c2e999 |
Hallway textscreens (#24189)
* hallway screen refactor pending comms console support * comms console broadcasts * screen and timer localization (cherry picked from commit 7e16ee0b55fdef2ce77b13cd72dbc00b63d776c4) |
||
|
|
e666d3aeb4 |
Changed spawn priority to arrivals -> containers -> points. (#24476)
(cherry picked from commit 00c83844acab389edb896ecd1df7d7c0c68e0134) |
||
|
|
79b0c0e3d4 |
Finally fix cryostorage duping (#24251)
(cherry picked from commit ea299caff9143fe97eeb0873dada4e4fed8df3bd) |
||
|
|
22f036413e |
Fix a collection enumeration modification exception in ArrivalsSystem (#22839)
Fix collection enumeration |
||
|
|
0088530249 |
Shuttle timers (#19471)
* sync * sync * no more squiggles.. * last build error * updated maps for testing * some issue with receiving arrivals setup * networkpayload refactor. TODO: accurate timings * timings accurate. TODO: backport old bugfix * all set? * cleaned up source. TODO: diff arrivals methods * cleaned component. TODO: escape polish, docs * first documentation pass * escape timers work * no more magic numbers * removed dead code leads * sync sync * Automatic changelog update * shuttle timer groundwork no more squiggles.. last build error updated maps for testing some issue with receiving arrivals setup networkpayload refactor. TODO: accurate timings timings accurate. TODO: backport old bugfix all set? cleaned up source. TODO: diff arrivals methods cleaned component. TODO: escape polish, docs first documentation pass escape timers work no more magic numbers * BBQ rib sandwich (#21180) * Fix missing toggle fullscreen loc string (#21264) * Cave Decoration pack (#21265) * add chromite chasm * add desert chasm * snow chasm * finish * fixes and tweaks (#21172) * Automatic changelog update * Fix ItemPlacer (#21160) This is going to lead to many entities being ticked unnecessarily and performance problems. * headrev spawn music (#21119) * headrev spawn music * :trollface: * skill issue * double skill issue * :trollface: * :trollface: * :trollface: * Automatic changelog update * Techfab resprite + department fab sprites (#21136) * Fix popup messages appearing when someone tries to open a door without a tool. (#21099) * The fixTM * typo fix * addressing review * Show "departed and moved on" for when a ghost role is taken (#21092) * fix ghost role not counting for "departed and moved on" * I don't think that bit was needed so away it goes * hopefully finish the upsream merge * Automatic changelog update * Implant whitelist/blacklisting (#20678) * add whitelist and blacklist to implant and implanter components * handle whitelist and blacklist in systems * move hardcoded whitelist/blacklist to base implanter + add admeme implanter * give implants sensible whitelists * cleaner CheckTarget and fix * remove unused imports * network lists --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Ion storm event (#20277) * ion storm event prototype + locale * add lawsets * use lawsets, make borgs ion storm targets * ion storm rule and ion storm target * lawset prototype * use lawsets * update silicon law system to use lawsets and support ion storm event * new toys * fix * more fix * fixy * ion storm admin logging * assigning laws makes borg provide its own laws, other stuff * 1h reoccurence * 50% chance * better call saul * emagLaws is required * add announcment audio * fixy * family friendly gaming * fixy * address reviews * fixy * more fixy and no erp * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * A return to foam (foam rework) (#20831) * Automatic changelog update * ERT Loadout overhaul + Real deathsquad mobs + ERT fixes (#21230) * "assist with medical efforts" * CentComm official description change * give cburn ert mask * Ert medic hardsuit uses blood-red medic values * description changes, they all used to use the blood-red description * ert engineer hardsuit uses cburn values, good for handling all possible engineering problems. * janitor hardsuit uses cburn values for extreme messes, otherwise we'd send the non eva variant. * spawn suffix changes * shorten suffix * drop armor from ert jumpsuits * drop armor from DS jumpsuit * add more armor to death squad to make up for removed armor in the uniform. * give sec gas masks armor, give syndicate gas masks armor. ERT gas mask uses syndicate mask values * add nanotrasen * removed duplicate * give centcom IDs their hud icon * replace all ert bulletproof armor with basic universal armor * replace all oxygen tanks with air tanks; species is random. * remove gun and meds from ert engineer kit * give ert engineer materials * remove weapons and meds from janitor ert * give ert janitor light replacer * remove ert sec pulse weapons, admins will assign loadout. Either the lecter or enforcer, probably. * Give ert sec the security pistol kit * typo * give eva ert sec pistol * give eva janitor ert gas mask * give jani purple gloves * medical gloves for medical ert * replicate security loadout to leader * quick ert lecter spawns for lazy admins * better suffixes to find them easier * add cburn to ertspawn * Replace "Spawn" with "role" * Add death squad. Give ert engineer gas analyzer. * death squad using wrong equipment * typo * missing ghost roles on lecter loadouts * add freedom implanter to deathsquad * deathsquad ghost role text * Operative sounds better * give Ds flashbang box (why isn't it entirely filled?) * fix typo. add energy shield to DS * fix typos * all centcomm roles are now mindshielded. These cannot be removed. * Rider didnt include some of the changes ? * give zipties instead of cuffs for mass arrests! * upgrade ERT survival boxes to extended capacity * give cburn extended oxygen too * Automatic changelog update * Restore Leviathan's 80 pop cap (#21281) * Un-revert IPlayerManager refactor (#21244) * Update engine to v172.0.0 (#21288) * Bandaid tests (#21292) * rename the rocks (#21275) * Make crystals noRot (#21279) IDK might be better. Ideally the anchoring would be offset 0-0 but this is the world we live in atm. * Fix nukies sound not played (#21268) * Play sound and sending greeting message works for nukies now!!!!! * oops * silly change * Automatic changelog update * Fix hijack objective (#21241) * Fix hijack * Max difficulty * Remove GridModifiedEvent (#21291) * Update submodule to 173.0.0 (#21296) * Fix namespace error (#21298) * Update yaml sequence option in editorconfig (#21297) * Fix namespace (#21299) * fix cburn bag issue, make new bag entity for them and filled bag entity (#21295) * Health analyzer UI improve (#17280) * Automatic changelog update * User accessible playtime (#21242) Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Moves cloning comp & cloning event to shared (#21253) * Generalizes solution overflow & slightly increases space lube yield (#21094) * generalize SolutionSpikeOverflowEvent * let reactions overflow * spacelube: 3 -> 5 * restore TryMixAndOverflow threshold cap * Automatic changelog update * Move ActorComponent to shared (#21293) * Update engine to v174.0.0 (#21311) * Fix planet command help message (#21312) * Wearable bee plush (#20623) * add * fix * temporary change, needs fixing * mayb fix * actually fix FR * yes * Automatic changelog update * remove pulse rifle from ert medic (#21310) * Content audio (#20862) * Automatic changelog update * Update submodule to 175.0.0 (#21318) * Revert "Update submodule to 175.0.0 (#21318)" (#21319) * Atomic bomb add uranium (#21143) * fix: Incendiary bullets no longer deal cold, acid, or shock damage that ignores all armor. * Atomic bomb * Action bugfixes (#21321) * Disable OOC during round (#21323) * Fix PDA notifications when creating a news entry using the Mass-Media console. (#21320) * Automatic changelog update * Update belt.yml (#21317) changes the chief engineer's belt to remove the lv wires (they take up a lot of space and are easy to get anyways) in exchange for a holofan, a t-ray, and a gas analyzer (first time coding ever this might have to be edited) * New foam sprites (edge sprites) (#21308) * New foam sprites (icon smoothing) * changed to edge sprites for foam * fix * edges for metal foams * fix * Fix bola stam damage, bring back old construction requirements (#21340) * Automatic changelog update * Added thermal insulation to flannel jackets (#21273) * Automatic changelog update * Space Asshole Gear (#21243) * Add Space Asshole Coat * Add sledgehammer * Adjust sledgehammer damage values * Add copyright string to sledgehammer * Fix broken slot highlight in midnight theme. (#21331) * removed dead code leads removed redundant ensurecomps * textscreen documentation * remove redundant ensurecomps * Add hint for the examine trigger effect (#21166) * examine locale * examine trigger desc Automatic changelog update cornmeal is actually obtainable now (#21162) * do the thing * lets find out * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> --------- Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Automatic changelog update Healing skeletons by pouring milk over them (and clean pie remains off their skulls) (#21231) * mvp done - skellies can heal by spillink regular milk on themselves and clean themselves off creaming with water * added other types of healing milk, also made a separate reaction to oat milk - it has almost no calcium in it * fixed indent error, made a dumb mistake Automatic changelog update Fix anomaly locators frantically beeping when entering detection range. (#21178) * reset beep timer when out of range * prevent deficit from impacting beep timing Automatic changelog update Remove "mk --> mmm, okay" and "u --> you" to chatsan anti slang (#21177) Automatic changelog update Adds AttemptEntity(Uns|S)tickEvent. (#20728) * try-stick * convert spider charge to attempt-stick-events Change ListContainer to send null when selected is removed from the data (#20595) fix feeding unremovable items (#21234) Automatic changelog update Power switchable refactor (#20419) Co-authored-by: deltanedas <@deltanedas:kde.org> simple space mobs cant be flashed (#20784) Co-authored-by: deltanedas <@deltanedas:kde.org> give roundstart borgs names (#20081) Co-authored-by: deltanedas <@deltanedas:kde.org> fix searching on vending machines (#21233) syndicate snack box (#21024) Co-authored-by: deltanedas <@deltanedas:kde.org> Fix DockingControl (#21238) Shadow Dimension visual pack (#21237) Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Potato battery update + potato AI (#21142) Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> [TEST MERGE] Slot-based Storage (#21212) Automatic changelog update Some mild item size balancing + fixes (#21250) Automatic changelog update Revert "Storage TEST MERGE" (#21258) Add missing changelog for storage refactor revert (#21259) * sync sync * Automatic changelog update shuttle timer groundwork no more squiggles.. last build error updated maps for testing some issue with receiving arrivals setup networkpayload refactor. TODO: accurate timings timings accurate. TODO: backport old bugfix all set? cleaned up source. TODO: diff arrivals methods cleaned component. TODO: escape polish, docs first documentation pass escape timers work no more magic numbers BBQ rib sandwich (#21180) Fix missing toggle fullscreen loc string (#21264) Cave Decoration pack (#21265) * add chromite chasm * add desert chasm * snow chasm * finish fixes and tweaks (#21172) Automatic changelog update Fix ItemPlacer (#21160) This is going to lead to many entities being ticked unnecessarily and performance problems. headrev spawn music (#21119) * headrev spawn music * :trollface: * skill issue * double skill issue * :trollface: * :trollface: * :trollface: Automatic changelog update Techfab resprite + department fab sprites (#21136) Fix popup messages appearing when someone tries to open a door without a tool. (#21099) * The fixTM * typo fix * addressing review Show "departed and moved on" for when a ghost role is taken (#21092) * fix ghost role not counting for "departed and moved on" * I don't think that bit was needed so away it goes * hopefully finish the upsream merge Automatic changelog update Implant whitelist/blacklisting (#20678) * add whitelist and blacklist to implant and implanter components * handle whitelist and blacklist in systems * move hardcoded whitelist/blacklist to base implanter + add admeme implanter * give implants sensible whitelists * cleaner CheckTarget and fix * remove unused imports * network lists --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Automatic changelog update Ion storm event (#20277) * ion storm event prototype + locale * add lawsets * use lawsets, make borgs ion storm targets * ion storm rule and ion storm target * lawset prototype * use lawsets * update silicon law system to use lawsets and support ion storm event * new toys * fix * more fix * fixy * ion storm admin logging * assigning laws makes borg provide its own laws, other stuff * 1h reoccurence * 50% chance * better call saul * emagLaws is required * add announcment audio * fixy * family friendly gaming * fixy * address reviews * fixy * more fixy and no erp * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Automatic changelog update A return to foam (foam rework) (#20831) Automatic changelog update ERT Loadout overhaul + Real deathsquad mobs + ERT fixes (#21230) * "assist with medical efforts" * CentComm official description change * give cburn ert mask * Ert medic hardsuit uses blood-red medic values * description changes, they all used to use the blood-red description * ert engineer hardsuit uses cburn values, good for handling all possible engineering problems. * janitor hardsuit uses cburn values for extreme messes, otherwise we'd send the non eva variant. * spawn suffix changes * shorten suffix * drop armor from ert jumpsuits * drop armor from DS jumpsuit * add more armor to death squad to make up for removed armor in the uniform. * give sec gas masks armor, give syndicate gas masks armor. ERT gas mask uses syndicate mask values * add nanotrasen * removed duplicate * give centcom IDs their hud icon * replace all ert bulletproof armor with basic universal armor * replace all oxygen tanks with air tanks; species is random. * remove gun and meds from ert engineer kit * give ert engineer materials * remove weapons and meds from janitor ert * give ert janitor light replacer * remove ert sec pulse weapons, admins will assign loadout. Either the lecter or enforcer, probably. * Give ert sec the security pistol kit * typo * give eva ert sec pistol * give eva janitor ert gas mask * give jani purple gloves * medical gloves for medical ert * replicate security loadout to leader * quick ert lecter spawns for lazy admins * better suffixes to find them easier * add cburn to ertspawn * Replace "Spawn" with "role" * Add death squad. Give ert engineer gas analyzer. * death squad using wrong equipment * typo * missing ghost roles on lecter loadouts * add freedom implanter to deathsquad * deathsquad ghost role text * Operative sounds better * give Ds flashbang box (why isn't it entirely filled?) * fix typo. add energy shield to DS * fix typos * all centcomm roles are now mindshielded. These cannot be removed. * Rider didnt include some of the changes ? * give zipties instead of cuffs for mass arrests! * upgrade ERT survival boxes to extended capacity * give cburn extended oxygen too Automatic changelog update Restore Leviathan's 80 pop cap (#21281) Un-revert IPlayerManager refactor (#21244) Update engine to v172.0.0 (#21288) Bandaid tests (#21292) rename the rocks (#21275) Make crystals noRot (#21279) IDK might be better. Ideally the anchoring would be offset 0-0 but this is the world we live in atm. Fix nukies sound not played (#21268) * Play sound and sending greeting message works for nukies now!!!!! * oops * silly change Automatic changelog update Fix hijack objective (#21241) * Fix hijack * Max difficulty Remove GridModifiedEvent (#21291) Update submodule to 173.0.0 (#21296) Fix namespace error (#21298) Update yaml sequence option in editorconfig (#21297) Fix namespace (#21299) fix cburn bag issue, make new bag entity for them and filled bag entity (#21295) Health analyzer UI improve (#17280) Automatic changelog update User accessible playtime (#21242) Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Automatic changelog update Moves cloning comp & cloning event to shared (#21253) Generalizes solution overflow & slightly increases space lube yield (#21094) * generalize SolutionSpikeOverflowEvent * let reactions overflow * spacelube: 3 -> 5 * restore TryMixAndOverflow threshold cap Automatic changelog update Move ActorComponent to shared (#21293) Update engine to v174.0.0 (#21311) Fix planet command help message (#21312) Wearable bee plush (#20623) * add * fix * temporary change, needs fixing * mayb fix * actually fix FR * yes Automatic changelog update remove pulse rifle from ert medic (#21310) Content audio (#20862) Automatic changelog update Update submodule to 175.0.0 (#21318) Revert "Update submodule to 175.0.0 (#21318)" (#21319) Atomic bomb add uranium (#21143) * fix: Incendiary bullets no longer deal cold, acid, or shock damage that ignores all armor. * Atomic bomb Action bugfixes (#21321) Disable OOC during round (#21323) Fix PDA notifications when creating a news entry using the Mass-Media console. (#21320) Automatic changelog update Update belt.yml (#21317) changes the chief engineer's belt to remove the lv wires (they take up a lot of space and are easy to get anyways) in exchange for a holofan, a t-ray, and a gas analyzer (first time coding ever this might have to be edited) New foam sprites (edge sprites) (#21308) * New foam sprites (icon smoothing) * changed to edge sprites for foam * fix * edges for metal foams * fix Fix bola stam damage, bring back old construction requirements (#21340) Automatic changelog update Added thermal insulation to flannel jackets (#21273) Automatic changelog update Space Asshole Gear (#21243) * Add Space Asshole Coat * Add sledgehammer * Adjust sledgehammer damage values * Add copyright string to sledgehammer Fix broken slot highlight in midnight theme. (#21331) * removed old ensurecomps, stubs removed dead code leads removed redundant ensurecomps sync sync no more squiggles.. last build error updated maps for testing some issue with receiving arrivals setup networkpayload refactor. TODO: accurate timings timings accurate. TODO: backport old bugfix all set? cleaned up source. TODO: diff arrivals methods cleaned component. TODO: escape polish, docs first documentation pass escape timers work no more magic numbers removed dead code leads textscreen documentation remove redundant ensurecomps * sync * new shuttletimer sprite/offset * sync * sync * sync * sync * sync * builds * sync * sync * sync * offset adjustments * timer pattern implemented * arrivals timer system seems to work * sync * sync * sync * sync * sync * sync * sync * sync * sync * sync * implements shuttletimers * centcomm timers * set color to tg 1097fb * textscreen -> signalscreen, shuttletimer -> screen * move screens out of timer.yml * pruned unused properties/imports * license+copyright for screen.rsi * forgor change signaltimer event handler doc * roundstart arrivals ftl logic * block signaltimer screentext updates during timing * merged robust 185 * centcomm carpet uid collision PLEASE MERGE MY PR * remove arrivalssystem entitymanager dependency * refactored magic strings, added roundend getters * specific vgstation sprite commit licensing --------- |
||
|
|
b87fcdb622 |
Remove uses of TransformComponent.ChildEntities (#22442)
* Make output of ChildEnumerator non-nullable * Remove uses of ChildEntities * poke tests --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
|
|
dfc7e3938f | Restricted range cleanup (#22402) | ||
|
|
b99ebcf56b | Turn arrivals into a planetmap (#21777) | ||
|
|
fd2cc8570d |
Sync master up to 1/10 (#74)
* Automatic changelog update * Make NPC names proper nouns & fix some genders (#20534) * Proper names & genders * Uppercase proper names * Make Smile female * fix bingus wrinkly head (#20531) * rouny meat and steak (#20526) * lost friendship flavor * add rouny steak * rouny special meat * rouny meat textures --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311) * Explosive wet floor sign & janitorial suicide vest * fix attributions * Remove name & desc from explosive wet floor sign * Make wet floor sign chameleonable * Automatic changelog update * Minor slippery stuff (#20535) * Update submodule to 162.2.0 (#20570) * Predicted armor (#20560) * clean up some lines in smile the slime prototype (#20552) * Revert "Use full file path for temp replays (#19002)" (#20545) * Add EyesGlasses into ClothesMate (#20523) * Automatic changelog update * Fix Punpun crew monitor sensor (#20484) * Automatic changelog update * EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394) Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Make arcades hackable again (#20555) * Automatic changelog update * Health alert tweaks (#20557) * Automatic changelog update * Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564) * Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent * Nukeops todo and cleanup * Remove Active field * Add EndedGameRuleComponent * bartender suit (#20521) * give me a drink bartender * guh * aARG * Necropolis and mine walls (#20578) * Automatic changelog update * archaic accent tweaks (#20567) * Automatic changelog update * Add confirmation to kick and respawn in the admin player actions panel (#20542) * Remove windows-latest CI runs, remove unused build-test-release.yml (#20540) * Change .editorconfig to keep existing attribute arrangement (#20538) * Automatic changelog update * Catch replay start and end errors on round restarts (#20565) * Update trivial components to use auto comp states (#20539) * Fix role unbans not applying in real time (#20547) * Disable AHelp buttons when no player is selected, update button styling (#20568) * Automatic changelog update * Added a toggle fullscreen button (default F11) (#20272) * Added a toggle fullscreen button (default F11) * Removed un-needed comments * Review Requested Changes * Fixed Acidental Spacing Change * bwoink, removed extraneous code * nothing, litterally * Automatic changelog update * Fix not networking markings (#20588) * Automatic changelog update * Update RobustToolbox to v162.2.1 (#20590) * Automatic changelog update * Glorfcode (force say on damage/stun/crit) (#20562) * Automatic changelog update * Fix AHelp progressively showing more AHelp panels (#20591) * Automatic changelog update * caninsert entitystorage tweaks (#20589) * Automatic changelog update * Fix mapping actions crashing on load (#20592) * Fix loading a map with a ThirstComponent crashing the game (#20594) * Fix electrocution displaying real name of disguised players (#20603) * Organ fixes (#20488) * Automatic changelog update * Kettle medical rework (#20435) * Initial try at medical rework for kettle * Re-add decal decorations to Kettle's medical * Add more lockers to kettle's med * Actually upload kettle's map, not its proto * Automatic changelog update * Added blocked visuals to volumetric pump (#20610) * Automatic changelog update * Move TimedDespawn to engine (#20515) * Update submodule to 163.0.0 (#20616) * Remove v0.1 version number from local main menu screen (#20617) * Remove cloneData parameter from AutoNetworkedField (#20596) * Update submodule to 164.0.0 (#20618) * fix cognizine ghost role (#20632) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Move ID layer one pixel to correct alignment (#20630) * Update nukie hardsuit descriptions (#20529) * Make holofans destructable (#20445) * Automatic changelog update * bowl is open (#20453) Co-authored-by: deltanedas <@deltanedas:kde.org> * Add TestPair.WaitCommand() (#20615) * Rename ThreatPrototype and mark fields as required (#20611) * Adjust hard bomb shape (#20608) * dragon refactor, objectives and use GenericAntag (#20201) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Added generic empty liquids tank (#20563) * Move view variables verb to the top of the list with no category and localize it (#20546) * saltern update (#20325) Co-authored-by: deltanedas <@deltanedas:kde.org> * Fix followers leaking (#20643) * Add Winter Boots (#20622) * add * fix prototype * Add QM mantle (#20621) * add * fix prototype * Automatic changelog update * Slime mobs breathe nitrogen and resprite their organs (#20577) * Slimes breathe nitrogen and resprite their organs * ups * mmm * Automatic changelog update * Fix the new lizard horn's consistency + issue (#20620) * fix * add * Revert "add" This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711. * Add RandomHumanoidAppearance component to for space ninjas (#20605) * Automatic changelog update * Space cat breathes space (#20550) * Space cat breathes space Made Space Cat lungs ROBUST * Made Space Cat's lungs ROBUST 2.0 * Automatic changelog update * Wide anomaly locator (#20581) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * add textures * fix encoding * fix 2 * Automatic changelog update * Fixed Telescopic Shield Lighting (#20650) * Fixed Telescopic Shield Lighting Bug fix #20199 * no need for these at all --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Add a special hardsuit for nukie medic (#20471) * Automatic changelog update * Carry over other mutations when doing species mutation (#20551) * Automatic changelog update * Add Spanish accent to poncho and sombrero (#20377) --------- Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com> Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com> Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Co-authored-by: Miro Kavaliou <miraslauk@gmail.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com> Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com> Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com> Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com> |
||
|
|
bc097c7b4d | Teleport noobs off Arrivals shuttle to spawn (#17189) | ||
|
|
13b4bc2c56 |
Build a leaner list during spawn selection (#18597)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> |
||
|
|
e92a8fedab |
Refactor stations to properly use entity prototypes. (stationsv3) (#16570)
* Update StationSpawningSystem.cs Web-edit to allow feeding in an existing entity. * Update StationSpawningSystem.cs value type moment * Update StationSpawningSystem.cs * Oh goddamnit this is a refactor now. * awawawa * aaaaaaaaaaa * ee * forgot records. * no records? no records. * What's in a name? * Sloth forcing me to do the refactor properly smh. * e * optional evac in test. * tests pls work * awa --------- Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com> |
||
|
|
676405f08f | Auto-orient rotation for arrivals (#16417) | ||
|
|
fc61b9da62 | Use string for arrivals map cvar (#15104) | ||
|
|
a0e7ce2005 | Add PreventPilot to arrivals source (#14899) | ||
|
|
626dfa05cd | Adds arrivals blacklist (#14882) | ||
|
|
448165ffda |
Escape pods (#14809)
* Namespace adjustments for days * pod * thanks rider * Fix the oop launch * Fixes * Fix stuff * eeeeeeeee * Fix * access * map * forgor * thing * Genericise escape pod fill |
||
|
|
a8214c05d4 | Add tagged airlock for arrivals (#14785) | ||
|
|
9932fe5c07 |
Arrivals tweaks (#14773)
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com> |
||
|
|
f3a06a0696 |
Add arrivals (#14755)
* Arrivals * More arrivals and shitty uhh preload * cvar * a * clockin + maps * shitter prevention * Placement * a * cvar for tests and dev * weh |