80 Commits

Author	SHA1	Message	Date
Fghj240	6b2409065a	Empaths is now a component instead of a trait (#93680) ... ## About The Pull Request Empath has become a component instead of a trait, letting it store variables or whatever components are good for. Also, it works slightly differently for empath quirk users and moon heretics alike. Additionally: - You can only shiver when you see an evil person once. After that it won't happen again. - Empaths no longer get a mood debuff from seeing someone distressed. - Moon heretic empaths no longer get smited by evil people. - Moon heretic empaths aren't scared of evil people. The component also supports empaths being able to tell if a fake dead body is actually dead, and being able to use empath on yourself, but those aren't enabled for the empath quirk or moon heretics. (Self-empath would probably powercreep self aware) ## Why It's Good For The Game While the empath quirk is incompatible with the evil quirk, the trait wasn't. That means you could potentially become an evil empath and still feel bad about other people feeling bad and get smited by other evil people. Being an empath is different from having empathy, and there's now a personality trait (compassionate) that has a very similar feature so the mood debuff got axed and moon heretics can't get smited by mending touch anymore. I think being a heretic and looking into pierced realities probably means you have the mental fortitude to not freak out when you see an evil person. Evil people are (probably) a lot less scary than whatever mind destroying thing is in those holes. As for the only-getting-scared-once bit, freaking out when you see an evil person is flavorful but annoying after it happens multiple times. Especially if it happens after examining the same person multiple times.	2025-11-06 18:04:07 -06:00
Ghom	ca2cc70322	Organ damage refactor/cleanup (#93436) ... ## About The Pull Request So, my original goal was just a refactor for the emissive overlays of eyes, as a way to implement the specular emissive introduced by smartkar some time ago, but somehow I found myself dragged into a bigger refactor or cleanup of organ damage, thresholds, failures. One of the main problem was that there were no procs called when a organ suffered enough damage to fail or when recovering from failure. It'd just enable or disable a bitflag, leaving it up to subtypes to decide how to tackle organ failure their own ways: diverse, funky and sometimes incompatible. More often than not relying on their very own "update_thingamajig" kinda procs that run whenever the organ takes damage, rather than just when the threshold is reached (low, high, failure. There are however a couple organs with their own quirky thresholds, I let those slide). There's also a bit of old code, especially for ears, with the `AdjustEarDamage` and temporary deafness both predating the framework for organ damage as far as I know. It really needed a coat of fresh paint. Oh, there were also more than a handful of organs that still heavily relied on some ORGAN_TRAIT source instead of the `organ_traits` list and the two add/remove procs `add_organ_trait` or `remove_organ_trait`. This include organs that lose or gain specific traits when failing et viceversa. ~~Lastly, felinids (and the halloween ghost species) having reflective eyes. It's just a nod to the tapetum lucidum that animals with night vision often have (including cats), which is why their eyes are a bit brighter in the dark. Felinids however, do not have night vision (nor do ghosts). This is merely cosmetic.~~ Cut out for the time being due to issues with the specular emissive... ## Why It's Good For The Game Refactoring / cleaning up old organ code. ## Changelog 🆑 refactor: Refactored organ damage code a little. Hopefully there won't be issues (otherwise report them). /🆑	2025-10-21 16:52:28 -05:00
EnterTheJake	a2c7c8e57b	Heretic Antagonist Full Overhaul. (#92119) ... ## About The Pull Request Heretic has received a complete overhaul. This PR touches nearly every aspect of the antagonist. For readability's sake, not every change is going to be listed in this pull request. For the full list of changes please refer to the design doc: https://hackmd.io/@BiST8PJVRjiwVPY86U3bLQ/B11HyChz1g. Code by Me, @Xander3359 and @Arturlang TGUI by @Arturlang Sprites by OrcaCora and GregorDM Writing bits by @necromanceranne ### Core changes - Cross-pathing has been removed. Main knowledge spells are now exclusive to their path (for the most part). - For every main knowledge unlocked (save for the robes and the blade upgrade), Heretics can choose one option from a draft of 3 random side knowledges (this is a free point). - Heretics can now purchase side knowledges from a new tab, the "Knowledge Shop". Side-knowledges have been divided by tier (Stealth, Defense, Summons, Combat and Main). Tiers are unlocked as you progress toward your main path. - Heretics now gain the grasp and mark upgrade immediately, but their main knowledge choices cost twice as much (except for the first spell, the robes and the blade upgrade). - Path specific robes have been introduced! They come with their own set of quirks. - Each Path has received a passive ability. This passive is upgraded when you first create your robes, and again when you complete the Ritual of Knowledge. - Paths have been rebalanced as a result of the removal of cross-path progression. Cosmic and Moon paths have received soft reworks. - Upon unlocking the path 2nd level or reaching a total of 8 points worth of knowledge, Heretics will lose the ability to blade break (and the limit on blades all together). - Ascension now automatically calls the shuttle with no possibility of a recall. - Late join Heretic has been removed. ### New UI <img width="750" height="635" alt="moon path ui" src="https://github.com/user-attachments/assets/184ef783-5c9c-48a1-a2f7-4807ca93e990" /> ### Knowledge shop <img width="787" height="669" alt="Knowledge shop" src="https://github.com/user-attachments/assets/3dc89b84-8c70-4d47-b612-54396e3ea6e7" /> ### Quality of life //General balance changes - Heretics will now gain X-ray vision for a few seconds when nearby an eldritch essence (this effect has a cooldown). - Ritual of knowledge now requires 1 uncommon item instead of 2. You may now use a stunprod instead of a baton to complete the ritual. Beartraps have been removed from the list of possible reagents. - The maximum number of possible sacrifices required to ascend has been reduced from 6 to 5 while the minimum has been upped to 4. - Codex Cicatrix no longer requires a special pen to be made. ### Passive abilities - Heretics now start with a passive ability. You can find what it does on the path info tab after a path has been selected, and what they gain when upgraded. - Crafting your first set of Eldritch robes will bump your passive to level 2. - Unlocking the 2nd level will subsequently unlock your "Ritual Of Knowledge" - Completing the ritual of knowledge or ascending will net you the final level. ### Path Specific Robes - Armorer's Ritual is no longer a side knowledge. Each path will have their own unique version of the ritual. This is placed after the 2nd spell in the tree. - Robes can no longer be destroyed by fire and acid, grant t4 flash protection (Moth Heretics stay winning) and protection against basic syringes, to bring them on par with other antagonist's armor sets. - The recipe to craft the robes is now a set of armor/vest, a mask (any mask will do now, not just gas masks), plus the unique reagent required for the blades (Plasma for Cosmic, Trash For Rust, match for Ash and so on) - Wearing the robes as a non-heretic may yield some unfortunate side-effects. ### Moon Path Rework Moon path rework. Moon Heretics gain immunity to brain traumas and slowly regenerate brain health. Equipping the moon amulette channels its effects through the moon blade; making it unblockable and cause sanity damage instead of brute. Ring leader's Rise now summons an army of harmless clones that explode when attacked; the explosion briefly stuns non-heretics and cause sanity and brain damage to them. Moon blade can also now be used when pacified and Moon spells are no longer blocked by regular anti magic, only mind magic protection. **Cosmic Path Rework** Cosmic path has received the biggest batch of changes alongside Moon. The path has been dead last in ascension and pickrate (less than 5%) for almost 2 years. It did gain some popularity over the last few months, reaching the highest ascension rate in the game (12%) while mantaining a relatively low pickrate. Cosmic sits in a weird spot, where pretty much every knowledge surrounding the path is either mediocre or, in the case of the ascension, dysfunctional. Yet it has maintained a smidge of relevancy due to how quickly Cosmic heretics can capture and sacrifice targets thanks to Star Touch. As a result, the best course of action would be to rebalance the entirety of the kit; granting the heretic more tools to manipulate space and dictate the flow of a fight, while lessening their ability to end a confrontation by instantly sleeping their opponents. lastly The Star Gazer is now ghost controlled ; And they shoot lazers! <img width="636" height="451" alt="gazer gag 3" src="https://github.com/user-attachments/assets/601d6881-c042-4e42-8ce6-ac90cd27848b" /> ## Why It's Good For The Game ### Ok...but why do we want this? Again, if you want my full reasoning, please check my doc https://hackmd.io/@BiST8PJVRjiwVPY86U3bLQ/B11HyChz1g. To keep it short and concise; Heretic is too complex and unintuitive for its own good. Too impenetrable for new players and too abusable for experienced players. This can be chalked up to a lot of poor design decisions. But ultimately, what I believe being the biggest contributor to the current status of Heretic is the ability to move into different paths, also known as "Cross-Pathing". ### Cross Pathing my beloathed. Cross-pathing, while cool in theory, overcomplicates the antagonist and overloads them with power. Players dealing with the heretic are incapable of working out what a given heretic can do. This also leads to late game heretics having 3 rows Worth of action buttons and virtually no weakness. Over the last year, I've often received the understandable but also kind of unfair accusations of making Heretic too powerful without a clear aim or purpose. My goal with the paths I've reworked over the last year (Rust,Void and Blade) wasn't necessarily to just make them stronger (although that was also part of the goal, as they were paths that were underperforming), but for them to have more interactions with the sandbox and to better live up to the fantasy presented to the player. If an harbringer of frost gets countered by a cup of coffee, we probably messed something up. Unfortunately, the current incarnation of Heretic doesn't really allow for surgical balance changes to specific paths. Every time a knowledge gets buffed, we make every path that can easily tap onto that knowledge stronger by default. It doesn't take a genius to understand why this system is ultimately unsustainable. ### Blade Breaking I feel that after a heretic has reached the near peak of their power, they no longer need the ability to instantly escape any encounter. Check my doc for my full reasoning. ## Less versatile, more specialized paths. By removing cross-pathing, we remove a huge maintainability burden from the antagonist. Paths can now be designed around clearer strengths and weaknesses. They become easier to balance and less of an headache to understand for everyone. It also means we can give paths some needed quality of life quirks without having to worry how such a change might have a knock-on effect for other paths. Ash heretics can finally let loose without dying by their own flames. Cosmic Heretic can go to space without having to carry a modsuit. Moon Heretic can use their abilities without fear of one random trauma ruining their day, and so on. ### What a horrible night to have a curse...., wait how do I curse people again? As of right now the heretic tree has quite a hefty amount of trinkets that pretty much never see use. Partly because the tree itself is a nightmare to navigate. And partly because why would anyone set up an elaborate plan or scheme when they can unleash 2 rows of spell in the span of bunch of seconds. Heretics mostly gravitate towards powers that push them towards greater, more potent combat strength. If it doesn't contribute to killing people quicker, it isn't worth doing for most. And given the opportunity cost associated for taking those powers, they will remain that way so long as there are better choices to be poached. The new draft system encourages Heretics to play more with the tools at their disposal. If you want to go for a specific combo from the side path options, you may now do so by tapping into the knowledge shop. Yes, the shop does include a few knowledges from the other paths. But these are limited to 1 per path, are very expensive and can only be unlocked very late into the shift. ## Drip Of the Mansus The iconic heretic robe is actually sequestered to a side path that is most easily access by only two paths at a time. Since heretic paths are being made to be much more specialized, the most obvious way in which this can be showcased is through an easily identifiable outfit. By using the robes, we can both telegraph WHAT heretic you are looking at, and just how much power they've accumulated and when it is reasonable to take the kid gloves off and treat them as a genuine threat. If a heretic is in their robes, that heretic is now a significantly more prominent danger to the station. It also serves as a useful means for gating some of the more powerful effects of a heretic's path behind the robes, AND enable options for disarming them of that power should they be captured without making it something endemic to their mob. A major problem with heretics is a lack of certainty as to how powerful they have become. A heretics robes is one of the milestones to help players dealing with heretics identify that. ### Will this be 100% fair and balanced? This is a massive overhaul to a pretty complex and bloated antagonist. I've done my best to show the changes to several maintainers and other members of the community for their feedback. But at some point we'll have to see how this behave in the environment to get a feel if something is over or undertuned. (that's my way of saying, yes this is likely gonna require a testmerge or two). What I will say is that I'm not trying to change the core identity of Heretic. Heretics should have the upperhand in single encounters early on, be able to joust a small group of players after they unlock their final spell, and end the round when they ascend. They're a progression antagonist. They should retain their payoff as well as pose a danger as they grow stronger. But if more players feel like they are more reliably able to play the antagonist in more varied and interesting ways, rather than the antagonist largely existing as a measuring stick for 'robustness' due to its elitist design philosophy, then the rework has been a success. There should be something for everyone in the antagonist, as is true for all of our antagonist roles.	2025-10-15 22:34:51 +00:00
MrMelbert	44acefa73f	More things use trait huds over raw hud management (#93084)	2025-10-02 21:36:40 +02:00
MrMelbert	3ea7b03369	Accentuate the positive with **Personality**: A (soft) mood rework (#92941) ... Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>	2025-10-02 19:00:13 +00:00
Ghom	76b933fd4b	Underwater basketweaving recipes are hidden unless you've the skillchip (#92979) ... ## About The Pull Request The recipes are locked behind a particular skillchip anyway. We might as well just use the framework for learnable recipes instead of relying on a particular trait with no other use to it. This also prevents these recipes from showing in the menu even if the requirements aren't met. ## Why It's Good For The Game See above. ## Changelog 🆑 refactor: Underwater basketweaving refactored so it doesn't show in the crafting menu unless you've the skillchip active. /🆑	2025-09-15 16:41:01 -07:00
RusselNotSCP	72580ce0bb	Adds Various Classic Cocktails (#92955) ... ## About The Pull Request TL;DR: "What do you mean we didn't have an old fashioned in the game before?" This adds a bunch of different classic cocktails to the game that I always felt were rather odd holes in the lineup of drinks that bartenders could make, as well as a few less classic ones 'cause why not. Adds thirteen new alcoholic drinks and one non alcoholic one. Mechanically relevant drinks include the Blue Blazer and Hot Toddy which warm you up like coffee, Bitters and Soda which settles upset stomachs, and the Suffering Bastard which, in it's role as a hangover cure, calms nausea, prevents headaches, and very slowly heals brain damage, giving a way to heal chip brain damage that doesn't require chemistry or surgery. Full list here: https://hackmd.io/@0lHAWBNkSXixU4v6xxYS_w/SkjlmIbsgx <img width="439" height="435" alt="drinks" src="https://github.com/user-attachments/assets/406ca285-63af-49d4-b0e8-176edb251291" /> PS This is basically my first real project and also my first time spriting for anything, so I would really appreciate any advice or reccomendations. ## Why It's Good For The Game More variety for service is always nice, but also many of these drinks are extremely commonly ordered in real world bars. Adding them here fills some weird gaps in the bar's line up, allows people to order more drinks that they personally like, and decreases the amount of awkward interactions in which people order a drink that they're familiar with and then get confused when a partender somehow can't give them an daiquiri despite having everything to make it. ## Changelog 🆑 add: You can now make 15 new classic (and some less classic) cocktails. Includes old standards like the Old Fashioned, Daiquiri, Ramos Gin Fizz, and more! /🆑	2025-09-14 21:17:27 -04:00
MrMelbert	7c0973ccf4	Refactors names and voices / potted plants no longer conceal voice (just appearance) / honorifics show on examine (#92781) ... ## About The Pull Request Closes #92778 Closes #86829 <img width="347" height="39" alt="image" src="https://github.com/user-attachments/assets/c50bd1ff-8c00-47a7-a31a-617fae2adc5b" /> 1. Splits `TRAIT_UNKNOWN` into `TRAIT_UNKNOWN_APPEARANCE` and `TRAIT_UNKNOWN_VOICE` 2. Renames some stuff like `getvoice` and `getspecialvoice` 3. Gets rid some crummy signals around `get_visible_name` and `get_voice` 4. Heads now apply the disfigured trait when relevant (rather than snowflake checking for damage amount) 5. Ling voice refactored into using special voice (it was only used by a viro symptom anyways; I don't anticipate this overlap being problematic) 6. Mask voice changer refactored into a trait ## Why It's Good For The Game Potted plants shouldn't have magical voice concealing powers - especially not over radio, but not over in person either. It's a damn plant So I addressed this by refactoring our face and voice system. Overall things should be a lot cleaner and easier to use. ## Changelog 🆑 Melbert refactor: Refactored a lot of code relating to human face and voice, ie, what shows up in examine and in say. Report anything odd when examining people, with ID cards, when talking over radio, or when disguised refcator: Refactored how you get disfigured when your head's super damaged refactor: Refactored ling mimic voice and traitor voice changer del: Potted plants no longer hide voice. They still hide appearance, though qol: Honorifics now show in examine / in world, rather than only when speaking. /🆑	2025-09-12 17:11:06 +02:00
Ghom	940d73aeae	replaces the health variable for fishes with integrity (#92192) ... ## About The Pull Request Because fish is an item, it inherits the use of integrity from objects, however it also has its own health variable. For consistency, ~~damaging its integrity should also lower its health and healing it should also recover its integrity. Fish has a max integrity that's double its health. I've also renamed `adjust_health` to `set_health` since it doesn't adjust the health by the provided value but sets it to said value.~~ I've scrapped the latter to instead use integrity. ## Why It's Good For The Game A small bit of consistency. If you shoot a fish with a laser gun, wouldn't it die?	2025-08-04 22:30:53 -05:00
Jacquerel	19b0e734a8	Fixes changeling void adaption (#91626) ... ## About The Pull Request This PR changes `TRAIT_SPACEBREATHING` from a lung trait to a mob trait, and simultaneously renames it to the much less snappy but simultaneously more specific `TRAIT_NO_BREATHLESS_DAMAGE` This proc technically does not allow you to breathe specifically in space, it only bypasses any checks for minimum levels of gases regardless of if you are in space or not At the same time I implemented it for basic mobs, just because I can. I don't think they have any way of gaining it, but if some future dev was going to make a temporary buff that lets something breathe in space now it could also work on basic mobs. ## Why It's Good For The Game This is how developers expected the trait to work and no longer requires that the mob have lungs to be used ## Changelog 🆑 fix: Changelings with Void Adaption can once again breathe in space /🆑	2025-06-19 00:12:25 -04:00
SmArtKar	b4061f1800	[MDB IGNORE] Blood Refactor Chapter 2: Collector's Edition (#91054) ... ## About The Pull Request Refactors most of blood handling code untouched by #90593 and completely rewrites all blood decals, components and reagents. - Blood types now have behavioral flags which allow them to control where they leave decals/DNA/viruses. Oil no longer transfers DNA and viruses with it, while podpeople water-blood doesn't leave visible decals on turfs and items, but still can be picked up by DNA scanners. - Multiple blood types have received unique handling - liquid electricity blood now glows in the dark, oil trails are flammable and lube ones are slippery. Oil blood can be restored with fuel, lube with silicon and slime with stable plasma (as normal plasma already passively regenerates their blood), instead of everything using iron. Saline solution only supplements on iron-based blood and won't do anything to help with bloodloss for species who rely on different blood types. (Roundstart this applies only to Ethereals) - All blood logic has been moved away from the blood reagent itself into a blood element that is assigned to the blood reagent by default, and to any reagent that's drawn from a mob as their "blood" (in ``transfer_blood_to``). This means that blood you draw from lizards will be green and have lizard's blood description instead of mentioning red blood cells, Ethereal "blood" will actually contain their DNA and genes, etc. - Refactored all blood decals. Blood states are no more, everything is now handled via blood DNA. Credits to MrMelbert and Maplestation, as a significant amount of code has been taken from https://github.com/MrMelbert/MapleStationCode/pull/436 and many of his followup PRs. Oil and xenomorph splatters are now subtypes of blood, blood drying is now animated, blood trails now curve and can be diagonal. - Rewrote bloodysoles and bloody_spreader components, credits to Melbert again for the former, while latter now makes more sense with its interactions. Bloody soles no longer share blood DNA with your hands. - Ported Melbert's bloody footprint sprites and bot-blood-spreading functionality. - Removed all species-side reagent interactions, instead they're handled by said species' livers. (This previously included exotic blood handling, thus the removal) - Slightly optimized human rendering by removing inbetween overlay holders for clothing when they're not needed. - Blood-transmitted diseases will now get added to many more decals than before. - Cleaned up and partially refactored replica pods, fixed an issue where monkeys/manipulators were unable to harvest mindless pods. - Exotic bloodtype on species now automatically assigns their blood reagent, without the need to assign them separately. - Clown mobs now bleed (with colorful reagent instead of blood during april fools), and so do vatbeasts (lizard blood) - Implemented generic procs for handling bleeding checks, all sorts of scanners now also correctly call your blood for what it is. - Podpeople's guts are now lime-green like their organs, instead of being weirdly greyish like their water-blood. (Their bleeding overlays are still grey, as they're bleeding water) - Slimepeople now can bleed. Their jelly is pale purple in color, but their wound overlays copy their body color. - Injecting/spraying/splashing/etc mob with a reagent preserves its data, so you could theoretically recycle fine wines from someone's bloodstream - Fixed burdened chaplain's sect never actually giving a blessing when applying effects, and giving a blessing when nothing can be healed. Inverted check strikes again. - Closes #91039 #### Examples A lot of blood here has dried, visually the blood colors are almost exactly the same as before either of the blood refactors.  	2025-05-31 19:38:07 -05:00
SmArtKar	a5eed384ce	Colorblindness now prevents you from seeing wire colors (#91315) ... Being colorblind now makes you see all wires in tones of grey. Also fixes the eyechart not taking the monochromacy quirk into account when checking for colorblindness Makes the quirk/trauma a bit more immersive and can lead to funny situations when you know which color to cut but can't find it.	2025-05-28 09:45:20 -04:00
Cirrial	379e2a0ee0	Refactor: Moves throwing and giving items from /mob/living/carbon to /mob/living (#91049) ... ## About The Pull Request Given the existence of basic mobs with hand slots, it feels like throwing and giving items shouldn't be something exclusive to carbon mobs, so I've pulled things around to make this happen. The only basic mobs with hands at time of writing are gorillas and dextrous holoparasites, but the inability to throw things when you're a gorilla just doesn't seem right to me. Some more details about what I've done here: - Made the dextrous component optionally enable throwing for the mob it's added to. - Moved offer/give item functionality to /mob/living (I can't see any reason why only carbon mobs should have this option) - Moved throwing and give item hotkeys from carbon to "human" (where all the other /mob/living hotkeys go) and, as a result, removed carbon hotkeys (nothing is left in them). - Moved throwing code and item offering code to its own file because living.dm is 3000+ lines long and should probably be broken up some day (I'm not brave enough for that) - Cleaned up an unused global signal that hasn't been used since dogs got moved to basic mobs. - Other miscellaneous cleanup where I noticed it. - In terms of testing: Tested using gorillas (only checked the dextrous holoparasite to confirm the button and hotkeys worked). Things that were working: - Can throw items if the mob is set up to allow it. - Can give items as a gorilla to a human, as a human to a gorilla, and as a human to a human. - Can give a high five to a gorilla (and the gorilla can receive it). Gorillas can't give a high five back, though (they don't have the emote), this already ballooned in scope, someone else can make that happen. - There are an alarmingly high amount of niche emote-into-item-into-giving behaviours I suspect half the playerbase or more aren't even aware of (does anyone offer their hand to someone to get them up off of the ground?) and I don't know if I broke any of them with this, but the fact high fives work gives me some hope they're probably still fine. ## Why It's Good For The Game Lets gorillas and dextrous holoparasites throw things and give things, but most importantly sets up more framework for any future dextrous basic mobs to also be able to do this. There's no real reason to keep this functionality confined to carbon mobs when dextrous basic mobs are a thing. ## Changelog 🆑 add: Gorillas can now throw things and offer items to players. refactor: Moved throwing and offering item code to be based on living mobs, not just carbon mobs. /🆑 --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>	2025-05-22 09:02:28 +02:00
Jacquerel	5c08ae27ed	Adds "deep water" that you can drown in (#90587)	2025-04-21 08:06:06 -07:00
Tim	36788ee05f	Weather DLC - Make it Rain Anything! (#89550) ... ## About The Pull Request ##### Disclaimer - Some of the code/icons/sounds were ported from TMGC. Introducing more weather types! And yes, you can now have rain be reagent based! <details> <summary>Regular Rain</summary>  </details> <details> <summary>Blood Rain</summary>  </details> <details> <summary>Acid Rain</summary>  </details> You can even make it rain ants, plasma, or drugs. All of their effects get applied to turfs, objects, and mobs depending on the weather options you select. Did I mention... there is thunder? <details> <summary>Thunder Strikes</summary>  </details> <details> <summary>Sand Storms</summary>  </details> Despite all this new stuff, none of it has been directly added to the game but the code can be used in the future for: - Wizard event - Similar to lava on floor, but this time make the reagent random or picked from a list and give wizard immunity - Chaplain ability - Maybe make this a benefit or ability once enough favor has been obtained - Admin events - I have added a BUNCH of admin tooling to run customized weather events that let you control a lot of options - New station maps/biomes for downstreams (Jungle Station, etc.) - Change Ion storms to use the new weather system that triggers EMP/thunder effects across the station - IceBox could get plasma rain - Lavaland could get thunder effects applied to ash storms Relevant PRs that removed/added some of the weather stuff I used: - #60303 - #25222 --- #### Attribution - Rain sprites were added via [novaepee](https://github.com/novaepee) in https://github.com/tgstation/TerraGov-Marine-Corps/pull/9675 - Sand sprites were added via [TiviPlus](https://github.com/TiviPlus) (who commissioned them from bimmer) in https://github.com/tgstation/TerraGov-Marine-Corps/pull/4645 - Rain sounds [already existed on tg](https://github.com/tgstation/tgstation/pull/25222#discussion_r106794579) and were provided by provided by Cuboos, using Royalty Free sounds, presumed under default tg sound license - Creative Commons 3.0 BY-SA - Siren sound is from siren.wav by IFartInUrGeneralDirection -- [Freesound](https://freesound.org/s/46092/) -- License: Attribution 4.0 The original `siren.ogg` sound used on a lot of SS13 servers doesn't seem to have any attribution that I could locate. The sound was added about 15 years ago. So I just looked for a somewhat similar sounding siren noise on Freesound. ## Why It's Good For The Game More weather customization! ## Changelog 🆑 add: Added new weather types for rain and sandstorms. Rain now uses a reagent that gets exposed to the turfs, mobs, and objects. There is also a thunder strike setting you can apply to any weather. add: Hydro trays and soil will now add reagents to their trays when exposed to a chemical reaction. (weather, shower, chem spills, foam grenades, etc.) add: Weather temperature now affects weather reagents and mobs body temperature. bal: Snowstorm temperature calculations were tweaked to allow universal weather temperature effects. sound: Added weather sounds from TGMC for rain and sirens (attributed to Cuboos and IFartInUrGeneralDirection ) image: Added weather images from TGMC for rain and sand storms (attributed to Novaepee and Bimmer) refactor: Refactored a lot of the weather code to be more robust admin: Admins can now control more weather related options when running weather events. The weather admin verbs have been moved to their own "Weather" category under the Admin tab. /🆑 --------- Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>	2025-04-07 18:46:28 +02:00
SmArtKar	cf131db497	Cleans up mood and mood-related code (#90162) ... ## About The Pull Request One of my upcoming PRs affects a significant chunk of the codebase so I'm cleaning up messes that I've found along the way. This PR adds wrappers for adjusting sanity/checking if a mob already has a certain moodlet, fixes an oversight where attempting to set sanity over passed maximum would abort the change outright (instead of actually capping it out), moved jolly and depression processing into quirks themselves (instead of having dedicated traits for them used solely by said quirks and nothing else that are constantly checked for by mood datums), and rewrote how blessings return their results to move omen's deletion on blessing effect from constantly checking mood for a blessing moodlet to a comsig. ## Why It's Good For The Game Less jank handling of certain mechanics, we ***really*** shouldn't be checking for blessings every time mood of all things is updated. ## Changelog 🆑 fix: Adjusting sanity over the allowed maximum will no longer completely halt the change, and instead actually cap it at the maximum value. code: Cleaned up mood and mood-adjacent code. /🆑	2025-03-24 13:53:03 +01:00
SmArtKar	d418fd344a	Newspapers give inverse FOV and cover your face (#89924) ... ## About The Pull Request Newspaper now give you inverse FOV (you can see everything outside of a 90 degree cone infront of your face), and prevent others from seeing your whispers. You can counteract this downside by cutting out holes in it using something sharp or pointy, but it'd be pretty obvious that you're peeping at someone.   Empaths also can now "feel" people whisper through masks and helmets. ## Why It's Good For The Game Its really immersive and also pretty funny, a very thematic use case for FOV too. ## Changelog 🆑 add: Newspapers now give you inversed FOV, but you can negate this by poking out holes in them with a sharp or pointy tool. They also prevent people from seeing you whisper. balance: Empaths can now "feel" people whispering even if they can't see their mouth. code: Cleaned up newspaper code. /🆑	2025-03-12 16:00:05 +01:00
SmArtKar	5b7b747e7a	Fixed delusions not updating their planes, made them override screentips and examine names (#89941) ... ## About The Pull Request Similarly to prosopagnosia, they also override your examine and tooltip names now. Closes #89926 ## Changelog 🆑 balance: Delusions now override your examine and tooltip names, similarly to prosopagnosia. fix: Delusions no longer turn you into shadowy blobs when moving between z-levels /🆑	2025-03-12 10:49:43 +01:00
Ghom	f6ccd9fa5d	It's now possible to take trophy fish from previous rounds off the mount (based on RNG). (#89439) ... ## About The Pull Request Instead of immediately dusting, there's now a chance, depending on size and weight (lower is better) as well as the fishing skill of who tries to remove it (higher is better). At no skill (or if the fish is removed indirectly), the odds of it not dusting can be as low as about 3~4% (BIG FISH) and as high as 50% (tiny feesh), while each level in the skill provides an additional 4% to the roll, up to a bonus 28% (legendary level). As always, regardless of RNG, the fish won't be removed from the persistence system if removed from the trophy mount, and only if replaced. This PR also allows trophy fish to retain traits between rounds, but keep in mind the fish starts dead and may have to be revived first. Also trying to sell it will yield a pitiful 1/20 of its theorical export value, much like for fish from fish cases. ## Why It's Good For The Game The persistent trophy fish mount at the bar seems to fare fairly well without outstanding issues so far, so maybe I should let people get their hands on rare and valuable fish from previous rounds, and give players some more practical reasons to place a fish on the mount for future rounds. As long as people don't start beelining the trophy mount by the bar on regular basis. ## Changelog 🆑 balance: It's now possible to take trophy fish from previous shifts off their mounts without turning them into dust based on a probability revolving around the size and weight of the fish against your fishing skill. /🆑	2025-03-07 15:37:13 +01:00
Jacquerel	99869cef92	You can transplant xenomorph tails onto people (#89618) ... ## About The Pull Request This PR allows you to extract tail organs from xenomorphs and surgically attach xenomorph tails to people. (Despite being a carbon the xenomorph sprite is not built out of component overlays so this technically does not remove the tail from its corpse sorry). Having a xenomorph tail makes you better at tackling, changes your tackle verb to "pounce" like if you are a felinid, and also gives you the parkour benefits of the Freerunning quirk.  You can also surgically attach a xenomorph _queen_'s tail to someone. This arguably is a bad idea because it makes you slower (it's much too heavy) but it does give you access to the queen's tail spin attack (after which you will fall over if you aren't inhumanly strong). Also more importantly, it is comically large. ## Why It's Good For The Game Look I'm racking my brain but this one really mostly comes down to "it's funny to do this". But let's pretend that it also increases the depth and complexity of the sandbox and promotes interesting interactions between crewmembers or something like that. Ideally sometimes in the future we will either decide that xenomorphs are not carbons (is it purely because they have organs?) or decide that they _are_ carbons and build them accordingly. In the latter case this will have been a useful addition. ## Changelog 🆑 add: You can transplant xenomorph tails onto people. /🆑	2025-03-01 22:53:14 +11:00
Runi-c	d7130a4598	Make slips eligible for shove stuns (#89313) ... ## About The Pull Request Adds slips to the list of existing shove stun methods originally set in https://github.com/tgstation/tgstation/pull/84640 (wall shoves, telebaton, mansus grasp), and also reifies this concept as the "dazed" status effect. This makes it so that being knocked down from a slip from any source (e.g. wet floor, clown stuff, lube, foam, oil, butterdog) gives the dazed visual effect and makes you eligible for being shove stunned. The status always lasts for 3 seconds even if e.g. slipping on lube knocks you down for 15, but this can be customized per slip. ## Why It's Good For The Game Further rewards environmental play and provides another feasible means of fighting back against better equipped opponents, both in line with the original PR. Also the visual cue fits well as an immediate signal that you're dazed and can't get up. ## Changelog 🆑 balance: slips now make you eligible for being shove stunned /🆑 --------- Co-authored-by: Roryl-c <5150427+Roryl-c@users.noreply.github.com>	2025-02-06 15:37:22 +11:00
SmArtKar	c94e44a834	Implements the missing bezerk medbot skin (#89351) ... ## About The Pull Request  #89341 resprited medbots but didn't resprite the bezerk bot, despite tactical medkits still applying said skin. Also removed an unused trait Closes #89341 ## Why It's Good For The Game Missing sprites are bad ## Changelog 🆑 fix: Tactical medkits should no longer create invisible medbots image: Implemented the missing bezerk medbot skin /🆑	2025-02-05 19:01:42 +01:00
MrMelbert	d49e32cc98	Changes mob height from getter -> updater (#88953) ... ## About The Pull Request `get_mob_height()` is called a lot a lot, and frequently ended up over-timing when it amounted to the same value 98% of the time. Instead we can defer it to only update when we actually change height, or when we pick up a trait or species that changes our height. I also moved the monkey checks out. Made it into a species procs. I know species procs are lame but it seems fine unless we wanna tie to the monkey's chest or limbs or something.	2025-01-14 19:06:34 +00:00
_0Steven	0d26dc635d	Harvesting organs from other players and selling them is now rewarded (#88847)	2025-01-08 17:12:43 +01:00
carlarctg	4d84d0de9b	Rift Fishing (#88619) ... ## About The Pull Request Adds rift fishing to the game.  Drained and undrained influences can be fished in, the latter only by heretics. Fishing in an undrained influence shows a bobber floating over nothing to other people, so don't be stupid! The loot pool includes the following: - Knowledge. Great for heretics, bad for crew. Only actually gives knowledge if fished up in an unopened rift, opening it. One of each heretic potion type. - A wild Fire Shark, hostile to all. - One of each heretic potion, and two flasks of eldritch essence. - Several new fish:  In order: 1. Chrystarfish Cosmostarfishe that snuck into the bluespace compartment of a shuttle engine. Teleports around when eaten. Can be cut into bluespace crystals. Very pointy. 2. Flumpulus Probably not an actual fish. Contains flumpuline, which is in many ways an upgrade to oculine. Except for it occasionally popping your eyes out and replacing them with fungus. It also gets flattened if you land on it, cushioning your fall.  3. Gullion This fish can be cut into two diamonds, and needs no mate to reproduce, making it an excellent way to replenish the station's diamond supply! However, it needs silicon in the fish tank to survive. 4. Walro-Dolphish Weird, amphibious creature. Amazing weapon - high damage, strong piercing wounds, decent block chances. However, it will bite you if you hold it for too long, so be careful! More fish are planned to be added. The PR was split in two to reduce review complexity as the latter half of the fish were increasingly convoluted. Any fishing rod will do for fishing, but heretics are now able to infuse their fishing rod with a grasp:  Infusing the rod will temporarily improve its fishing modifier and give it a unique trait that lets heretics gather 2 influence, rather than 1, from a fished-up rift. If crew fish up a glimpse of the Mansus, they will recieve the same effects as if they examined the rift, and a curse hand will shoot out at them. influences cannot be bombed for fish. ## Why It's Good For The Game Rifts are _extremely_ close to basically just being eldritch pools of liquid that some heretic spilled over the station. It's always stuck out like a sore thumb that we can't fish in them, but now we _can_. (Also, someone needs to PR fishing in a bucket for clowns and mimes.) Fishing in a rift is just one of those things you see some random, innocent assistant do while doing an errand, passively enhancing the round with the sheer ridiculousness of it. Coming back, it's likely you'll see them running from a wild Fire Shark they unwisely dug up from messing with eldritch influences. For Heretics, this is for the most part actively a worse alternative than just doing things normally. But sometimes you don't want to be optimal. Infusing their fishing rod is almost entirely an amusing twist on the blade infusion that blade path has, and they can even infuse other people's rods - make fish not war. Ghommie gave me the fish sprites, and I interpreted them the silliest and most interesting ways I could think of. > Chrystarfish Bluespace's technobabble has finally reached fish. Much like the Gullion, the intention here was primarily some additional, risky way to procure some amount of bluespace crystals and dust that doesn't depend on Mining to do their job, either for the station or for your own stupid plans. (Obviously mining is still the best way to get it, but it's not healthy for the game for them to be the ONLY way to do so!) >Flumpulus  Imagine taking a pill of 'Super oculine!' and suddenly your eyes pop out and are replaced with fungeyes. 10/10 >Gullion Diamonds are extremely scarce on the station and the only way to get more is by mining. I thought adding some rare, restricted way of getting more would be fun for the game, and encourage fish breeding. Parthenogenesis may be a bit much admittedly, but let's just see what happens > Walro-Dolphish The name for this thing kinda sucks. I like the idea of an amphibious fish-weapon like the pikes that actually kinda just hates being wielded around like a stick. It's also piercing to differentiate.  ## Changelog 🆑 Carlarc, Ghommie add: Adds rift fishing to the game. Includes new wacky fish! add: Drained and undrained influences can be fished in, the latter only by heretics. Fishing in an undrained influence shows a bobber floating over nothing to other people, so don't be stupid! add: influences cannot be bombed for fish. add: Heretics can now infuse their fishing rod, and fish for knowledge. /🆑 --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>	2024-12-27 11:25:12 +00:00
jimmyl	2d143692be	gives three tiny buffs the knock heretic path (#88291) ... ## About The Pull Request burglars finesse range increased and it may loot any storage object on the back caretakers refuge cooldown is only applied when exiting refuge labyrinth handbook accepts any crayon instead of a white crayon less balance related: click on an id card with eldritch id card to make it consume it eldritch id portals are slightly smoother ## Why It's Good For The Game burglars finesse will immediately get you valided at max range anyway so lets make it longer caretakers refuge is not that good to need a 2 minute total cooldown the labyrinth handbook recipe is too bad to even consider making it ever, making it use a crayon makes it more accessible and its still not that good of an item anyway ## Changelog 🆑 balance: burglars finesse spell range increased from 4 to 6 and it may loot any back storage object, caretakers refuge cooldown is only applied when exiting refuge, labyrinth handbook accepts any crayon instead of a white crayon qol: you may click an id with the knock heretic id card to make it consume it /🆑	2024-12-07 00:01:35 +01:00
paganiy	115609c113	Adds a new item to the chef traitor's uplink: Molt'Obeso sauce. (#87103) ... ## About The Pull Request A new item for 2 TC has been added to the chef's traitor uplink – Molt'Obeso sauce! Buying it, you get a bottle for 50 units, filled with this sauce. After eating Molt'Obese, you'll think you're still hungry. It also removes the limit on how much food you can eat, so you can just keep going and going, but you never get full. Plus, Molt'Obeso helps your body absorb more nutrients from food, so the food is even more nourishing with it. ## Why It's Good For The Game The Syndicate sabotages the NT station by making everyone fat? ## Changelog 🆑 add: Add a new item to the chef traitor's uplink: Molt'Obeso sauce. A sauce that makes people want to eat too much. /🆑	2024-11-28 16:23:18 +01:00
Tim	138c7b378c	Add TRAIT_EVIL to admin tooling (#87749) ... ## About The Pull Request Let's admins add/remove `TRAIT_EVIL` from mobs. ## Why It's Good For The Game Useful for debugging. ## Changelog 🆑 admin: Admins can now add/remove TRAIT_EVIL from mobs. /🆑	2024-11-09 11:07:36 +01:00
Ghom	2d7b8a5ff6	material fishing rods and material fish. (#87108) ... ## About The Pull Request The reason why I refactored material effects code is here. In this PR I add the possibility of printing fishing rods from different materials at your nearest autolathe, though it doesn't stop there. Each material has different values for (so far) fishing difficulty, casting range, experience gained and foremost the chance of catching fish made of the same material as the fishing rod used to catch it. The material the fish is made from can either increase or decrease the weight of the fish. In a many cases, material rods can also have other small effects on fishing, like removing the chances of duds even without a bait, or attracting shiny-loving fish, or passing some other fish trait checks. In a few cases, these fishing rods can have bigger, more impactful effects on fishing. That said, here's a list of more or less the effects (skipping very minor ones and those inherited from being items) and modifiers across materials so far, a few things will be added later: <details> <summary>Huge-ass list (out-fucking-dated now that I've added 5 more variables 😢)</summary> - Iron: +30% fish weight, 8% chance of material fish - Glass: +20% fish weight, +5 difficulty, +20% experience, 8% chance of material fish - Silver: +35% fish weight, -5 difficulty, - 15% experience, 15.5% chance of material fish - Gold: +50% fish weight, -10 difficulty, -25% experience, 20.5% material fish, +1 casting range - Diamond: +40% fish weight, -13 difficulty, -30% experience, 23% material fish, -1 casting range - Uranium: +100% fish weight, 8% material fish - Plasma: +30% fish weight, 8% material fish - Bluespace: +30% fish weight, -5 difficulty, -15% experience, 23% material fish, +5 range - - 33% chance of selecting a reward from (almost) any fishing source instead of the current one. - Bananium +20 difficulty, +60% experience, 38% material fish, +3 casting range - - 20% chance of fishing either a clownfish, lubefish, donkfish, soulfish or skin crab instead - Titanium: +20% fish weight, -5 difficulty, 8% material fish, +1 range - Runite: +50% fish weight, -18 difficulty, +220% experience, 38% material fish, +1 range - Plastic: -20% fish weight -5 difficulty, +20% experience, 8% material fish, +2 range - Wood: -50% fish weight, +8 difficulty, +30% experience, 13% material fish, -1 range - Adamantine: +60% fish weight, -23 difficulty, -40% experience, 33% material fish, +1 range - Mythril: +40% fish weight, -25 difficulty, -50% experience, 43% material fish, +2 range - Hot Ice: -10% fish weight, -10 diffiulty, -10% experience, 18% material fish, +1 range - Metal Hydrogen: -40% weight, -15 difficulty, -20% experience, 23% material, +4 range - Sand: +20% weight, +30 difficulty, -80% experience, 8% material, -2 range - Sandstone: +20% weight, +25 difficulty, -70% experience, 8% material, -2 range - Snow: -20% weight, +25 difficulty, -70% experience, 8% material, -2 range - Runed Metal: +50% weight, -12 diff, -10% experience, 38% material - Bronze, +40% weight, 13% material - Paper: -60% weight, +40 diff, -90% experience, 8% material, -2 range - - Has a 20% chance of fishing up an aggressive stickman - Cardboard: Same as above, but without the stickmen - Bone: +5% weight, +15 diff, -15% experience, 8% material, -2 range - - 20% chance of fishing up either a unmarine bonemass, a unmarine mastodon, a hostile skellie or rarely a single-use spectral instrument that can turn you or someone else into a spooky scary skeleton. - Bamboo: -50% weight, -4 difficulty, +30% experience, 13% material, -1 range - Zeukerite: 20% weight, -16 difficulty, -10% experience, 28% material - Plasteel: +75% weihgt, +5 difficulty, +10% experience, 8% material - Plastitanium: +10% weight, -10 difficulty, -5% experience, 8% material, +1 range - Plasmaglass: +20% weight, +5 difficulty, +30% experience, 8% material - Titanium Glass: +25% weight, -5 difficulty, +25% experience 8% material - Plastitanium Glass: +20% weight, +50% experience, 8% material - Alien Alloy: +140% weight, -25 difficulty, 33% material, -40% experience, +2 range - Hauntium (good luck using it): +40% weight, -30 difficulty, +50% experience, 38% material, +2 range - Meat: +13 difficulty, -20% experience, 28% material, -2 range - Pizza: -10% weight, +13 difficulty, -20% experience, 28% material, -2 range </details> ## Why It's Good For The Game I think it's nice to have two features interact with each other (fishing and materials), and it adds a layer of interesting uses to some materials. ## Changelog 🆑 add: Autolathes can now print fishing rods of different materials, which can increase or decrease fishing difficulty, casting range, and experience gained, and can have other interesting effects. /🆑	2024-11-03 11:20:39 -05:00
Ghom	778ed9f1ab	The death or internal/external organ pathing (ft. fixed fox ears and recoloring bodypart overlays with dye sprays) (#87434) ... ## About The Pull Request This PR kills the abstract internal and external typepaths for organs, now replaced by an EXTERNAL_ORGAN flag to distinguish the two kinds. This PR also fixes fox ears (from #87162, no tail is added) and mushpeople's caps (they should be red, the screenshot is a tad outdated). And yes, you can now use a hair dye spray to recolor body parts like most tails, podpeople hair, mushpeople caps and cat ears. The process can be reversed by using the spray again. ## Why It's Good For The Game Time-Green put some effort during the last few months to untie functions and mechanics from external/internal organ pathing. Now, all that this pathing is good for are a few typechecks, easily replaceable with bitflags. Also podpeople and mushpeople need a way to recolor their "hair". This kind of applies to fish tails from the fish infusion, which colors can't be selected right now. The rest is just there if you ever want to recolor your lizard tail for some reason. Proof of testing btw (screenshot taken before mushpeople cap fix, right side has dyed body parts, moth can't be dyed, they're already fabolous):  ## Changelog 🆑 code: Removed internal/external pathing from organs in favor of a bit flag. Hopefully this shouldn't break anything about organs. fix: Fixed invisible fox ears. fix: Fixed mushpeople caps not being colored red by default. add: You can now dye most tails, podpeople hair, mushpeople caps etc. with a hair dye spray. /🆑	2024-10-30 08:03:02 +01:00
Ghom	86aee083e3	Speed potion improvements (#87322) ... ## About The Pull Request I've added a trait for when a speed potion is applied to the object. This allows me to remove some args and variables from riding and ridable, and allow fish past 2000 units of weight to have speed potions applied to them without the risk of the slowdown being reset the next time `update_size_and_weight()` is called. Speed potions now also affect drag slowdown. ## Why It's Good For The Game Small code improvement, leading to a possible balance change. This fixes #38623. ## Changelog 🆑 balance: Speed potions now cancel drag slowdown too. balance: Speed potions can be used on fish past 2000 units of weight. fix: You can now speed up cardboard boxes with speed potions. /🆑	2024-10-21 16:46:50 +03:00
SmArtKar	df00d85356	Eye wounds, scars and a new ~Pirate~ RP quirk (#87209) ... ## About The Pull Request Upon getting stabbed in your eyes or having a bullet fly through your head there's a chance (minor for stabbing, extremely low for headshots) you'll receive a new "Eye Puncture" wound which causes profuse bleeding out of your now-empty eye hole. Once healed you'll have to deal with a scar on your eye which cannot be cured and requires surgical replacement. Eye scarring will reduce your eyes' max health by 15, give you a minor screen tint and a fancy visual on your character sprite. Getting scarring on both eyes will turn you completely blind.  This PR also introduces a new quirk which gives you eye scarring on the eye of your choice and an eyepatch to go alongside it, just make sure that it sits on the right eye. Also added medical(white) subtype of eyepatches to loadout for those who want that version instead. Credits to AnturK on discord for the idea. ## Why It's Good For The Game Its a neat lil' feature that makes the game more immersive, and unlocks more roleplay opportunities for players. New quirk gives access to this feature for players who want to make it a part of their character's backstory (or maybe as a part of permanent scar roleplaying). ## Changelog 🆑 add: Getting stabbed or shot in the eyes has a chance of giving you a new wound and a semi-permanent scar, blinding you on one side add: Added new "Scarred Eye" quirk which blinds you on one eye but gives you a fancy eyepatch add: Medical eyepatches have been added to loadout /🆑 --------- Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>	2024-10-19 13:39:19 +02:00
SmArtKar	91e14ba363	Plasmaman Species Refactor | Jesus Christ This Hurts Edition (#87086) ... ## About The Pull Request Completely refactors plasmaman code by moving their self-ignition code to limbs via a component and making suits handle their extinguishing code by themselves. This means that if someone gets a plasmaman limb attached to them, they'll need to seal it off from oxygen or it will ignite! ## Why It's Good For The Game Plasmaman code is really bad and we've been trying to move away from species specific code and make them just limb and organ containers Closes #52649 ## Changelog 🆑 fix: Plasmaman space suit internal extinguisher works and can be refilled now refactor: Refactored plasmamen self-ignition to be limb-side instead of being handled by their species /🆑	2024-10-12 12:55:33 +02:00
Ghom	4738c1f26e	Feeding fish certain reagents may have some effects (#86955)	2024-10-10 14:06:22 +00:00
SmArtKar	79c56ebc04	New station trait: Spiked Drinks (#87084) ... ## About The Pull Request Adds a new "Spiked Drinks" station trait which makes soda vendors have a 65% chance of dispensing drinks spiked with various booze. Most likely it'll be relatively harmless but there's a small chance of getting funkier mixtures instead. ## Why It's Good For The Game Its a rare-ish (3 weight) trait that mixes up the pool and fucks with some of the crew a bit. Some round variety and potential for shenanigans is always good. ## Changelog 🆑 add: New station trait "Spiked Drinks" that will add booze to most sodas has been added to rotation. /🆑 --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>	2024-10-09 17:42:38 +02:00
Ghom	96c0c0b12c	Fish infusion (#87030) ... ## About The Pull Request I'm adding a new infusion ~~(actually four, but two of them are just holders for specific organs tied to a couple fish traits)~~ to the game. As the title says, it's about fish. The infusion is composed of three primary organs, plus another few that can be gotten from fish with specific traits. The primary organs are: - Gills (lungs): Instead of breathing oxygen, you now need to stay wet or breathe water vapor. - fish-DNA infused stomach: Can safely eat raw fish. - fish tail: On its own, it only speeds you up on water turfs, but it has another effect once past the organ set threshold. It also makes you waddle and flop like a fish while crawling (I still gotta finish sprites on this one) Other organs are: - semi-aquatic lungs: A subtype of gills from fish with the 'amphibious' trait, falls back on oxygen if there's no water. Can also be gotten from frogs, axolotl and crabs. - fish-DNA infused liver: From fish with the 'toxic' trait. Uses tetrodotoxin as a healing chem instead of a toxin. Also better tolerance to alcohol if you want to drink like a fish (ba dum tsh). - inky tongue: From fish with the 'ink production' trait. Gives mobs the ability to spit ink on a cooldown, blinding and confusion foes temporarily. The main gimmick of this infusion revolves around being drenched in water to benefit from it, In the case you get the gills organ, this also becomes a necessity, to not suffocate to death (alternatively, you can breathe water vapor, without any benefit). To enable the bonus of the organs set, three organs need to be infused. They can be gills, stomach, tail and/or liver, while the inky tongue doesn't count towards it. Once the threshold is reached, the following bonus are enabled: - Wetness decays a lot slower and resists fire a bit more. - Ink spit becomes stronger, allowing it to very briefly knock down foes. - Fishing bonuses and experience - Resistance to high pressures - Slightly expanded FOV - drinking water and showers mildly heal you over time. - for felinids: You won't hate getting sprayed by water or taking a shower. - While wet: - - If the fish tail is implanted, crawling speed is boosted. - - You no longer slip on wet tiles. - - You also become slippery when lying on the floor. - - You get a very mild damage resistance and passive stamina regeneration, and cool down faster. - - You resist grabs better. - - get a very weak positive moodlet. - However, being dry will make you quite squisher, especially against fire damage, slower and give you a modest negative moodlet. While working on it, I've also noticed a few things that explained why tetrodotoxin (TTX) did jackshit at low doses, because livers have a set toxin tolerance value, below which, any amount of toxin does nothing. Also I've felt like reagents like multiver & co were a bit too strong against a reagent that's supposed to work at very low doses, with slow metabolization, so I've added a couple variables to buff TTX a bit, making it harder to purge and resistant to liver toxin tolerance (also added a bit of lungs damage). ## Why It's Good For The Game I wanted to take a shot at coding a DNA infusion and see how chock-full I could make it. DNA infusions are like a middle point between "aha, small visual trinket" and organs with generally ok effects. I seek to make something a bit more complex ~~(also tied to fishing ofc because that's more or less the recurrent gag of my recent features)~~ primaly focused around the unique theme of being strong when wet and weaker when dry. EDIT: The PR is now ready, have a set of screenshots of the (fairly mid) fish tails (and gills, barely visible) on randomly generated spessman and one consistent joe:  ## Changelog 🆑 add: Added a new infusion to the game: Fish. Its main gimmick revolves around being stronger and slippery when wet while weaker when dry. balance: Buffed tetrodotoxin a little against liver tolerance and purging reagents. /🆑	2024-10-09 02:03:50 +02:00
Ghom	ff2760e908	Adds new tasty fish to deep fryers. (#86690) ... ## About The Pull Request This PR introduces three new fish that can be caught from deep fryers. That's right, deep fryers are also fishing spots now. Is it silly? Yeah, but this is more or less the reason I made a whole PR to make fish edible. They've two gimmicks: one is that they're already fried, and neither raw nor gorey and can be cut into nuggets. The other is that they can evolve into the next type just by growing, no need of pairing them with each other, starting from the 'fryish', then the 'fritterish' (and its two variants: 'bernard-fish' and 'matthew-fish', big pun on the english food company) and finally the 'nessie-fish' which is very rare and big and you'd probably get 20 nuggets by cutting it alone. Other than that, this PR adds a simple growth mechanic to fish, where they get a bit larger each time they're fed. The gained size and weight depends on several factors like hunger, their current size and weight and how much until they hit the maximum cap of twice the initial size and weight. This means bigger fish grow slowier, and it's better to feed them once in a while but not every other second. Obviously size and weight influence a lot of fish mechanics, so it's good to have a way to increase these values outside of breeding RNG (which is very shallow). TL;DR: Feed the fish once their hunger reaches 50% circa for maximum growth. Included in the PR are a few tidbits, like fixing a little mistake around the 'picky eater' fish trait, more readable code around the fish_growth component (unrelated to the aforementioned growth mechanic) and hunger or adding the fish evolution datum for armored pikes (normal pikes plus stinger trait, which I basically forgot to), and adjusting how weight and size of offsprings is calculated. ## Why It's Good For The Game First and foremost, a brand new on-station fishing spot that is not the fishing portal, toilets (or the rare moisture traps in maint). Second, a fish growth mechanic through which weight and size can be increased. Third, a few code things. Four, little bugs, now fixed. Fifth, have a screenshot of me fucking around to find out how many bites it takes to eat all of the deepfried gargantuan nessie (53, and I had to spawn another 10 humans to finish it):  ## Changelog 🆑 add: You can now fish new, tasty treats by the station deep fryers. add: You can now grow fish inside an aquarium by feeding them regularly (at 50% hunger for maximum growth). add: Added the evolution for pikes to armored pikes. /🆑	2024-09-22 18:43:27 +00:00
Ghom	adc47b42ee	You can release fish after catching it (#86126) ... ## About The Pull Request This PR nerfs the mood event from fishing from 5 to 4. In exchange, after catching a fish, you can release it in the appropriate fishing spot for a minor positive mood event (if it's alive, or if the user has either the morbid or naive traits). It also counts towards fish population for fish that are limited in the amount of times they can be catched. Mobs with the naive trait (clowns) get the positive mood event even if the fish is dead or being released in a bad place like lava Some fishing spots like toilets and moisture traps don't have this option, but that's because they've their own interactions with fish that'd otherwise be overridden by it. This PR also fixes mobs with the morbid trait (coroners) not enjoying aquarium in their own morbid ways and add a few touches pertaining the naive trait like alternative chat messages when interacting with the fish. ## Why It's Good For The Game This gives players a way to get rid of unwanted fish without leaving it to die on the floor, also it's in the spirit of recreational fishing. ## Changelog 🆑 fix: Fixed morbid mobs (coroners) not enjoying room beauty and aquariums in their own weird ways. add: You an now release fish after catching it for a positive moodlet (or to repopulate certain fishing spot with rare fish). /🆑 --------- Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>	2024-09-15 13:57:41 +00:00
Ghom	5409570e01	Upgrades GODMODE from a flag to a trait. (#86596) ... ## About The Pull Request GODMODE has a lot of sources that toggle it. From admin-stuff to status effects, components, actions and mobs which are supposed to be invincible. It's better off as a trait than a flag, so we can manage these sources. ## Why It's Good For The Game See above. ## Changelog 🆑 admin: godmode is now a datum trait instead of a bitflag. This means the process for toggling it is a little different now. /🆑	2024-09-15 13:40:19 +00:00
Ghom	8d0e6734fe	Fish (ya know, from fishing) is now edible (#86110) ... ## About The Pull Request Fish (the item that you catch with a fishing rod) now has an edible component attached to it, making it possible to eat them if you really have to, at the cost of eventually killing and deleting the fish, however, you normally shouldn't. Along with the seafood and meat foodtypes flags, it possess the gore and raw foodtypes too, making them pretty awful to eat unless you're a (non-vegan) lizard, felinid, or wearing the strange bandana*, which can only be found in the cqc kit case. Furthermore, it carry diseases like the ones from food left on the floors for too long, so a strong stomach is required to safely eat it even if you actually like it, dummy... UNLESS you fry or grill it, thus killing the diseases (as well as the fish) and removing both the gore and raw food types, then it becomes an actually ok meal... UNLESS you're dumb enough to eat a pufferfish, a donkfish or a slimefish. That is more or less the general rule. A few fish stray for it. For example, lavaloops are never raw (still gorey). The skeleton fish are never edibles, and holodeck fish is, well, holographic and thus disappears if you try to eat it. *the strange bandana is a reference to MSG, and this is a reference to the MGS3 fish eating animation. This is WIP btw, I'll have to test it and add some then polish it. ## Why It's Good For The Game Whole unprocessed fish should be technically edible, even if not safe to eat nine times out of ten. Also I kinda need this if I want to add a tasty fishing spot to the kitchen deepfriers. ## Changelog 🆑 add: Whole, unprocessed fish is now edible. However it's pretty much reccomended to grill or fry it for over 30 spess seconds before attempting to eat it. fix: germ-covered, dirty food no longer tries to infect you through contact. /🆑	2024-09-15 13:13:47 +02:00
EnterTheJake	6faa37853b	Void Heretic Rework: You Can (Not) Heat Up. (#85728) ... ## About The Pull Request Reworks most of the Void Heretic kit. All Void spells now apply a stacking debuff that makes you gradually colder. Void Blast has been replaced with a new spell "Void Conduit" and a new Side knowledge spell, "Void Prison" has been introduced. Waltz At The End Of Time has been completely overhauled. Lastly Void Blade has been resprited along with the overlay of Void Chill, check any of the linked videos to see the new look. All new sprites have been kindly made by OrcaCora. ## Why It's Good For The Game Void path is *Supposedly* themed around the cold of space but doesn't have any tools to live up to the fantasy of being an harbringer of the Void whose main goal is to freeze the station to an icicle. Then there's also the issue of Void being utterly underwhelming compared to his neighbors, Cold is way too easy to treat as a status effect, so much so, a simple cup of coffee can utterly shutdown the void storm, which is just unacceptable. # **Changes** - **Void Chill**: Is now a stacking debuff, each stack slows movement speed by a percentage while lowering body temperature, upon reaching the cap, which is 5 stacks, the victim cannot heat up anymore, all void Spells apply 1 stack of the debuff, with the exception of the grasp applying 5 (2 for the mark and 3 for the detonation) and the blade upgrade applying 2. **Reasoning**: Void chill currently suffers from being completely shutdown by sipping tea, coffee or having the COLD_RESIST trait,with this change you can still negate the damage and the slowdown you get from being cold but not the slowdown from the debuff itself. - **Aristocrat's Way**: Now grants no slip on ice and water tiles on cold or depressurized turfs **Reasoning:** Since the rework revolves around making Void heretic more involved in freezing the station, they should be able to move in their domain without getting punished for it. - **Void Cloak:** Can now be toggled on and off to make the cloak visible or invisible; when the cloak is visible it grants low pressure immunity trait. **Reasoning:** Not having pressure resistance as a Void Heretic just sucks, as you are clearly intended to somewhat go into space at some point; giving it to the cloak is a good compromise since you sacrifice better protection (***the armor values of the cloak are pitiful***) for utility. - **Replaces "Void Blast" with a new spell, "Void Conduit"**. **Void Conduit:** Opens a gate to the Void; it releases an intermittent pulse that damages windows and airlocks and applies a stack of void chill to non heretics, Heretics are granted the low pressure resistance trait. **Reasoning**: I like the idea behind Void Blast; unfortunately, the spell has limited uses if an area isn't already spaced, which is hard to do considering the current kit of Void Heretic doesn't provide anything to help in that regard. I wanted to give Void Heretic a tool to turn any area of their choosing into their ideal habitat. Not amazing for quick assassinations, good if you are anticipating a fight or want to simply expand your domain, the added Trait might seem redundant, but let's not forget that the void cloak is still a side knowledge, I don't want newbie heretics to space an area and accidentally killing themselves because of it. Video Demonstration: https://www.youtube.com/watch?v=nhPdj1hIgSI - **New side knowledge: "Void Prison."** **Void Prison:** It makes the target invulnerable and unable to do anything for 10 seconds , when the spell ends, it applies a few stacks of void chill, cannot be self-cast. It occupies the same slot of Blood Siphon (inbetween Raw Ritual and Void Phase.) Video Demonstration: https://www.youtube.com/watch?v=nKZd8aEcZFw **Reasoning**: Void is technically meant to be an assassination path and not really apt at tackling multiple opponents, this spell might come into clutch if you are outnumbered, or simply want some breathing room from your pursuers. - **Void Jaunt and Void Pull** Cooldown respectively reduced to 25 and 30 seconds, down from 30 and 40. **Reasoning:** I felt that the cooldown on these was a bit too high overall; as it stands, Void Phase cooldown is twice as long as Ashen passage, one of the best and arguably most sidepathed spells in the game. Granted phase is faster and has more range but I don't think it justifies its cooldown being this long. Void pull could also use slightly less cooldown, being the very last spell you unlock and offering a simple melee knockdown. - **Seeking Blade:** Now applies 2 stacks of void chill per hit. **Reasoning:** Seeking blade is a bit underwhelming for being the final blade upgrade, teleporting to a target you just stunned at melee range is incredibly niche, now that Void chill is a stacking debuff we can probably just slap it on the blade itself. - **Waltz At The End Of Time:** The Heretic becomes weightless and able to levitate around, (carp movement essentialy). The heavy storm is no longer bound to the room the heretic is in but is now an aura around them, this does a few things. 1) Releases a pulse that depressurizes areas, shatters windows, airlocks and firelocks, and applies a stack of void chill to non heretics, the passive burn and oxy damage effect has been removed. 2) Grants to the Heretic projectile deflection. **Reasoning:** Void Has the reputation of having the weakest ascension in the game, which it's hard to disagree on considering you can completely neutralize the effects of the storm by simply sipping tea and how generally little it does overall. It's also kind of strange that you have this massive Eldritch storm ravaging the station and for it to have no effects on its atmosphere, infrastructure, or projectiles whatsoever. Video Demonstration: https://www.youtube.com/watch?v=1_blr20-hgA ## Changelog 🆑 add: New Heretic Side Knowledge, Void Prison. add: New Void Spell Void Conduit has now replaced Void Blast. balance: Void Chill is now a stacking debuff, upon reaching the cap, makes the target unable to heat up. balance: Aristocrat's way now grants immunity to ice and water slips on cold turfs. balance: Void Cloak now grants low pressure resistance when visible. balance: Void Phase and Void pull have received a minor CD reduction. balance: Seeking Blade now applies a couple of stacks of void chill. balance: Void Heretic Ascension has been overhauled, it's now protects the heretic from projectiles, destroys windows and airlocks and applies void chills to non heretics. image: Void Blade and Void Chill have received some new sprites. /🆑 --------- Co-authored-by: Xander3359 <66163761+Xander3359@users.noreply.github.com> Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>	2024-09-10 22:21:04 +00:00
Ghom	10c2b7364e	The fishening v3: Fishing lures. (#86007) ... ## About The Pull Request Over half of the line changes are merely from splitting the fish_types.dm into several files since it was over 1k lines already. One of the small issues with fishing right now is RNG. You want to get some specific fish, and you go through all the micromanaging with hooks, reels and baits only for the random number god to say "nope", and that's only going to get worse the more fish are in the game. However, I've a solution: (unconsumable/reusable) fishing lures, each of which attracts different fish based on different conditions. The only caveat is that they require to be spun at set intervals (usually 1 to 3 seconds, depending on the lure, with a second-long window). Worry not, there're visual cues in the form of a green/red light hovering the fishing float, so you won't get screwed up by the server slowing down or whatever. The whole box of lures (12 so far) can be from cargo for the fair price of 450 credits. I've also added 5 new fish: monkfish, plaice, pike, another punnier variant of the pike, perch and squid. The latter is quite special because of the ink production trait, which lets players use it to blind others at a close range and when butchered, it yields an ink sac, which can be processed into a can of squid ink (one less item exclusive to the produce console), or thrown at people in a sort-of-similar fashion of banana cream pies (except it's ink). <details> <summary>Images</summary> Fishing lures (forgot to take my cursor off the veggie one before the screenshot):  The five new fish:  </details> <details> <summary>A table of fish catchable wth each lure (excluding holodeck)</summary>  </details> A few more things in the CL, baitfish are a thing now. ## Why It's Good For The Game There should be ways to contrast some of the RNG fishing has. After all, it's only going to get more random the more fish are in the game. Furthermore, I find it disappointing that a lot of food stuff is exclusive to the ingredients console and there're no other ways to get it. ## Changelog 🆑 add: Added fishing lures to the game. They don't get used up like baits and let you catch specific kinds of fish, though they need to be spun every few seconds. The whole set can be ordered from cargo for 450 credits. balance: The magnet hook now removes dud chances. add: Added five new fish types: perch, two types of pike, monkfish, plaice and squid. Squids have a fairly special ink production trait, which lets you use them (unless dead) to ink people face at close range, and can be butchered for an ink sac, which can either be processed into canned squid ink, or thrown at someone. fix: Refactored throwing a little. Some items (specifically components/elements) won't be triggered when caught. no more plates shattering despite being caught for example. add: Goldfish, lavaloops, needlefish and armorfish can now be used as baits. /🆑	2024-09-06 19:50:28 -04:00
tgstation-ci[bot]	9a9b428b61	Wallening Revert [MDB Ignore][IDB Ignore] (#86161) ... This PR is reverting the wallening by reverting everything up to 8868a5d1fe and replaying the PRs skipping #85491. The following 239 (39 + Wallening Main PR excluded) PRs need to be replayed (DO NOT EDIT THIS LIST MANUALLY, IT IS USED BY THE BOT TO TRACK PROGRESS): - [x] #85777 - Reverted in 3 - [x] #85767 - Reverted in 2 - [x] #85763 - Reverted in c - [x] #85762 - Reverted in 2 - [x] #85760 - Reverted in dbc19df13b033ac8bb5a83fa38c5cf140cf31836 - [x] #85733 - Reverted in 22f17d057eac71661b86c3f2186489568c130043 - [x] #85721 - Reverted in 6d90643dbbc90f3d21f2d25dc85dc4d4f706d6a3 - [x] #85719 - Reverted in c52954648309ad4786238f409cd33142d486190f - [x] #85705 - Reverted in 3b5ddabfd5ab2cfec226a643be6e8a8fd656c831 - [x] #85684 - Reverted in cbc1839625f44ba67bcd5489c3629ef98e31b2d4 - [x] #85662 - Reverted in 69cac24e236604c262093abea7b9566ecbd092c4 - [x] #85663 - Reverted in f394c3b1430d346b0598abf19fe511b30c3f4676 - [x] #85673 - Reverted in 8a9ae0411488c9c779a54c5c41076238c230a304 - [x] #85718 - Reverted in f8f18d8b626e963b06555f76850702740d5de0c3 - [x] #85667 - Reverted in a1365766d178b727b6c6b503ad410e9d88d57ddd - [x] #85683 - Reverted in 3bdb0207d883de8db6f726d976025517cc6d3cba - [x] #85676 - Reverted in 0a5d667b2c8a9a2519af2a4fda8cd39f568e5049 - [x] #85661 - Reverted in 49fc6bc1815133644d7173aa7914ede6c900218a - [x] #85682 - Reverted in b41efe96fd72228b079319ac07c660f4cd974af6 - [x] #85695 - Reverted in 89a173b136cb0297070cef39c5bc9783b6323f02 - [x] #85654 - Reverted in 1e4836b5173a40fbeb8755e0fb76ebc8d39fe1e0 - [x] #85655 - Reverted in b4dde41eebd0422e1ec440b4d8d54229fc9617f4 - [x] #85634 - Reverted in 0c352fc785762da025a68873438593b508f757d9 - [x] #85700 - Reverted in 1327cf7fe48d7f4fd227120508f77c831aefa4ca - [x] #85633 - Reverted in c71c8c9d43112a1f4c6331bbba546881dcffd59d - [x] #85649 - Reverted in 73484337077f616878e63208d9bf2309f0d2e579 - [x] #85475 - Reverted in 839f700001a57646109e75332d5311fe27bbc957 - [x] #85467 - Reverted in 6f08421f64d01b13775d146cf7a451f9f38e195a - [x] #85472 - Reverted in 63c6a9b04e72e8130df5eeb2861c75f80a97e3de - [x] #85300 - Reverted in 7c776034f34ee6a76810c1a3779f169f2430c418 - [x] #85249 - Reverted in 257d02273751fc1f939f76756f70b614a6e06789 - [x] #85236 - Reverted in f9f4c444c8fc027dea87d4dbe0ebb8dd6bc67154 - [x] #85299 - Reverted in f24ddff51dc3fec7145a2e97f057f1b286921db3 - [x] #85228 - Reverted in cb8c318f7e2183d9f941c582f79e4c8b2503d95c - [x] #84910 - Reverted in 2a562ca26d9d13f335c276487f66edaa0d21b3bd - [x] #84889 - Reverted in 679da6885b034bcd8843f7f4c855388bce263733 - [x] #84766 - Reverted in 4035dd7adee74af0fed82c14a8749585b2ab1c96 - [x] #85607 - Reverted in dc9a0462b4c287cee2d541925f8a9988d18d9d85 - [x] #85618 - Reverted in 2a06f57c89939dc31e9273ef250bd050cff17ff1 - [x] #85619 - Reverted in b98661affc90e44c68a58c05e57cdf1dfd094c93 - [x] #85608 - Reverted in 57a935126233f90255aef0a55dab16524be1faac - [x] #85648 - Reverted in ab82c66a95d4fbff86040b421a86cc82dca73009 - [x] #85692 - Reverted in f04fac92bd3594f12f244bae9ea0c5c300c737fb - [x] #85544 - Reverted in 7b1198eb5c700e85ec163e60828c01fac55a9909 - [x] #85631 - Reverted in 81c04ceb553f9887d59f8edf8b2526ff3807264b - [x] #85529 - Reverted in 2a7e2c8e3856d67cdefda0d25803393070a6e996 - [x] #85525 - Reverted in 6ed2d9f28a9333c705eafd21acf54771b8e4db36 - [x] #85514 - Reverted in a4fa2aa79d93b69d15e0fb9cb1fb7a5bc288bb34 - [x] #85520 - Reverted in 6e1bd4b11cd55e36cab332c5a0c90c76a2e43703 - [x] #85521 - Reverted in 79afdac194da5f42b38fb0fdfc394f2b8d485266 - [x] #85519 - Reverted in a967cae1fb3feea23fdf196595e496431740f52d - [x] #85513 - Reverted in e3934edf8794f93a37dc7f63c60aa64ed7b60736 - [x] #85498 - Reverted in cf1fadbc54a1365362aaeb142cbbd4e2c3be6f15 - [x] #85485 - Reverted in 2a650ef9c0454bd650d6a13d10c0cb71bb134b2b - [x] #85494 - Reverted in bbb97958010dc0f74cee279fd304a7fcaccb625e - [x] #85552 - Reverted in f1780715bd054300e50e9102ad150c76690d4ca1 - [x] #85724 - Reverted in 6933699cef8b01f9aef989f36ca079680a2777ff - [x] #85735 - Reverted in a6564f19226ef3969bec0573b49fa772d6e6df31 - [x] #85729 - Reverted in f728d121a2f27a3cc7973fc2041df9b7193b796d - [x] #85704 - Reverted in 38f5b034a3370eda4657a2a5a6adcf3df6ec280c - [x] #85660 - Reverted in 7db39869d37ff5b39574d88ffc872449ab5b457c - [x] #85752 - Reverted in 1f2988028b7cccad121fc658d6547d89453703b7 - [x] #85592 - Reverted in 263cbcfcb54746a9361369d86b44cc3e2d375199 - [x] #85580 - Reverted in a92d53624198dce844c108b5dbea09cf2a16cd10 - [x] #85573 - Reverted in a7d51042355798038ced44f64e987261b85e93bc - [x] #85534 - Reverted in 31787e7d1ce4fec2ce20776672099bf35486a296 - [x] #85511 - Reverted in 2567a2eb56cdb7058f89ea298e53197147198d82 - [x] #85508 - Reverted in 69de2ac16c20d968adcd19f0732fd2f84a4ae90e - [x] #85680 - Reverted in 44437ac406c708b9a3ab3b47f4e3c10e77a0b91b - [x] #85551 - Reverted in 7f17d428fd2787a6982534bfc9ac9188fd4b8675 - [x] #85478 - Reverted in bd9e575dafc62dc7e1259e8c19199ba15d82be4f - [x] #85476 - Reverted in 4ce8052076de0bb52f1ed87663920e98482ade62 - [x] #85593 - Reverted in 9ff5924d3d56fcba3f180fc4b539568fb2013323 - [x] #85441 - Reverted in db96015adaec01f3fbcb978796a0d7abd5668932 - [x] #85567 - Reverted in 62696ad04fb34fd946708309bd3e439db9b3f488 - [x] #85337 - Reverted in 1267e9f002d03c33187afd2e734e95a78a5ca6ac - [x] #85348 - Reverted in 4fcc3c659ee2a38d978e137252309644d5adde8f - [x] #85350 - Reverted in e691c833dd5aca2e7808591516e8443e8ccf1b27 - [x] #85744 - Reverted in 251578d2868a691981b824a268c540b9c15a424e - [x] #85772 - Reverted in bc6804a04aa9368074bcc853e689c8fe6de2cb3a - [x] #85797 - Reverted in a05e36ec4a0129ff6901ea07488120b54a8ee124 - [x] #85787 - Reverted in a5393f94b9e71d9ea0625e5fcfb5baaf16af38d3 - [x] #85742 - Reverted in cd99a2aeaa1347b790c9bfdae35e41900e2ada9a - [x] #85440 - Reverted in 8b5ead7c7f0d8087b41256a296e730443752f17d - [x] #85739 - Reverted in 3511aae5a4798104220b79ad0e5b2b357dc1e83b - [x] #85293 - Reverted in fc687ca36ef476ab9080f0c62b427ab0af533d68 - [x] #85716 - Reverted in 130b32a222a7585cfdde71aa561fb8b2c7d8083b - ~~[ ] #85848 - Reverted in f6c46ca2f5cb2d039e4b26731570ca801741cc5d~~ (SKIPPED) - [x] #85795 - Reverted in 4684c3325a9135b6bf10eb43026f373993bf605d - [x] #85859 - Reverted in 0e0838fe11b7d9af4f62af4f7388ed8fb57bf49c - [x] #84873 - Reverted in 34407b79a45718a305f3bfe3fac7f129b4f1c51f - [x] #85864 - Reverted in 4b25a209c5019bb65922cd793aff339f20c3d026 - ~~[ ] #85845 - Reverted in a326246e81b7b9242bbf45e7ab3b31caf9ce8147~~ (SKIPPED) - [x] #85844 - Reverted in bdf1e6c1e3469884550d3211e51ec9303a022482 - ~~[ ] #85843 - Reverted in 41a8acb196af0988372b06ade7131d07d03daab3~~ (NOT BEING INCLUDED) - ~~[ ] #85840 - Reverted in 4807bacea8418000f84d62ca0fb122846cab4929~~ (NOT BEING INCLUDED) - ~~[ ] #85837 - Reverted in bc9edfa8666de14ca4e57e466146d753182a3a71~~ (NOT BEING INCLUDED) - [x] #85865 - Reverted in 14c958b465af40f0ff28b100047c4c572919ae19 - ~~[ ] #85818 - Reverted in a77256f74e2d330f5f76141eb9c994a8e5e45810~~ (NOT BEING INCLUDED) - [x] #85822 - Reverted in caba685be95fd336f0b09e88bccfb8856d5ad9b4 - [x] #85794 - Reverted in 0d4de984eb8513d065e8ac724e8cde11f01d4ef7 - [x] #85756 - Reverted in 9c5a7e1a5f895851493e149ccb5cd50e35cd6101 - [x] #85852 - Reverted in 74303e5bbae8426a073d068ef4342d8acc420a09 - ~~[ ] #85841 - Reverted in e5831ce3cc87765cb13e6d342417bc1730780392~~ (NOT BEING INCLUDED) - ~~[ ] #85834 - Reverted in 1be665204da791ec7520d0799c015157fc625953~~ (NOT BEING INCLUDED) - [x] #85792 - Reverted in 33b4e48175040f9f76ef83d3154f10c69589b6ad - [x] #85646 - Reverted in fd23a0d6c4c96470b688dc0a35370c61c7e32f61 - ~~[ ] #85799 - Reverted in 4a7a6d812f2f301c1e749c92f324223f9bde8a39~~ (NOT BEING INCLUDED) - [x] #85819 - Reverted in 8bf001b7889d3a4282947cd332833c473b98eac1 - [x] #85479 - Reverted in 6aeb5ef4582c03febe0c914185d29f75df4d5d94 - ~~[ ] #85824 - Reverted in 9ca3edfaa17d97306ac73207ef32fd1272061f6b~~ (SKIPPED) - [x] #85406 - Reverted in 702280ff48c8aef44f4da9a85eb33a7bc5faa013 - [x] #85778 - Reverted in ce0ec5c685aadb02ae049d6714f1d2fd6dae1f26 - ~~[ ] #85851 - Reverted in 610c68b275cf3c54181d36ce48bd97b0cce0665c~~ (NOT BEING INCLUDED) - [x] #85754 - Reverted in 5cbdda00c5335db79ea50aedba097de1d06bf91b - [x] #85266 - Reverted in abdfec798e5223dfa9d67e1967d7618454dbec28 - ~~[ ] #85823 - Reverted in 86b766abd3d77af8ad835a3464fc5ff95cc11079~~ (NOT BEING INCLUDED) - ~~[ ] #85842 - Reverted in 7ddd47e26ef1bc336e92a6675a33ec3191039c16~~ (NOT BEING INCLUDED) - [x] #85857 - Reverted in e32312ee20e9fdccb6dd7c4dc2d185540bd2276b - [x] #85856 - Reverted in 7d5d74c2b55a08ef5553568e996053157359dbe2 - [x] #85276 - Reverted in 1d6fa881e4aef1e6b368d5b6809bccb021fbbd2a - [x] #85886 - Reverted in f27d6cabdf8f06f29926616345fa82c4e1e48708 - ~~[ ] #85771 - Reverted in 019d898b601c9ef4d45b7ee0f2144518ee127ca9~~ (SKIPPED) - [x] #85464 - Reverted in adc00417795deb85f8aa6170b0f0a07c40c8798c - ~~[ ] #85870 - Reverted in d69b998420bfb39693bb59b9b9a20611880fdafa~~ (NOT BEING INCLUDED) - ~~[ ] #85869 - Reverted in 0063c69f111bb67144f9b379476250ce86c99eee~~ (NOT BEING INCLUDED) - [x] #85530 - Reverted in b40c93399411d277b3899e149196f3eb974f841f - ~~[ ] #85871 - Reverted in 63908bbd0a71d0a2bd0a4691816c17cc9eb5310c~~ (NOT BEING INCLUDED) - ~~[ ] #85832 - Reverted in b29dab083f091198d65a9b0754536f13a935dc2c~~ (SKIPPED) - ~~[ ] #85825 - Reverted in d072b294ca3bc526df5128df45653db97ba38fe1~~ (NOT BEING INCLUDED) - [x] #85632 - Reverted in 290092c7d826aa5b100a38cd4bacc5330b39a934 - [x] #85902 - Reverted in 76118d620e71f1819a9385863b689d9a8d4ea810 - [x] #85906 - Reverted in 82623c2cc0fd9aee3e79c95fe5558146c59bc941 - [x] #85907 - Reverted in 68b7305f21240ca28c33afc904ee532966b7c4bd - [x] #85449 - Reverted in ab86a79339ef7b01ceb08dc7279c698927ebcbfa - ~~[ ] #85875 - Reverted in 0a1fcda90e638e66d574c247e93f0669d0c27b0e~~ (NOT BEING INCLUDED) - ~~[ ] #85861 - Reverted in 6dad5111aa144860371c93a2d78094fe3d39a7e1~~ (NOT BEING INCLUDED) - [x] #85264 - Reverted in dc1d2dcc995f33fc5773e037f5171e9516897281 - [x] #85726 - Reverted in dbd9ec81586c87c1ab2afc43d43c4f020907dc1b - [x] #85730 - Reverted in 7de2c2a1d012ccb03f82c6beabd71a66aa0f910a - [x] #85880 - Reverted in 02169d2f28611765997fa332dda69c8031436fd1 - [x] #85176 - Reverted in e3c85aae1cf665c9892bf7280b7b48ea42323198 - ~~[ ] #85887 - Reverted in 56b35f294b303fd30fbd7685011d37b456d584c7~~ (NOT BEING INCLUDED) - [x] #85883 - Reverted in 53be06a505ebd8581114bba8590e378d387b6c1a - ~~[ ] #85882 - Reverted in a8877ff0083ca5753e3d3b1b9c9edc3613fa6570~~ (NOT BEING INCLUDED) - [x] #85895 - Reverted in 741235d41b3a19a40434653f1c14fc0999fac9c3 - ~~[ ] #85746 - Reverted in b7aebb6e5788f6c484173f0a5e29f042ea0c8560~~ (NOT BEING INCLUDED) - ~~[ ] #85889 - Reverted in d677231d8c55efcd2cf427d510d961cd00f186c7~~ (NOT BEING INCLUDED) - ~~[ ] #85888 - Reverted in 693f79abae54980ee098d602ed79926d51d5094b~~ (NOT BEING INCLUDED) - [x] #85898 - Reverted in 4f41fda23e6b9711aef5d00836591c1ac230612e - ~~[ ] #85821 - Reverted in 738c9a75f65c4a376da36ad208e1fd8fdeac1ff0~~ (NOT BEING INCLUDED) - [x] #85694 - Reverted in f7ea4d19cdaa2067c87c43362b514c684b56b1f3 - [x] #85308 - Reverted in 4a89b62774da5e9ec9ea241c60ec2a99f51f9bed - [x] #85904 - Reverted in 999dbe1773cc7488c629bb8d0d21be5454dbef60 - ~~[ ] #85901 - Reverted in bbf832da9e0c61ad25221530df3b1e93cace25dd~~ (NOT BEING INCLUDED) - ~~[ ] #85896 - Reverted in 542fe408728faaef8a16869e13c4661018a8a07c~~ (NOT BEING INCLUDED) - [x] #85927 - Reverted in 7dc87df28e79ef3e9f3fad83cc0907d2dc867c47 - [x] #85908 - Reverted in bcca80f073a486ca7908e9636d0e8b275c2085bf - [x] #85929 - Reverted in 094bf3610a73961f6433a52ada1a52f25d853738 - [x] #85877 - Reverted in 5874cafd0dab8d3bd61cf1f662793c2708f42dcc - [x] #85903 - Reverted in b3ba8fffc5548e0f2ae6bada3baf10bad3c75e54 - ~~[ ] #85913 - Reverted in 67f7ec48d20f9a64ce4664fa2c452a25b60db59e~~ (SKIPPED) - [x] #85914 - Reverted in 7efcd3a5f7fef33c2a1625386bfead80a6ed5309 - [x] #85917 - Reverted in fc50a5ff998d0e7269131a029e533e90e9dc3c54 - ~~[ ] #85949 - Reverted in 10a8e0f5c69e3ca1eb6e26f00945bfe226598bc2~~ (NOT BEING INCLUDED) - ~~[ ] #85338 - Reverted in 847549ab938f77464829b1392a1b6f2b2f4b9e8f~~ (SKIPPED) - ~~[ ] #85922 - Reverted in 3d9388249b8c322aac5dd4980d4ab4673ca01006~~ (SKIPPED) - [x] #85923 - Reverted in 2c6ffa4decf40eb52a92353aeb98aee8cbc7b4a2 - ~~[ ] #85920 - Reverted in 1de5b03981d9fcf9c2e6823bffa515fb939aa541~~ (NOT BEING INCLUDED) - [x] #85919 - Reverted in 1773e9baccdc941285f56ccb416f5c7125b031ef - [x] #85271 - Reverted in aecf8002cf2807a76b6b295867e50392b4bc4534 - [x] #85918 - Reverted in 023ec3a4d1b1b2fc8f596fea65a77ddc9a06689f - [x] #85924 - Reverted in e4886079ad90f33628ac59e0793dfbbc8b8b9420 - [x] #85928 - Reverted in 7470b7d5ac40be21c345e8825f4c4efc4738e29f - [x] #85926 - Reverted in 7761c9e3a1f442f37d4db4b27e5d78fae95edf00 - [x] #85900 - Reverted in 633736cb0655dc464e9794666c63ae6ec7689826 - [x] #85909 - Reverted in a47c7ec8a77bd02f8b7bb1ce3c621efbe57077c3 - ~~[ ] #85931 - Reverted in 9bc7a412982da6fbdb9cd24570d98877b76a45c3~~ (NOT BEING INCLUDED) - ~~[ ] #85894 - Reverted in c15e1711656929aeb59f482145ecf029b40d58b8~~ (SKIPPED) - ~~[ ] #85759 - Reverted in f45d70be0ffb9bf007bfa18a1bd1b5ce23d6dcfc~~ (SKIPPED) - ~~[ ] #85892 - Reverted in fc08dc1a7160f584c94e368962eb56c18dccc86a~~ (SKIPPED) - ~~[ ] #85915 - Reverted in 428f475c26f383998a689560a16de86da3f17557~~ (NOT BEING INCLUDED) - [x] #85222 - Reverted in 66e7ac2f00735c90acdb69a50c9e485a0f4e1552 - [x] #85150 - Reverted in 3079387f926e41febb576105ec0b3acec2f7beba - [x] #85935 - Reverted in ce6114f644593ead295763362a61d19077f22acf - ~~[ ] #85936 - Reverted in f601fa796bce7e70645a84fff91391cbb6ed8e37~~ (NOT BEING INCLUDED) - [x] #85937 - Reverted in 64242f589df3d9118fd5c09d19574758260c76a1 - ~~[ ] #85940 - Reverted in a979c6c24705a8729efab5eca40840f1c8070f1d~~ (NOT BEING INCLUDED) - ~~[ ] #85942 - Reverted in 9562c14083212fc962b8687663ba5fac2ebfdd1a~~ (NOT BEING INCLUDED) - [x] #85944 - Reverted in adf8e1927e4b9886c9042d6a0eaaef74e4e0e102 - [x] #85605 - Reverted in 88dbfb4f859f12549e8cf8ed5204ee8d7183d40f - [x] #85945 - Reverted in dea9e79a9c298eae05b8d173d8df4a37218e2d9c - [x] #84964 - Reverted in 234481fb1d92a266768fcbca49245151236803ed - [x] #85952 - Reverted in c62d87ab54d687db64b1551b319195527ca92924 - [x] #85953 - Reverted in bd0e46245ccb597081b8baa4f81ff85949f672be - ~~[ ] #85943 - Reverted in 697b6841391354885ef2d314d9185b8eee7a5cb0~~ (NOT BEING INCLUDED) - [x] #85946 - Reverted in f4afd4d330b6fc28397f7707bca8773d44cb15ed - [x] #85950 - Reverted in 394fffcb836f32f4e1b1fd91a621249e0e5d7d67 - [x] #85955 - Reverted in 2230a5bc141cd11fc79ccf6b4b653257508a7e65 - [x] #85319 - Reverted in fdaddd9cd6ed0bdd1cd78ba3c9729035936abcbd - ~~[ ] #85934 - Reverted in 41bb6122b6d6e3c38c500d5ddf63808836ab090e~~ (NOT BEING INCLUDED) - ~~[ ] #85255 - Reverted in 3e213b8554b40e53f6429969d6e9dbaa357fb09e~~ (SKIPPED) - ~~[ ] #85961 - Reverted in 6f3d000b3601dc7f75f7edd221fab3edc3bbbd8c~~ (NOT BEING INCLUDED) - [x] #85956 - Reverted in a5bf22a93ca1a149ca839e6c874d088b32c7c25f - [x] #85958 - Reverted in c964a46741bd26a600bb75bc6463c629c11c914f - ~~[ ] #85969 - Reverted in b599cd4bd3ae223210eb0d3b47c3bd814e1cb08c~~ (NOT BEING INCLUDED) - [x] #85252 - Reverted in 5a0e2f31a6e1093ab47970056f5bb3af54172e12 - [x] #85984 - Reverted in b000da82f62bb48b059a881d596f3a2e7d985d21 - [x] #85137 - Reverted in 1f31b558e41fc66d5da9db30a83d89cbb9949eae - [x] #85881 - Reverted in f3913f94c4557c4fc9d5605cd8e875accabebda6 - [x] #85972 - Reverted in d3afed87a3a8eed7e0016512d2186b6aded0fca9 - [x] #85998 - Reverted in 3d286b763cf2f7fe11b6f0ccb2456130570726c2 - [x] #85358 - Reverted in 75f84bda1b3c80d54ae94a567bf96016aaae45b2 - ~~[ ] #85964 - Reverted in be1aeb010afa20c1b6949218d8911ee9e900b3d7~~ (SKIPPED) - [x] #85960 - Reverted in 69cbfce1529377ce7cd998ab474add0d61650d7f - [x] #85992 - Reverted in 89e4a7bb0b793461338ba1b0a3d332bf78ef140c - [x] #85967 - Reverted in d398e418eb340f309be523514ae0befdf1869560 - [x] #84888 - Reverted in bb98eb09f06a1fdc0bbb733d6a42d711e6d477bc - ~~[ ] #85983 - Reverted in 81152a9cd347eb7b4073758e2e96490e6e729ca9~~ (NOT BEING INCLUDED) - [x] #85976 - Reverted in 93c091347ca8f04763b91fd4c39ccdff848a0d50 - ~~[ ] #85962 - Reverted in de32ea25b534c725e3d55418ef0363145f0ed2b0~~ (NOT BEING INCLUDED) - [x] #85977 - Reverted in 393652a1ef065014748ae6977a9f36b32c99dc7c - [x] #85959 - Reverted in 52e6e07eb98bcb74a423934b14d5850dbf2c6647 - ~~[ ] #85988 - Reverted in a5853ccde46b5fee2d9eb31755384de15e7a5a87~~ (SKIPPED) - ~~[ ] #85974 - Reverted in eab20ba04e6b06f862a0fb35cedb6374af7b93c0~~ (SKIPPED) - [x] #85939 - Reverted in ca85b05692f55f6b3e4bd0b3f30c63f89531c33f - [x] #85878 - Reverted in 3b3d3dbff9148e46b01f3af28f17f66bef4dfd16 - [x] #85858 - Reverted in 08d6082e62d07117170ff5ffd065daad1278e853 - [x] #85651 - Reverted in b76ab4a2114dd0eb78336878b2825d9919c210cc - [x] #85505 - Reverted in 0958eaa7b6f4d48400bea4e215e11edaa933ba8a - ~~[ ] #85352 - Reverted in 620cec18618e514bbe4d3eb0a0d0db1528b9d312~~ (SKIPPED) - [x] #85279 - Reverted in ba0fd529ef94ba793fe2eee40975533fe8f475e3 - [x] #85954 - Reverted in d7fe0336f2a968b93fd02361814930236e3b8ddf - ~~[ ] #85996 - Reverted in 5fbd62139e0c1b668aaaf35d249d527cdc276b93~~ (SKIPPED) - [x] #85994 - Reverted in c99a03c6833ac58e0288111953573f697488234f - [x] #85470 - Reverted in fbd5ac46d84d27455cbcf5f998741124ed6de625 - ~~[ ] #85981 - Reverted in dc74c75011ddfb1b16d644fd2ca5607599532d6f~~ (NOT BEING INCLUDED) - [x] #86011 - Reverted in b14b42e70e2bd21f19d443065b2342e4591c5e05 - [x] #85820 - Reverted in 26248546b9f7d0fedec52e7b2f7def40d457e29f - [x] #86013 - Reverted in e17ac14f53d08be988f0516e7c39d31496a35184 - [x] #85986 - Reverted in 4021ffea0b1bbb1f6c5b26a296abd5a8bda1d5b3 - [x] #86019 - Reverted in c0801b3aa5dbdd33ca7c6c81e80c9fa573ada9e1 - [x] #86010 - Reverted in 10dff005729305b75deaf1c5755a94125fa5141d - [x] #86029 - Reverted in 664619213db52930fa22007561dad01fe8bb3de4 - [x] #86024 - Reverted in e74ea4368cbd2cd085aa6e8bbe83db07800b0bd4 - [x] #86022 - Reverted in 0b2fc6a1f478c48546b161fd3ddd571f7ed6000f - [x] #86015 - Reverted in b99d93592dbf8840a035f22f26b64bcf27c817cb - [x] #85415 - Reverted in d6102c7339838675c03eb771d7a3b5a9bea4035d - ~~[ ] #85703 - Reverted in 339b7edf3c0318f9f02922018d6918211660234f~~ (SKIPPED) - [x] #85890 - Reverted in 4e54f376e07071f84ed283e7468e334aaf6e4e02 - [x] #86046 - Reverted in 0bbe2c9a048c229d151682e08aca1fa176c3ad91 - [x] #86008 - Reverted in a0a0635cd6618618c49fda7cf150231d62a14236 - [x] #86042 - Reverted in fa376315a064b945ed9846225c7f48e38e9b55ed - [x] #85891 - Reverted in 603dcd691e9eaad0a610c60c94fee522391bd2b3 - [x] #86040 - Reverted in e42fc7618194b4b01cb68ca0c61385e465d0cb05 - [x] #86025 - Reverted in 536bb25fe91845fe05bb7d512d8e73cc193b67ff - [x] #86012 - Reverted in 5cb4ec5bdf87653a5bb651c536f21423db30887e - [x] #86004 - Reverted in e9536143e78e3b0614d3ce6ee2c9a40005ba9b91 - [x] #85989 - Reverted in 88a92322c2f028d2e3a2be18951d35d1135a6268 - [x] #86044 - Reverted in d0a5fb5956be23144e325d3d51f53cb103dd5bbe - [x] #86001 - Reverted in 195c3597044315c9b10d002e6196911ac0622c45 - [x] #86030 - Reverted in 5265796286b481d34fc91a1f8c58b6373d23415e - [x] #86055 - Reverted in e82138798cda028b673fe7ac83890e5a6b9e16d2 - [x] #86057 - Reverted in c921900e6151552aa0768b4c9d7cc58c58dfbcc0 - [x] #86014 - Reverted in c004d4e989a2faa672793f58fd98bd6fded8194e - [x] #85304 - Reverted in 611510bd7f65ee06738b7344326d72f57a131f8a - [x] #86061 - Reverted in f14b0a245dcf164bb99f7696e180847bb5be9b11 - [x] #86075 - Reverted in 5339fe6c098d48769eda3f9935aa3488faa73097 - [x] #86089 - Reverted in 10b5398e6b55f4799ca7d6740ac50c031e157c43 - [x] #86081 - Reverted in ba86f43383cd2e8417c0a465c23fe3227fcd5520 - [x] #85609 - Reverted in 9e5208feaca3163b7f4237c316d880161933777f - [x] #86114 - Reverted in cf410a97b8348381f96cc784a6489d7c1dea49ba - [x] #86023 - Reverted in a7a2e95c0c1b0598f15019934c80ccc80a9f89af - [x] #86027 - Reverted in 9cf71611befac64d26d326c060ef082262aeca70 - [x] #86016 - Reverted in b67fa06e1559c8de87899bd06d09891b4c7ae947 - [x] #86095 - Reverted in dc5abd827bb56e1609afe5a9d2bdd957d40cc75c - [x] #86105 - Reverted in f5b8e7ecbe99cb38e829a98a4f6eb2c200af8b91 - [x] #86070 - Reverted in 6c460bbc22827bdbc566b524b8e6a959cbb61c37 After that some startup commits on this branch need to be reverted then it can be merged. --------- Co-authored-by: tgstation-ci <179393467+tgstation-ci[bot]@users.noreply.github.com> Co-authored-by: Jordan Dominion <Cyberboss@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com> Co-authored-by: MrMelbert <kmelbert4@gmail.com>	2024-09-03 10:41:51 +02:00
Ghom	659e6f0ca2	Fishing expansion 2: one-year later boogaloo (#85252) ... ## About The Pull Request This PR mainly adds more fish and more fishing spots to the game, while refactoring a few aspects of the fishing minigame. Listing out with the new fish: - Arctic char: mainly filler content for the ice hole fishing spot - Sockeye Salmon: ditto but also provides better fillets that boost the quality of resulting food items when cooked or used in recipes - Soulfish: joke content, found by the cursed spring ruin - Skin Crab: also a joke found by the cursed spring - Bump-Fish: filler for the sand fishing spot - Burrower Crab: ditto, reusing a fish sprite I made last year - Sand Surfer: ditto - Three-Eyed Goldfish: It's a reference, doh - Stingray: A modestly weaponizable fish (whoops I've forgot to set the hit sounds), it possess a few traits that make it deliver bits of venom each time you hit someone with it - Swordfish: Huge-ass fish that may require two hands to wield (or not, if the RNG wants to make it smaller). Stats-wise, it's more or less the equivalent of the captain sabre, if not stronger (and more unwieldy due to size and weight). Becomes weaker when dead. Also gives better quality fillets. - Chainsawfish: A mutation of the goldfish with some size, weight and traits requirements, but can also be found on emagged fishing portals. Stronger than the swordfish, it behaves sort of like a chainsaw, with the similar tool behaviour and var values. Also becomes weaker when dead. As for the fishing spots, you can now fish on sand turfs, at the cursed springs or on ice. Rivers/jungle water now has its own fishing spot datum, and no longer uses the generic fishing portal one. To fish on ice, you first have to carve a hole with a pick or a shovel. I've also refactored the fish "AI" hardcoded stuff used in the fishing minigame into their own datums, which let me add a few fancier ways to how the fish moves during the minigame (i.e. the soulfish moving at 1 FPS or the chainsawfish getting faster and faster). As for the sword and chainsaw fish, their potential strength is balanced out by the need of keeping them alive, as well as the potential cumbersomeness, two-handed wielding and potential slowdown from the excessive weight of the fish (Thank you Big Slappy for the inspiration). Other minor changes include: Pufferfish giving better quality fillets (too bad they're poisonous, I'll go and make a skillchip to let cooks safely separate the poisonous liver from the fillets); McGill The lawyer's goldfish) having a 15% of being three-eyed; the aforementioned slowdown from fish weight and two-handed carry from fish size; a couple new fish icons (the ones that hint you on what you're trying to catch) for the fishing minigame; a few adjustments to prevent self-reproducing fish from ignoring the population cap and let fish with a stable population of 1 to crossbreed (also gotta make a different PR to let it happen rarely without the crossbreeding trait). This PR is still a WIP, gotta test it several times. ## Why It's Good For The Game Fishing is something I've been working on for about a year now, but there are still a few places where it's kinda lackluster, like there's not enough diverse fishing spots or useful fish (I'll be working on a separate PR to make the logistic of a carrying a fish around without letting it die a tad easier). Also, look at these sprites:  Can you guess which is which? ## Changelog For the sake of not dumping players with niche information 90% of the players won't understand, I'll keep the CL pretty generic 🆑 add: Added twelve new fish types to the game. Some are cool, other are not, some come with their own special traits and some are straight-up weapons. add: Added more fishing spots to the game. Sand, ice, rivers, the cursed spring... balance: A few fish like salmon, swordfish and pufferfish (poisonous btw) now give better quality fillets when butchered, which can improve the quality of food that uses them even further. balance: Excessive fish weight will make the fish slowier to carry, while excessive size may make it require two hands. balance: Adjusted size, weight and cooldowns of several fish, for the better. /🆑	2024-08-20 06:46:11 +02:00
carlarctg	2f69fe6190	Adds three new deathmatch maps - Ragnarok, Lattice Battles, Species Showdown (#85319) ... ## About The Pull Request Adds three new deathmatch maps. ### Important nonDM Balance Changes Cult daggers fit on belts. Heretic blades fit on belts. Veil shifters fit on belts. I really don't know why these didn't, it makes inventory management rather annoying at times. It also screwed my loadouts over. Cursed Blades fit on cult robes. They're cult equipment after all. Bronze suits fit toy watches!! ### Ragnarok  A vicious battle in the jungle, between the three major religious sects: Prove your deity's might! And try not to upset any primates. Or fall into the chasm. Going clockwise: **Cultist Invoker**: Wielding a mirror shield, shielded robes, a sword, and some bolas, this cultist has a 'well-balanced' set of equipment to annihilate their opponents. **Cultist Artificer**: This set harnesses the blood magicks - with spells of stunning, blood rites, and ranged hallucinations, with a wicked Cursed Blade and Veil Shifter as implement, and Berserker Robes to finish the look. **Holy Crusader**: Nullifying most, but certainly not all, of the fearsome arsenal of the opponents with the null rod at their belt, the Crusader packs a dangerous claymore and armor to protect them from the demons. **Rat'var Apostate**: Hey, what's that guy doing there in the dark? They don't have any magic because their god is Fucking Dead, but they're still going to show up for a token effort. Good luck! **Heretic Scribe**: This mad soul wields an antique rifle and an assortment of other dangerous relics, with a set of magic geared towards staying far apart, picking enemies off from range and evading their attacks for the final blow. **Heretic Warrior**: With the deadliest of Mansus Magic at their disposal, this warrior is only limited by their ability to juggle all their spells at once - don't get overwhelmed sorting your spells while an Invoker runs at you with a sword and shield and makes you cry yourself to death. ### Lattice Battles  A fresh change of pace: In this pacifist map, the only way to kill your opponents is to snip the lattices and catwalks from under them. Watch your step. ### Species Warfare  Prove the might of your static by duking it out with every other kind of crewmember out there. Features a messy dorms, a ticking-timebomb atmos, a rather sterile robotics, a slippery closet, a fluffy medbay, and an energetic bridge. Mirror Shields now shatter on throw (which stuns and hurts) ## Code changes Added two new traits, TRAIT_ACT_AS_CULTIST and TRAIT_ACT_AS_HERETIC. Added these as an OR to respective IS_X checks. Added new GET_X checks for them, which do not check the trait. Tidied up the file those are in. Added belt_contents() to outfits, but it dosen't work.... Added a heretic rust sister-type to rust walls and floors. Fixed a typo in cult ascension. ## Why It's Good For The Game These maps all aim to do something interesting and unique with DM rather than the usual deathfest and hugging of random crates. Ragnarok allows players to practice unusual and rare magical mechanics, similar to Ragin' Mages. Lattice Battles adds SPLEEF to the game, which I think is awesome. Species Warfare is, I think, fun and funny. Each 'department' has incredibly chaotic and thematically-appropiate content for the species its meant to symbolize, and I look forward to the chaos that every round in it is inevitably going to have. > Mirror Shields now shatter on throw. I'm surprised they didn't! Since they aren't used anywhere I can do what I want with them. ## Code changes > Added two new traits, TRAIT_ACT_AS_CULTIST and TRAIT_ACT_AS_HERETIC. Added these as an OR to respective IS_X checks. Added new GET_X checks for them, which do not check the trait. I think this is a clever solution to the problem of 'what if I want someone who acts as the antag, but isn't?' Some procs do need the datum to modify it, so there's GET_X, but those aren't common and don't seem likely to be an issue. > Added belt_contents() to outfits, but it dosen't work.... Help would be very much appreciated, I don't know what I'm doing wrong here. It's only used for the heretic scribe's unfathomable curio. Some post-PR cleanup coming up. ## Changelog 🆑 add: Added three new DM maps - Ragnarok, Lattice Battles, Species Showdown. /🆑	2024-08-19 13:47:27 +00:00
John Willard	b6d3e114da	Adds taunting as a replacement for spin/flip in style meter and parrying (#85605) ... ## About The Pull Request Replaces spin/flip's uses in mining's style meter and bitrunner's projectile parrying and instead uses a new emote, taunt. It also does not play a sound effect for emoting, only when you successfully block a projectile. The parrying time from the flip was 1.4 seconds, with taunting it is now 0.9 seconds. Taunting also has a cooldown of 1.5 seconds between uses. https://www.youtube.com/watch?v=cJGuEqNhqUs https://github.com/user-attachments/assets/1c6bf8b2-6a0d-4ae2-9b5b-9c6e619e76d6 ## Why It's Good For The Game Spin and flip are emotes that get a little boring and repetitive, which makes its complete overuse quite annoying to see. Compared to spin, taunting is a quick turn, which stacked with the cooldown, makes it a shorter and un-overusable emote. It also has a cooldown of 1.5s between hits, so players now actually have a limit to how much they can parry/style. Currently if you have some way to regenerate stamina damage, you're pretty set to spam parry all projectiles at essentially no cost, since emotes cost nothing to use, removing the limit of having to actually time it. I wouldnt say falling over is necessarily a downside since anyone who uses these items for a while can quickly figure out exactly hwo to maximize parrying time. ## Changelog 🆑 add: Added Taunting, a faster and cooldowned version of the Spin emote. balance: Wizards blocking projectiles with Transparence and the bitrunner matrix skillchip now have a visible effect of deflecting the projectile. balance: The bitrunner skillchip now uses taunt instead of flip. balance: The style meter now uses taunting instead of flips and spins. /🆑	2024-08-19 01:05:56 +00:00
Ghom	ff3b73dc82	Refactored the fish case and examining fish. New bluespace fish case to fit large fish inside a backpack. (#85271) ... ## About The Pull Request I've refactored the FISH_SAFE_STORAGE trait into an element, mainly because there were a few problems with how it worked: It wasn't stopping hunger from raising, ditto with the breeding wait, and it offered no healing whatsoever, which I find kind of a bummer. The new element will keep the fish from getting any hungrier or ready to reproduce and will heal them up to 65% of their base health. Also, I've added a new bluespace fish case as a techweb design, found along with other stuff in the advanced fishing node, though if you want I can move it to a bluespace node. This should make it possible to reasonably store and carry around larger fish. Examining a fish will no longer give out readings on weight and size if you haven't at least attempted fishing once (you can get to novice level in less than a minute). While examining a fish with apprentice level or higher will also give readings on the general conditions of the fish (is it starving? drowning? has it lost a considerable chunk of health?). The fishing skillchip also gives you these traits. I've also converted two fish variables into traits, because fish have waaaay too many variables. and gave some topdown shading to the pre-existing fishbox sprite. ## Why It's Good For The Game ## Changelog 🆑 add: Added a bluespace fish case to the advanced fishing node. balance: Fish cases will keep a fish from getting hungrier or ready to reproduce, while also healing it up to 65% health. balance: Examining a fish with zero fishing skill whatsoever won't give a reading on its size and weight. Conversely, examining one with the skill leveled two times will give general information on if it's starving, sick, hungry, or dead. /🆑	2024-08-18 06:06:17 -07:00
itseasytosee	3eeda64275	Moves more species traits to bodyparts +bugfixes (#85692) ... ## About The Pull Request I've retaken up the crusade to make species specific features modular, with the end goal of being able to essentially ship of thesis a person without causing any strangeness (eg, currently if you take an abductor and replace every body part and organ with a human one including the brain they still don't need to breath.) To make that a reality we will need to develop a few more robust tools but here are some easy fixes for right now. Changes are: lizard: TRAIT_TACKLING_TAILED_DEFENDER -> moved to Lizard Brain monkey: TRAIT_GUN_NATURAL -> moved to Primate Brain Ethereal: TRAIT_NO_UNDERWEAR -> moved to chest TRAIT_FIXED_HAIRCOLOR -> removed (had no implementation) TRAIT_TENACIOUS (illustrious) -> Not functional, fixed by making it an element that the brain applies Moth: TRAIT_TACKLING_WINGED_ATTACKER -> moved to chest TRAIT_ANTENNAE -> moved to head ## Why It's Good For The Game Makes sense. More fun for mad scientist types/limbscambler ## Changelog 🆑 itseasytosee fix: illustrious ethereals now properly get the tenacious trait code: more species features have been moved to their individual body parts. /🆑	2024-08-14 13:16:45 +02:00
GPeckman	f69284be5b	Abductors can no longer be converted by conversion antags (#84766) ... ## About The Pull Request Basically what the title says. Abductors cannot be converted by bloodbrother/revs/cult. They will NOT show up as having a mindshield, however. ## Why It's Good For The Game Abductors are, by design, incredibly strong. You are not meant to be able to win against them, and this is reflected policy-wise by the fact that they're a restricted antagonist. However, this is still a problem when conversion antags get involved. If an abductor becomes a cultist or a revolutionary, then suddenly every other player who isn't also converted has to deal with an abductor without the normal restrictions. It's not fun to play against and in general just shouldn't happen. ## Changelog 🆑 balance: Abductors (the antag, not the species) can no longer be converted by any antagonist. /🆑	2024-08-14 13:10:57 +02:00
LemonInTheDark	4b4e9dff1d	Wallening [IDB IGNORE] [MDB IGNORE] (#85491) ... ## What's going on here Kept you waitin huh! This pr resprites most all walls, windows and other "wall adjacent" things to a 3/4th perspective, technical term is "tall" walls (we are very smart). If you're trying to understand the technical details here, much of the "rendering tech" is built off the idea of split-vis. Basically, split a sprite up and render it on adjacent turfs, to prevent seeing "through" walls/doors, and to support seeing "edges" without actually seeing the atom itself. Most of the rest of it is pipelining done to accommodate how icons are cut. ## Path To Merge Almost* all sprites and code is done at this point. There are some things missing both on and off the bounty list, but that will be the case forever unless we force upstream (you guys) to stop adding new shit that doesn't fit the style. I plan on accepting and integrating prs to the current working repo <https://github.com/wall-nerds/wallening> up until a merge, to make contribution simpler and allow things like bounties to close out more easily This pr is quite bulky, even stripping away map changes it's maybe 7000 LOC (We have a few maps that were modified with UpdatePaths, I am also tentatively pring our test map, for future use.) This may inhibit proper review, although that is part of why I am willing to make it despite my perfectionism. Apologies in advance. Due to the perspective shift, a lot of mapping work is going to need to be done at some point. This comes in varying levels of priority. Many wallmounts are offset by hand, some are stuck in the wall/basically cannot be placed on the east/west/north edges of walls (posters), some just don't look great good in their current position. Tests are currently a minor bit yorked, I thought it was more important to get this up then to clean them fully. ## What does it look like?       ## Credits <details> <summary>Historical Mumbojumbo</summary> I am gonna do my best to document how this project came to be. I am operating off third party info and half remembered details, so if I'm wrong please yell at me. This project started sometime in late 2020, as a product of Rohesie trying to integrate and make easier work from Mojave Sun (A recently defunct fallout server) with /tg/. Mojave Sun (Apparently this was LITERALLY JUST infrared baron, that man is insane) was working with tall walls, IE walls that are 48px tall instead of the normal 32. This was I THINK done based off a technical prototype from aao7 proving A it was possible and B it didn't look like dogwater. This alongside oranges begging the art team for 3/4th walls (he meant TGMC style) lead to Rohesie bringing on contributors from general /tg/, including actionninja who would eventually take over as technical lead and Kryson, who would define /tg/'s version of the artstyle. Much of the formative aspects of this project are their work. The project was coming along pretty well for a few months, but ran into serious technical issues with `SIDE_MAP`, a byond map_format that allows for simpler 3/4th rendering. Due to BULLSHIT I will not detail here, the map format caused issues both at random with flickering and heavily with multiz. Concurrent with this, action stepped down after hacking out the rendering tech and starting work on an icon cutter that would allow for simpler icon generation, leaving ninjanomnom to manage the project. Some time passed, and the project stalled out due to the technical issues. Eventually I built a test case for the issues we had with `SIDE_MAP` and convinced lummox jr (byond's developer) to explain how the fuckin thing actually worked. This understanding made the project theoretically possible, but did not resolve the problems with multi-z. Resolving those required a full rework of how rendering like, worked. I (alongside tattle) took over project development from ninjanomnom at this time, and started work on Plane Cube (#69115), which when finished would finally make the project technically feasible. The time between then and now has been slow, progressive work. Many many artists and technical folks have dumped their time into this (as you can see from the credits). I will get into this more below but I would like to explicitly thank (in no particular order) tattle, draco, arcanemusic, actionninja, imaginos, viro and kylerace for keeping the project alive in this time period. I would have curled up into a ball and died if I had to do this all myself, your help has been indispensable. </details> <details> <summary>Detailed Credits</summary> Deep apologies if I have forgotten someone (I am sure I have, if someone is you please contact me). I've done my best to collate from the git log/my memory. Thanks to (In no particular order): Raccoff: Being funny to bully, creating threshold decals for airlocks aa07: (I think) inspiring the project ActionNinja: Laying the technical rock we build off, supporting me despite byond trying to kill him, building the icon cutter that makes this possible ArcaneMusic: Artistic and technical work spanning from the project's start to literally today, being a constant of motivation and positivity. I can't list all the stuff he's done Armhulen: Key rendering work (he's the reason thindows render right), an upbeat personality and a kick in the ass. Love you arm Azlan: Damn cool sprites, consistently Ben10Omintrix: You know ben showed up just to make basic mobs work, he's just fuckin like that man BigBimmer: A large amount of bounty work, alongside just like, throwing shit around. An absolute joy to work with Capsandi: Plaques, blastdoors, artistic work early on CapybaraExtravagante: Rendering work on wall frames Draco: SO MUCH STUFF. Much of the spritework done over the past two years is his, constantly engaged and will take on anything. I would have given up if not for you Floyd: Early rendering work, so early I don't even know the details. Enjoy freedom brother Imaginos16: A guiding hand through the middle years, handled much of the sprite review and contribution for a good bit there Iamgoofball: A dedication to detail and aesthetic goals, spends a lot of effort dissecting feedback with a focus on making things as good as they can be at the jump Infrared: Part of the impetus for the project, made all the xenomorph stuff in the MS style Jacquerel: A bunch of little upkeep/technical things, has done so much sprite gruntwork (WHY ARE THERE SO MANY PAINTING TYPES) Justice12354: Solved a bunch of error sprites (and worked out how to actually make prs to the project) Thanks bro! Kryson: Built the artstyle of the project, carrying on for years even when it was technically dying, only stopping to casually beat cancer. So much of our style and art is Kryson KylerAce: Handled annoying technical stuff for me, built window frame logic and fully got rid of grilles. LemonInTheDark: Rendering dirtywork, project management and just so much fucking time in dreammaker editing sprites Meyhazah: Table buttons, brass windows and alll the old style doors Mothblocks: Has provided constant support, gave me a deadline and motivation, erased worries about "it not being done", gave just SO much money to fill in the critical holes in sprites. Thanks moth MTandi: Contributed art despite his own blackjack and hookers club opening right down the road, I'm sorry I rolled over some of your sprites man I wish we had finished earlier Ninjanomnomnom: Consulted on gags issues, kept things alive through some truly shit times oranges: This is his fault Rohesie: Organized the effort, did much of the initial like, proof of concept stuff. I hope you're doin well whatever you're up to. san7890: Consulting on mapper UX/design problems, being my pet mapper Senefi: Offsetting items with a focus on detail/the more unused canidates SimplyLogan: Detailed map work and mapper feedback, personally very kind even if we end up talking past each other sometimes. Thank you! SpaceSmithers: Just like, random mapping support out of nowhere, and bein a straight up cool dude Tattle: A bunch of misc project management stuff, organizing the discord, managing the test server, dealing with all the mapping bullshit for me, being my backup in case of bus. I know you think you didn't do much but your presence and work have been a great help Thunder12345: Came out of nowhere and just so much of the random bounties, I'm kind of upset about how much we paid him Time-Green: I hooked him in by fucking with stuff he made and now he's just doin shit, thanks for helping out man! Twaticus: Provided artistic feedback and authority for my poor feeble coder brain, believed in the project for YEARS, was a constant source of ❤️ and affirmation unit0016: I have no god damn idea who she is, popped out of nowhere on the github one day and dealt with a bunch of annoying rendering/refactoring. Godspeed random furry thank you for all your effort and issue reports Viro: A bunch of detailed spriting moving towards 3/4ths, both on and off the wallening fork. If anyone believed this project would be done, it was viro Wallem: Artistic review and consultation, was my go-to guy for a long time when the other two spritetainers were inactive Waltermeldon: Cracked out a bunch of rendering work, he's the reason windows look like not dogwater. Alongside floyd and action spent a TON of time speaking to lummox/unearthing how byond rendering worked trying to make this thing happen ZephyrTFA: Added directional airlock helpers, dealt with a big fuckin bugaboo that was living in my brain like it was nothing. Love you brother And finally: The Mojave Sun development team. They provided a testbed for the idea, committed hundreds and hundreds of hours to the artstyle, and were a large reason we caught issues early enough to meaningfully deal with them. Your work is a testament to what longterm effort and deep detailed care produce. I hope you're doing well whatever you're up to. Go out with a bang! </details> ## Changelog 🆑 Raccoff, aa07, ActionNinja, ArcaneMusic, Armhulen, Azlan, Ben10Omintrix, BigBimmer, Capsandi, CapybaraExtravagante, Draco, Floyd, Iamgoofball, Imaginos16, Infrared, Jacquerel, Justice12354, Kryson, KylerAce, LemonInTheDark, Meyhazah, Mothblocks, MTandi, Ninjanomnom, oranges, Rohesie, Runi-c, san7890, Senefi, SimplyLogan, SomeAngryMiner, SpaceSmithers, Tattle, Thunder12345, Time-Green, Twaticus, unit0016, Viro, Waltermeldon, ZephyrTFA with thanks to the Mojave Sun team! add: Resprites or offsets almost all "tall" objects in the game to match a 3/4ths perspective add: Bunch of rendering mumbo jumbo to make said 3/4ths perspective work /🆑 --------- Co-authored-by: Jacquerel <hnevard@gmail.com> Co-authored-by: san7890 <the@san7890.com> Co-authored-by: = <stewartareid@outlook.com> Co-authored-by: Capsandi <dansullycc@gmail.com> Co-authored-by: ArcaneMusic <hero12290@aol.com> Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> Co-authored-by: SomeAngryMiner <53237389+SomeAngryMiner@users.noreply.github.com> Co-authored-by: KylerAce <kylerlumpkin1@gmail.com> Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com> Co-authored-by: Runi-c <5150427+Runi-c@users.noreply.github.com> Co-authored-by: Roryl-c <5150427+Roryl-c@users.noreply.github.com> Co-authored-by: tattle <article.disaster@gmail.com> Co-authored-by: Senefi <20830349+Peliex@users.noreply.github.com> Co-authored-by: Justice <42555530+Justice12354@users.noreply.github.com> Co-authored-by: BluBerry016 <50649185+unit0016@users.noreply.github.com> Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: SimplyLogan <47579821+loganuk@users.noreply.github.com> Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com> Co-authored-by: Rob Bailey <github@criticalaction.net> Co-authored-by: MMMiracles <lolaccount1@hotmail.com>	2024-08-14 09:07:45 +00:00