18 Commits

Author	SHA1	Message	Date
ScarKy0	189ebe61ab	Seperate EMAG into EMAG and Authentication Disruptor (#34337) ... (cherry picked from commit 253a9fbdf1372f80dad65a80dcb8e5d169861804)	2025-09-20 20:34:13 +03:00
Nemanja	bb3abfb654	Recycler Overhaul (#30802) ... * Recycler overhaul * remove (cherry picked from commit 476c7751c4989645fb735c9533bb67bbf85c0091)	2025-07-16 17:08:18 +10:00
sleepyyapril	885ee5a831	Wizmerge for Station AI (#1351) ... <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description the adding AI is now up to y'all because i'm not touching loadout code for name datasets, but it shouldn't be too bad from here --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com> Co-authored-by: Saphire <lattice@saphi.re> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com> Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net> Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Julian Giebel <juliangiebel@live.de> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: TGRCDev <tgrc@tgrc.dev> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: Fildrance <fildrance@gmail.com> Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com> Co-authored-by: archrbx <punk.gear5260@fastmail.com> Co-authored-by: Radezolid <snappednexus@gmail.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: EmoGarbage404 <retron404@gmail.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: neuPanda <chriseparton@gmail.com> Co-authored-by: neuPanda <spainman0@yahoo.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com> (cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb)	2025-01-14 00:13:42 +03:00
Remuchi	cebab3b3f6	[Upstream] Upstream. Yappie (#50) ... * Fix Prize Balls' Pet Rock (#831) # Description This PR fixes an undetected bug in Prize Balls where an error would occur if a prize ball tried to give out a BasePetRock. --- No CL No Fun Signed-off-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * More/Better Tips (#844) # Description This PR adds several new Tips that are specific to Einstein-Engines. I also removed some tips that are completely irrelevant to the game. These should be as a whole, relevant only to SS14 and Einstein Engines. While some joke tips are probably fine, they should still be game relevant. # Changelog 🆑 - add: Several new tips have been added to the game, many of which reference new content available on Einstein-Engines. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#844) # Conflicts: # Resources/Changelog/Changelog.yml * Fix some Things with Interaction Verbs (#854) # Description Fixes: - Interaction verbs being usable regardless of whether the user can access the target (I checked for CanInteract but not CanAccess 😭), which fixes #836 - Certain close-range verbs having a ridiculous 2-tile range (now it's 1.2, similarly to hugging and other things) - Certain locale strings missing This also separates verb checks into its own method in the interaction verb system and adds more error messages instead of one generic "some requirements are not met". # Changelog 🆑 - fix: Fixed a couple issues with the new interaction verb system. * Automatic Changelog Update (#854) * Fix Colored Jumpskirts Actually Being Skirts (#848) # Description This matters for Birbs. All Colored Jumpskirts were incorrectly parented to Jumpsuit and not Jumpskirt, meaning that Harpies couldn't wear them. This fixes that issue. # Changelog 🆑 - add: Due to NUMEROUS complaints, NanoTrasen has swapped the sticker labels on all colored jumpskirts to correctly state that they are infact, "Skirts", so now they can legally be worn by Harpies, Lamia, and Arachne. * Automatic Changelog Update (#848) * Ports Trait Rebalance From Floof (#842) # Description This PR ports my trait balance changes from Floof. You can find the PR for that repo at https://github.com/Fansana/floofstation1/pull/170. --- # Changelog 🆑 - tweak: The cost of many traits have been updated - tweak: A few traits have been tweaked --------- Signed-off-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Co-authored-by: Fansana <116083121+Fansana@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#842) * Roboticist (#801) # Description By a (somewhat) popular request from floofstation, this adds the roboticist job (each existing map gets 1 job slot, since robotics on each of them is just one tiny room that's more similar to a broom closet than a subdepartament). The job is purely cosmetical and does not offer any new accesses since that would require changing a lot of maps and would probably make being a scientist in the absense of a roboticist miserable. If needed, roboticists can always build blast doors on the entrance to robotics, as someone has done before in my experience. This also adds the robotics PDA, robotics ID card, robotics satchel, backpack, and duffel (duffel icon taken from paradise station, rest of the sprites is respective science bags recolored by me to match the palette of the icon). This also increases the capacity of mystagogue's science PDA box to incorporate the new PDA type. <details><summary><h1>Media</h1></summary> <p>      </p> </details> --- # Changelog 🆑 - add: A new Roboticist job has been added. The job does not offer any new accesses, but lets you distinguish yourself from scientists. Existing maps will need to be updated to support the new job. - add: Added new PDA, ID, and bag variants for roboticists. The mystagogue will now also find a roboticist PDA in their office. --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> * Automatic Changelog Update (#801) * Loadouts V3 (#736) # Description Resolves #723 Resolves #708 Resolves #691 Resolves #671 Resolves #643 Adding/removing loadouts and categories (and trait stuff) will require disconnecting and reconnecting to the server (or anything that will reload the lobby UI) due to how I've done my caching. --- # TODO - [x] Test entity IDs from loadouts - [x] Better Tab Container - [x] Scroll props - [x] Margin props - [x] Make vertical work - [x] Merge buttons - [x] Subcategories - [x] Allow the same for traits (their tab is completely broken) - [x] Give the Job Picker tab a BoxContainer - [x] Different selected unusable color - [x] Deselect unusable button - Sort menu/Reverse sort direction button - [x] Fix scroll resetting on updating - [x] Cache loadouts - [x] Ensure everything that can affect reqs updates everything that checks reqs - [x] More Requirements - [x] Height - [x] Width - [x] Weight - [x] Gender - [x] Sex - Markings - [x] Logic - [x] And - [x] Or - [x] Xor - [x] Item groups - [x] #643 - Something better than `Exclusive` - Allow picking slots for things to go in (hands and inventories too) - [x] Add a background to the loadout spriteView - [x] Get better style colors --- - [ ] More PRs - [ ] Remove duplicate command loadouts that are outside the command folders/categories - [ ] Categorize job loadouts (By dept?) - [ ] Fix [every loadout](https://discord.com/channels/1218698320155906090/1218698321053356060/1279260210208440361)'s IDs (who reviewed them??) - [ ] Make loadout ID migrations? --- <details><summary><h1>Media</h1></summary> <p> ## New loadouts/traits UI <!--    -->   ## NeoTabContainer allows changing the tab orientation ### https://youtu.be/krg8TJoQG3I   </p> </details> --- # Changelog 🆑 - fix: The loadout/trait editors' performance has been improved by 100~1000x - tweak: The character editor's tabs look, feel, and function much better - fix: Unusable loadouts/traits have an orange color when selected - tweak: Loadout previews are now inside the button - add: Added a button to remove any unusable loadouts (or traits) you have selected - add: Loadouts and traits can have subcategories, though only Command loadouts use them at the moment - fix: Fixed empty loadout categories not hiding - fix: Fixed spacing on some loadout requirements' reason text - fix: Fixed traits not updating after saving # Conflicts: # Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs # Resources/Locale/en-US/customization/character-requirements.ftl # Resources/Prototypes/Loadouts/Jobs/service.yml * Automatic Changelog Update (#736) * Fix For Discord Changelog (#869) Signed-off-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Civilian Uniform Loadout Group (#872) # Description I'm going to split the other groups into their own PRs, next up is Shoes. This PR adds all of the "Civilian" uniforms to the first of what will be many new Loadout Groups, and now takes the opportunity to significantly cut down on the loadout point costs of all non-job uniforms. Now the overwhelming majority of them are 0 or 1 point, with rare few examples being only 2 points. The tradeoff for this is that you are limited to a single selection of civilian uniforms to take with you to the station, presumably in addition to your job uniform as a spare outfit, if desired. Next up, shoes. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/47804a59-189d-4432-bac9-0b010c50f61e </p> </details> --- # Changelog 🆑 - add: The first of all new loadout groups has been added, Civilian Uniforms. Only one civilian uniform can be selected, in exchange for... - tweak: All non-job specific uniforms have had their points reduced drastically, almost all of them down to 0 points, with only a tiny handful at 2 points, and the rest as 1. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Shoes Loadout Group (#873) # Description This is the next PR after https://github.com/Simple-Station/Einstein-Engines/pull/872 This time adding an item group for Shoes, and drastically cutting down on the base cost of shoes to compensate. # Changelog 🆑 - tweak: The cost of all shoes in loadouts has been reduced, in most cases to 0. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Hat Loadout Group (#876) # Description Cheaper Hats # Changelog 🆑 - tweak: All non-job specific headgear has been significantly reduced in Loadout point costs, most of them to 0. * Outerclothes Loadout Group (#877) # Description And now Outerwear. :) # Changelog 🆑 - tweak: All non-job outerwear has had their Loadout point costs significantly reduced. * Gloves Loadout Group (#878) # Description Gloves Next. Woo. # Changelog 🆑 - tweak: All gloves have had their Loadout point costs reduced, many to 0. * Miscellaneous Item Groups (#880) # Description This is the last of the Loadout Item Group PRs I'm going to do for now. This PR adds several more than the previous ones, primarily to split up the Items tab into several distinct groups so as to push down the costs of many items. In particular, the new groups are: 1. Smokes 2. Lighters 3. Instruments 4. Air tanks 5. Box Kits(Survival Boxes or Medkits) 6. Writables Survival boxes sharing an Item Group with Medkits is kind of intentional here. Both of them take up a SIGNIFICANT amount of your starting inventory space. Now we can have free survival kits once again, but also have as an option, where you can elect to spend some of your loadout points to take a personal Medkit instead of a survival box. You can think of it as an upgrade over a standard survival kit. :) # Changelog 🆑 - tweak: Item groups for Smokes, Lighters, Instruments, Air Tanks, SurvivalBoxes/Medkits, and Writable items have been added. All items in these categories have received discounts to their costs, and in some cases have become free. # Conflicts: # Resources/Prototypes/Loadouts/items.yml * Neck Loadout Group (#874) # Description And another one! This time Neck slot items. Sequel to https://github.com/Simple-Station/Einstein-Engines/pull/872 # Changelog 🆑 - tweak: All neck slot Loadout items have had their costs significantly reduced, most of them to 0. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#872) * Automatic Changelog Update (#874) * Eyewear Loadout Group (#879) # Description Now for Eyes... Last one to do is split apart the "Items" tab. # Changelog 🆑 - tweak: Eyewear have had their loadout point costs significantly reduced. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Masks Loadout Group (#875) # Description Yet another sequel to https://github.com/Simple-Station/Einstein-Engines/pull/872 This time Masks # Changelog 🆑 - tweak: All masks have had their loadout point costs substantially reduced. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#879) * Automatic Changelog Update (#875) * Update discord-changelog.yml (#881) Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Revert "[Feature] Short Construction System / Система Крафтов В Руках (#17)" This reverts commit 5f67b5e429. * [Feature] Shortcut Construction System (#861) # Description Interacting with some materials now opens up the radial menu with some often used recipes. Port from White Dream. --- # Why? It looks cool I guess. Also required by Blood Cult. --- <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/8207ea19-f4a3-45e1-b6f2-c870b46b6837 </p> </details> --- # Changelog 🆑 - add: Interacting with some materials now opens the radial menu containing some of the most used recipes of that material. * Automatic Changelog Update (#861) * fix: a few fixes * Make Height Sliders Affect Your Bloodstream Volume (#858) # Description Something that just makes sense, this makes your effect character weight affect your bloodstream volume. As a minimum size felinid you will get 33% of normal blood volume, whereas as something as huge as a lamia you may get up to 3 times the normal blood volume. The resulting volume of your bloodstream can be calculated as `V = clamp(normal_volume * mass_contest ^ 0.6)` (assuming default parameters), where mass_contest is the result of a mass contest between your entity and the average humanoid. For average species like vulps, this means that their bloodstream can become up to ~40% smaller than normal (at minimum size), or up to 50% larger than normal (at maximum size). For onis the range is shifted towards higher values, a maximum size oni will have twice as much blood as an average human. This has both drawbacks and advantages. For instance, having little blood means you can bleed out easily, but at the same time it means it will take way less blood packs/saline/iron/proteins to restore your blood to the normal level. Opposite is also true, having more blood means you will be harder to heal. Also, this PR slightly refactors the HeightAdjustSystem to be more flexible. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/951c2391-09d8-4a4a-812b-a2394862fadd </p> </details> # Changelog 🆑 - add: Your character size now affects your blood level. Smaller characters will have less blood, and larger characters will have more. --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#858) * Change Slime Scream (#849) # Description This PR replaces slime_scream_f2.ogg with a modified version of Voice/Human/femalescream_5.ogg. The original scream doesn't feel like it belongs in SS14 with the other slime sounds (laugh, cry, sigh, etc). --- # Changelog 🆑 router - tweak: Female slimes no longer have movie screams. * Automatic Changelog Update (#849) # Conflicts: # Resources/Changelog/Changelog.yml * Make Hugging/Petting Interactions Affect Mood (#823) # Description Something that was omitted in #733. Hugging and petting now give positive moodlets. The petting interaction was split into two: one for animals and one for humanoids. The one for animals improves both your own mood and the mood of the animal, whereas petting a humanoid only improves their own mood. In addition to all that, being hugged and being pet do not stack. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/47e8f722-44ee-4d03-a580-65a2946a1920 </p> </details> # Changelog 🆑 - tweak: Hugging and petting interactions now influence mood, just like the old hugging. --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Display Language Fonts/Colors in Chat Bubbles (#812) # Description 4 FTL lines changed Finally them native GC speakers will know what language to respond in when speaking to us <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/68d1b1b2-373d-4f98-958d-3659b7cff440 </p> </details> # Changelog 🆑 - add: Chat bubbles now use the font & color of the language of the message. * TraitSystem Component Removals (Anomalous Positronics Trait) (#885) # Description This PR implements a new functionality for Traits, while also making clever use of the new Loadouts Version 3.0 addition of logic gates. Traits have been extended to now also allow for Component Removals, ostensibly so that traits can remove species Innate traits. In theory this could also be used to completely wipe a pre-existing component, and then let the trait fully replace it with a new component. To make use of this feature, I've added a new trait called Anomalous Positronics, which allows for IPCs to "Buy off" their innate Psionic Insulation, and thus allow them to be psionic. The previously existing psionic traits that required you not be an IPC, now make use of new logic gates to require that you are either not an IPC, or have the AnomalousPositronics trait. Additionally, roundstart psion jobs, like the Mystagogue, Mantis, Chaplain, also all now have a check for "Not IPC, OR has AnomalousPositronics". Finally, thanks to the logic gates, it's now possible to simultaneously disallow the roundstart psions from buying Latent Psychic, while also still allowing the Chaplain and Librarian to buy Natural Telepath. # Changelog 🆑 - add: Traits now allow for full component removals, enabling traits that directly remove innate species traits without the need to hardcode new systems for it. Or, to allow species components to be fully removed as preparation for being replaced with a new component. - add: Anomalous Positronics has been added as a new trait. It removes the psionic insulation from IPCs, allowing them to be affected by psionics, as well as take roundstart psion jobs like the Mystagogue, and also buying traits such as Latent Psychic. - remove: NormalVisionComponent and NormalVisionSystem have been removed. The NormalVision trait now uses TraitSystem.RemoveTraitComponents to do its work. - add: Chaplain and Cataloguer can now purchase Natural Telepath. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Cherry-Pick "Shrimp Mob for Metempsychosis (#862)" (#882) # Description Cherry-picks https://github.com/deltaV-Station/delta-v/pull/862 on behalf of the author. This was not tested; need someone to check if it actually works before merging. # Changelog 🆑 - add: A shrimp morphotype was added to the failure pool of the metempsychotic machine. --------- Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> * Automatic Changelog Update (#812) * Automatic Changelog Update (#882) * Fix Translators Not Working Correctly Under Certain Conditions (#834) # Description This completely refactors the translator system, fixing various issues, such as being unable to hold multiple translators at once normally, entity languages not getting updated properly if a translator was removed from it via stripping or similar, etc. Also fixes translators being utter shitcode. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/239f831b-7262-4980-932d-c6231dcecf72 </p> </details> # Changelog 🆑 - fix: Multiple issues with translators were fixed. Additionally, you can now hold multiple handheld translators at once without issues. * Automatic Changelog Update (#834) * Re-Enable Recycler Gibbing (#822) # Description WAITER, WAITER, PLEASE FEED ME MORE FELINIDS. # Changelog 🆑 - add: Recyclers can now once again eat people when emagged. - add: The ability for emagged Recyclers to eat people is now controlled by the CVar "reclaimer.allow_gibbing". - add: Recyclers require power to eat people. No more dragging emagged recyclers into crowds. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Adds a Toy Which Makes Bwoink Sound (#759) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> This adds a toy hammer based on the old BanHammer from ss13 which was a joke toy that made a bwoink sound. It also had a really old description which made minor fun of the russian translation changing it to 'bangammer' and 'reisin' which I decided to keep for the veterans. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 - add: Added bwoink hammer with bwoink sound --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#822) * AddPsionicPower Command (#807) # Description This PR adds a new console command for directly adding psionic powers to an entity. Should an entity not already be psionic, this command will additionally make them psionic. # Changelog 🆑 - add: A new console command, AddPsionicPower has been added. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#759) * Automatic Changelog Update (#807) * Fix Maps Missing Assistants (#838) # Description Glacier, Core, and Saltern were missing their assistant job slots(My mistake, when the Linter said I needed to set the Overflow job, I assumed it meant "Replace the [-1, -1] slot with the Overflow", but apparently both are needed. Additionally, Glacier, Core, and Saltern are now added to the Map Pool. 🆑 - add: Glacier, Core, and Saltern now have assistant job slots. - add: Glacier, Core, and Saltern are now able to be voted on for map selection. * Automatic Changelog Update (#838) * Update Clothing Assignments of Suit/Skirt (#857) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Changes some outfits, notably the Operative Jumpskirt, Kimono, Dark/Light Monastic Robes, and the Gladiator Uniform to be assigned as skirts, rather than suits. This allows harpies to wear them. In addition, the UnsensoredClothingSkirtBase base now possesses the 'ClothMade' tag, allowing moths to eat outfits with this base. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 - tweak: Fixes a few typos in outfit descriptions - fix: The Kimono, Dark/Light Monastic Robes, Gladiator Uniform, and Operative Jumpskirt should be properly considered jumpskirts, and are by extension wearable for harpies. - fix: Moths should be able to eat outfits with the UnsensoredClothingSkirtBase parent. * Americanize Contests System (#814) # Description I have updated the Contests System to make it safe to use by Americans. This is accomplished by adding very helpful warning labels, as well as restricting the Range of all its functions so that they cannot return either a negative number, or a zero. Therefore, all Contests are now perfectly safe to divide by. # Changelog 🆑 - tweak: ContestsSystem(Mass Contest, Stamina Contest, Health Contest, Mind Contest, Mood Contest, and Every Contest) have all been updated to be safe to divide by, since it is no longer possible for them to ever return 0. Instead they will just return 0.0000000000000000000000000000000000000000000001401298, so if you divide by an unclamped contest, I hope you like your function randomly returning the 32bit integer limit. - add: Warning labels have been added to all Contests to make them comply with the demands of the American consumer market. * Step Trigger Minor Refactor (#884) # Description I made this PR in response to a bug report from Floof, where it was discovered that a "Minimum Size Felinid or Harpy" is instantaneously killed by mouse traps. Which confused me, because Felinids and Harpies are intended to be immune to floor traps like landmines, glass, and mouse traps. Then I discovered that mouse traps overwrite the step trigger cancellation, meaning that mouse traps will just completely ignore a Felinid/Harpy canceling the step trigger. Additionally, to my endless frustration, the Felinid/Harpy floor trap immunity is handled by a Tag and not a Component, which isn't really acceptable in this day and age. I decided to take a little bit of a different approach to this problem, first by doing the usual code cleanup to EE standards. Then by adding a new StepTriggerImmuneComponent. This component acts as an early-exit for the entire StepTriggerSystem, immediately at the initial entrypoint, during the CanTrigger bool. This component is given to Felinids and Harpies by default, representing their "Extremely low density bodies" having too much surface area and not enough mass to trigger floor traps. Effectively, they are now working as originally intended, by having immunity to setting off landmines. Because we have a trait point system, and this is coincidentally also a trait requested by Nuclear14, I have gone ahead and created a Trait that gives this component to anyone willing to pay the points for it. # Changelog 🆑 - fix: Felinids and Harpies will now correctly never set off floor traps, such as landmines and mouse traps. - add: Trap Avoider has been added as a new trait, allowing characters to buy the innate ability to avoid floor traps. I would have named this "Light Step", after the trait from Fallout that shares its name and effect, but someone already gave that name to a different trait entirely. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> * Automatic Changelog Update (#884) # Conflicts: # Resources/Changelog/Changelog.yml * Fix Logic Requirements Not Checking Inversion (#891) * Split Arm And Leg Markings (#870) # Description It's time to finally rip off a bandaid, and cease fucking with awful layer garbage and marking workarounds. This PR completely removes the Arms and Legs marking categories, replacing them with: 1. Right Arm 2. Right Hand 3. Left Arm 4. Left Hand 5. Right Leg 6. Right Foot 7. Left Leg 8. Left Foot Finally, removing harpy layer shitcode is within our grasp. <details><summary><h1>Media</h1></summary> <p>   </p> </details> # Changelog 🆑 - add: Arm and Leg markings are now split between individual arms, hands, legs, and feet. * Automatic Changelog Update (#870) * feat: перевод ченджлога * fix: fix maid and hobo * fix: fixed hobo and maids loadouts --------- Signed-off-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Signed-off-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> Co-authored-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: Fansana <116083121+Fansana@users.noreply.github.com> Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Co-authored-by: router <messagebus@vk.com> Co-authored-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com> Co-authored-by: Blu <79374236+BlueHNT@users.noreply.github.com> Co-authored-by: Tirochora <leotabletdb@gmail.com>	2024-09-09 23:06:49 +07:00
SimpleStation14	dfeb3b986d	Mirror: Fix Recycled Containers Deleting Items Inside Them (#267) ... ## Mirror of PR #26045: [Fix recycled containers deleting items inside them](https://github.com/space-wizards/space-station-14/pull/26045) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `d7484ae9f57477a5ec5c575e3077aa94c0564db6` PR opened by <img src="https://avatars.githubusercontent.com/u/83650252?v=4" width="16"/><a href="https://github.com/SlamBamActionman"> SlamBamActionman</a> at 2024-03-12 16:16:42 UTC --- PR changed 2 files with 19 additions and 1 deletions. The PR had the following labels: - Status: Awaiting Changes --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > > Right now you can delete any item that fits in a survival box by placing it inside of one and then recycling the box in a Recycler/Material Reclaimer. This PR fixes this by dumping out any item inside containers. > > - For Reclaimers, any recyclable items inside the container get placed on top of the Reclaimer. > - For Recyclers, any recyclable items inside the container get recursively recycled as well. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > I doubt it's intended behavior to be able to effectively delete any item that fits in a box. Also ensures a recycled box provides the correct amount of material as its contents also get recycled. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > > When trying to recycle, once all checks are passed it iterates through the object's containers if it has any and dumps out any items onto the machine doing the recycling. > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> >  > The result of recycling a survival box in a Recycler/Reclaimer. > > - [x] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > 🆑 > - fix: Recyclers no longer delete items stored inside of recycled entities. > </details> --------- Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <evilexecutive@gmail.com>	2024-07-11 17:43:32 -07:00
Pieter-Jan Briers	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)	2024-03-07 00:57:05 +01:00
TemporalOroboros	aebae6fab7	Content ecs containers (#22484) ... (cherry picked from commit 7a77d6d5dd73a34be238fdebc284da5bc2917c67)	2024-01-22 18:47:55 +01:00
Debug	e829b13651	Update SharedMaterialReclaimerSystem.cs (#503) ... Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>	2023-12-03 00:58:58 +00:00
metalgearsloth	b1ee2d48ff	Unrevert audio (#21330) ... Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>	2023-12-02 20:16:36 +01:00
ShadowCommander	60ed4e80d4	Fix sound on material reclaimer (#21030) ... * Fix saw sound error on client The sound tried to play using shared PlayPvs which doesn't work on client. PlayPredicted handles client and server. Fixed NextSound not playing again while continuously gibbing items. * Fix duplicate splat sound on Recycler gibbing	2023-10-20 15:29:04 +02:00
Debug	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>	2023-10-03 14:15:46 -05:00
Nemanja	235da3812a	fix recycler (#19590)	2023-08-27 17:01:53 -06:00
metalgearsloth	735626654a	Remove FixtureId (#19280)	2023-08-23 18:55:58 +10:00
Sailor	459660ed92	Fix Murdertron 5000 a/k/a Emagged recycler (#18892) ... * Fix gibbing humans * Millions must gib * Workplace accident * Everything alive goes into the recycler * Review	2023-08-13 19:54:52 -04:00
Nemanja	98fa00a21f	Borgs (#18136) ... * Laws * positronic brain and PAI rewrite * MMI * MMI pt. 2 * borg brain transfer * Roleban support, Borg job (WIP), the end of mind shenaniganry * battery drain, item slot cleanup, alerts * visuals * fix this pt1 * fix this pt2 * Modules, Lingering Stacks, Better borg flashlight * Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power. * sprotes * no zombie borgs * oh fuck yeah i love a good relay * charger * fix the tiniest of sprite issues * adjustable names * a functional UI???? * foobar * more modules * this shit for some reason * upstream * genericize selectable borg modules * upstream again * holy fucking shit * i love christ * proper construction * da job * AA borgs * and boom more shit * admin logs * laws redux * ok just do this rq * oh boy that looks like modules * oh shit research * testos passo * so much shit holy fuck * fuckit we SHIP * last minute snags * should've gotten me on a better day	2023-08-12 16:39:58 -05:00
Leon Friedrich	2bd5fb3736	Remove obsolete Fixture.Body references (#16259)	2023-05-09 17:21:26 +10:00
Nemanja	2d78c50f3e	fix material reclaimer sound issue (#15278) ... * fix material reclaimer sound issue * this, too	2023-04-10 16:30:33 -05:00
Nemanja	57f2a768a0	Material Reclaimer (#14969) ... * Material Reclaimer * Fix this test * autostack output, tweak volume, add upgrade examine * whitelist AND blacklist support why not * trying so hard to get this fucking test to work * EmoGarbage delves into MaterialArbitrageTest, never to return * VV and restore cloth to glory * make the system more robust * even more stuff has composition; add blacklist for important items * fix test fails * convert recycling * forgor :sadge: * lol * simply a modiCUM of doc commentary	2023-04-09 23:38:20 -05:00