срал на головы людей#2
Closed
Diamant00 wants to merge 463 commits intoHellCatten:masterfrom
Diamant00:master
Closed
срал на головы людей#2Diamant00 wants to merge 463 commits intoHellCatten:masterfrom Diamant00:master
Diamant00 wants to merge 463 commits intoHellCatten:masterfrom
Diamant00:master
Conversation
# Description This PR makes it so that Glimmer Mites can only spawn on "The Main Station", as defined by GetSpawnableStations. Yes this is seemingly pretty hardcodey, but because on our codebase it's simply not possible for GetSpawnableStations to ever return anything other than a list with an index of 0, we can extremely reliably count on GetSpawnableStations()[0] to be "THE Station". This fixes an issue whereby Glimmer Mites can spawn in places where it is simply not possible for players to reach them. Such as random asteroids in space, CENTCOMM, Nukie World, or the Syndicate Listening Outpost. # Changelog :cl: - fix: Glimmer Mites can no longer spawn anywhere other than "THE" Station.
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Add a Custom Specie Name for servers that wishes to allow players to have custom names. This simply add some variables to the Profile/Humanoid, meaning copying the profile will keep the custom names. By default its is disabled, for servers owners wishing to enable those please edit the Specie Prototype and add: ``` customName: true ``` Enabling it will make it able for players to edit the specie name of the selected specie, and will have the window enabled. This is my first time fucking with Profile and Database, i fucking hate it. --- <!-- 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 `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Custom Species Names. --------- Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com>
# Description This PR adds several hardsuits to a new "hardsuits" category for the cargo menu. This is part of an ongoing effort to provide reworks to Salvage gameplay. This should pair quite well with merging Frontier's changes to Salvage Expeditions, as well as a variety of other changes I've been talking about. My theory is that if Expeditions are changed to provide money rewards deposited directly to the station's account, then Salvage can benefit the station by A: Providing station funds whether they want to or not. And B: Be encouraged to do so because by getting cargo a shitload of money, they will be able to directly buy the equipment needed to go on higher tier expeditions. And to do this without needing to gamble on wrecks for 2 hours straight, desperately hoping you get the specific wreck that contains that security hardsuit. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Logistics can now directly order a variety of hardsuits. "NT In-Network" hardsuits being substantially cheaper thanks to backroom deals. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
# Description This PR adds a new "Head of Security's Antique Weapon Collection" item group to loadouts, which fully replaces the weapons that were originally map-specific entries for the Head of Security. Instead of whatever map giving the HoS a unique weapon in his office(And thus, overloading him with entirely too many guns), all of these weapons(And a few new ones) have been placed in their own special loadout category for the HoS. The HoS is entitled to a single free pick from any of these weapons. Now here's the fun tradeoff. All of them are steal objectives. Since it turns out the game will never give a steal objective to a traitor for an item that doesn't exist, I can actually make steal objectives for items obtainable only via Loadouts. Thus, all of the special weapons that the HoS can spawn with can be targeted by traitors. <details><summary><h1>Media</h1></summary> <p>      </p> </details> # Changelog :cl: - remove: The X-01 multiphase energy gun has been removed from the HoS locker. - add: A new Loadout Item Group, "Head of Security's Antique Weapon Collection" has been added. Rather than being given a unique weapon by whatever map creators put in the HoS Office, each Head of Security is entitled to a single item selected from this new loadout category, free of charge. But beware, whatever item chosen from this list may potentially be used as a Steal Objective for traitors. You may have a fancy new submachine gun, but it also makes you a target. - add: antique Bulldog, antique C-20r submachine gun, x-01 multiphase energy gun, antique energy sword, antique pulse pistol, antique Wt550, and a pair of Katana Sheaths have all been added as loadout options for the Head of Security.
# Conflicts: # Resources/Changelog/Changelog.yml
<!-- 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 PR Port the RadStation map from Estação Pirata RadStation is a map made by CRISO, ported from BeeStation from ss13 to Estação Pirata, I made some updates to make the map playable on EE --- # 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 --> --- <!-- 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 `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A map called "RadStation" has been added to rotation. - add: A new Evac shuttle called "emergency_neol" has been added to RadStation # Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Resources/Prototypes/Maps/Pools/default.yml
# Description So you can actually muzzle a felinid to stop them from meowing. Or a vulp from barking. Or a human from screaming. You get the point. This muzzle part of this PR is a bit hardcode-y, but it's because the muzzle simply adds a replacement accent to the entity instead of using its own system to block speech. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/0e5e4986-d2a0-471a-a119-579741265178 </p> </details> # Changelog :cl: - add: Sleeping and muzzled entities can no longer use vocal emotes (scream, meow, etc).
# Description This PR adds new ores in the form of Bluespace and Normality ores, the former being just as rare as artifact fragments, and the latter being even rarer still. These ores can be mined by salvage, will generate on asteroids or expeditions, and can be processed in an ore processor into bluespace or normality crystals, which Epistemics can use to create psionic related objects. Note that the two are currently indistinguishable from the other until you actually mine them. Yes this DOES infact make it easier to make glimmer drains and probers. I need this as an excuse to make psionics even more dangerous. <details><summary><h1>Media</h1></summary> <p>    </p> </details> # Changelog :cl: - add: Added Bluespace and Normality ore as very rare ore types. Salvage can occasionally find these ores on Asteroids or on Expedition planets. Bluespace and Normality Ore can be smelted in an Ore Processor into Bluespace and Normality Crystals. Make sure to bring these to Epistemics so that they can do their job. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
# 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 :cl: - fix: Fixes the arrivals shuttle choosing to correct docking port.
<!-- 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 is an emercency fix regarding Custom Name, apprently this is fucked... wow... Regarding DB issues please @DEATHB4DEFEAT review or check if you can assist or anyone. Thank you. --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Custom Specie Name! --------- Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
<!-- 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 meow. Project compiles and starts. Is the bug gone? I hope so. --- # Changelog :cl: - fix: Latejoin antag selection should respect player's antag preferences. --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
<!-- 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 add the missing tags for webs for Oneirophage to hide in webs (works tested on floof) Overall Oneirophage need more changes, languages, psionic, ect but so far this is needed. --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Oneirophage is once more psionic invisible in webs. Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
# Description This reverts most code changes done by Simple-Station/Einstein-Engines#939 and re-implements them in a better way: - Players can now toggle under-furniture crawling with a keybind (shift-R by default) - Crawling that way is 50% slower for obvious balancing reasons - The respective cvar for it is now true by default and prevents players from beginning the "crawl under furniture" thing Also cleaned up a few methods I was seriously pissed off by. There is still a lot to clean up and fix, but I will leave it for a dedicated PR in the future. # Why (balancing) Let me lie on the bed instead of under it!!!!!!! <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/5f04c82a-b88b-4005-8052-a1a6f011bcc9 </p> </details> # Changelog :cl: - add: You can now toggle crawling under furniture! The default keybind is Shift-R, you can change it in settings.
They also didn't have `:`s like everything else. # Changelog :cl: - tweak: Made the show clothing/loadouts button labels more clear Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
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>
# Description This is a fucking stupid method of irreversible round removal. Gib someone and then eat their brain instantly. This PR makes brains not food, so that they can't be eaten instantly. # Changelog :cl: - tweak: Brains now can no longer be eaten.
# Description This PR adds several new "High Cost Physical Traits", that each follows a theme of Transhumanism. Bionic augmentations that provide the user some benefit, typically at a very high cost. <details><summary><h1>Media</h1></summary> <p>     </p> </details> # Changelog :cl: - add: Added 8 new Physical Traits. These are, Cyber-Eyes Basic System(Plus 4 different modular options), Bionic Arm, Dermal Armor, and Platelet Factories. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
# Description Showing some love to our hard-working couriers. This cherry-picks the following PRs from delta-v: - DeltaV-Station/Delta-v#1472 - Adds a MailMetrics PDA cartridge for couriers and the LO - DeltaV-Station/Delta-v#1652 - Ports mail tweaks from frontier to delta-v, adding large packages, RPDs (mail cannons), and more mail - DeltaV-Station/Delta-v#1788 - Adding a couple more packages - DeltaV-Station/Delta-v#1925 - Fixing the non-functional "last known location" part of mail descriptions Some mail items, such as the opporozidone syringe and rainbow joints/blunts, had to be disabled because we don't have them (yet?) <details><summary><h1>Media</h1></summary> <p>       </p> </details> --- # Changelog :cl: - add: The Courier and Logistics Officer now have a new program in their PDA for tracking mail delivery performance, including earnings and percent of packages opened, damaged, or expired. - add: The list of possible mail packages has been greately expanded, and now includes large parcels. - add: The CourierDrobe now offers a rapid mail delivery device, along with capsules for it. --------- Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com> Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com> Co-authored-by: byte <50130120+huckleton@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Adeinitas <147965189+adeinitas@users.noreply.github.com> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone <whatstone3@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: Milon <plmilonpl@gmail.com> # Conflicts: # Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
* missing nukies can be filled in by ghost roles (#28316) (cherry picked from commit 229c3cd729e1e928961d6130f54e139f12a50b75) * tweak: some nuke numbers * fix: yaml --------- Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
* [Tweak] AGhost Action Icons * fuck * fuckingfuck * finally
* This * fix * fix2
Update xenopet.yml
add: medbelt inmedidrobe tweak: glasses, hud and eyepatch from nanomed to medidrobe Co-authored-by: islambrosgood <you@example.com>
* Вернул прежнее величие главе персонала * Добавил недостающие доступы ХоПу Добавил главе персонала почти все доступы, за исключением оружейной, глав ( исключение КМ) и судебных ролей * Фиксы комментариев Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> * Фиксы комментариев Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> * Фиксы комментариев Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> * Фиксы комментариев --------- Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
* Resomi (#27) * resomi * locale + fix sprites * displacements * add sprites (not full (need to check up)) + agillity skill * some stuff * -_- * фыф * add * fix * Add sprites * localisation * fix * вы нахуй меня дрочите?!! --------- Co-authored-by: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com> * Create species.ftl * first (#116) * fix null * fixiki * more fixikov * outer metas * migrate * fix rsi validation * fix yaml linter * build fix * more migrate * one more migrate --------- Co-authored-by: pofitlo <kuzminvladislav237@gmail.com> Co-authored-by: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
* feat: remove requred wielding from many guns Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> * feat: craftable tiny fans and drains Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> * fix: smgs are now proper smgs Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> * Apply suggestions from code review Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> --------- Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Contributor
|
Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation. You can move your current work from the master branch to another branch by branching from and resetting the master branch. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Описание PR
Описание.
Медиа
Список
Изменения
🆑