Nocs-a-petty-bitch-(or,-lore-accurate-magick)#3
Open
Eagletanker wants to merge 275 commits into
Open
Conversation
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request port tgstation/tgstation#51790 port tgstation/tgstation#75658 Fix not being able to hear/be heard in nested locs Fix runechat not showing inside nested locs Fix chatmessage qdel runtime Fix being able to be put into important recursive contents twice The main takeaway for players is you can whisper and do a language / sing / etc at the same time <img width="274" height="71" alt="image" src="https://github.com/user-attachments/assets/ad52fa76-c5a6-4692-8ce5-6bbbc9bd72fa" /> Allow `/mob/living/send_speech` to check a Z above and below without looping through players so that other hearing atoms can hear the message, could be too unperformant, needs tm. Removes now redundant code from `/mob/living/send_speech`. Pave the way for the say rework tgstation/tgstation#69799 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
…during day (Monkestation#2411) ## About The Pull Request var/list/entry_requirements is an ass_list with key = value requires_all is in case it isn't a OR add logic where needed, update_tod changes the icon state, gets added to todUpdate if its time based to trigger Restricts the town dungeon from being entered/exited during night bounty here: https://discord.com/channels/748354466335686736/1393448056208359567/1393448056208359567 ## Why It's Good For The Game bounty here: https://discord.com/channels/748354466335686736/1393448056208359567/1393448056208359567 ## Pre-Merge Checklist - [ ] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes.
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request closes Monkestation#2516 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request closes Monkestation#2514 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request For all of them. Copper pots apparently have been broken the whole time. <img width="370" height="398" alt="image" src="https://github.com/user-attachments/assets/64348dbe-ca61-485b-ad9d-fe356dc13e8e" /> <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Fixes good even if minor. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request - lots of recipes can now be started both with bundles and by flipping the starting ingredients - MMB the craft button to see a recipe book of basic crafts - leatherworking standardized so leather clothing are made from hitting leather with needle. non-clothes items are made by hitting a rack with a needle - Backpack and satchels need rope (2 and 1 respectively) - BALANCE: breaking out of ropes and chains is faster because 5 minutes is actual CBT <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game code cleanup. qol. balance <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game all you need to care about is that grabbing is reworked. tell me any balancing changes <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request At some point it was changed to the keyring sprite. This fixes the mistake. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Sprite fix. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Propa fix for potes and fix bottle thresholds <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Forcing and joining as part of a migrant wave crashes the game while on the roguetest map, because most migrants use the Pilgrim landmark to spawn, which the debug map doesn't have/destroys after roundstart <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Just as it says <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game people are infinitely scaling magic to one hit death nukes, APEX is 1.21 most spells are 0.3 to 1 so 2.5 is a sensible clamp <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Title, as not all maps are gonna have it. ## Why It's Good For The Game Bugfix. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Pray verb now also shows in the emotes tab as well as in the IC tab, as was originally intended. ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Bugfix. ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> This PR changes several things regarding wanted posters, bandits and outlaws in general. **Bandits and outlaws:** - Added "Pardon Outlaw" command to the throne, as having both declare and pardon option in one leads to mistakes in either declaring outlaw of someone you wanted to pardon, or pardoning existing outlaw when you wanted him to be declared an outlaw - Bandits now start as declared outlaws - Adepts no longer start as declared outlaws, as they are former ones granted a new chance by the inquisitor - Improved bandit examination both for bandits and non bandits. Non bandits will see bandit! examine when they have both the trait to recognize bandits AND the examined bandit is also an outlaw. That means monarch can now pardon bandits, which causes them to lose their examine until they are declared outlaw again. Bandits will see various friendly bandit examination messages based on their and target's outlaw status **Wanted poster:** - You wont get repeated "I can recognize..." message everytime you examine the poster, only the first time which gets you the bandit recognition trait - It is now intended to show outlaws in general, not just bandits. This means you also get funny messages about recognizing yourself on the poster as a non bandit outlaw - Added a hint to come closer if you are too far away to see outlaws' faces - Close examination now opens a new UI, which contain all outlaws headshots from the start of the game (it does not update, so outlaws can try to change their roundstart clothes or hairstyle to blend in better) **Example poster headshot:** <img width="223" height="288" alt="ExampleWANTED" src="https://github.com/user-attachments/assets/d5eb99e9-3637-4506-89a8-5a2f5704cff7" /> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Better system for handling and interacting with outlaws. ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Waterskin has sprited corks now! Woohooo!!! <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <img width="741" height="280" alt="grafik" src="https://github.com/user-attachments/assets/f92a0029-f000-49fd-ac0a-65ae70e41f7c" /> <img width="729" height="285" alt="grafik" src="https://github.com/user-attachments/assets/f4676458-4d23-49f0-a922-50b4822c1b85" /> <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Probably fix incorrect examine text, hard to local test <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Selecting a role in a migrant wave now tells you why you could not join it. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <img width="476" height="90" alt="grafik" src="https://github.com/user-attachments/assets/3c8fe34c-68f3-4ed7-8587-2420573eb674" /> <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
…2509) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request ### The Outfit <img width="217" height="200" alt="image" src="https://github.com/user-attachments/assets/adc9672b-6bda-4390-88fb-3f3ad13695e5" /> Main changes here were removing the old Winter Coat, and replacing it with Splint Armour so they actually stand a bit more of a chance when they start taking hits. They also received a satchel because they didn't have one before, and also the old puritan cape that once belonged to the Inquisitor to round out the look. ### The Silver Whip <img width="113" height="114" alt="image" src="https://github.com/user-attachments/assets/150045cb-5bb5-440d-9746-8c140a40776a" /> A Whip specifically modified for dealing with Nitebeasts, and now they start with a weapon that makes use of their Expert level in Whips & Flails. The sprite was ported from Azure-Peak. Originally from: Azure-Peak/Azure-Peak#1988 The Silver Whip can also be crafted using an Anvil. The recipe is: - 1x Silver Bar - 2x Cured Hide ### Skills, Stats and Traits Skills and Stats have remained unchanged, but their Mail Training trait has been replaced with Fast Reflexes. It seemed really weird to me that Witch Hunter was given Mail Training and yet didn't even start with any Medium Armour. Fast Reflexes however leans more into the idea that the Witch Hunter is more of a duellist and should be dodging and parrying blows instead of tanking hits. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> The Witch Hunter has always felt like it was forgotten about and left to rot, and was overall pretty lackluster as a rare Adventurer role. This PR aims to breathe some life into the role by giving it new starting gear and a new weapon for them to make use of in niche cases. ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
…ll is reselected (Monkestation#2528) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Trigger a timer when spells start a cooldown which sends a signal for *natural* cooldown ending which if possible retriggers the last spell used. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Mirror previous behaviour. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Bug fix for: Monkestation#2544 ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Key was wrong. ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
…details) (Monkestation#2453) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request _This is my second attempt at this after messing up the old branch._ Azure Peak has a lot of drip, and Vanderlin lacks quite a lot of it. So we're porting what we can to fix this issue! This PR fulfils a code bounty made by LuckyCobra on the Discord. ### Silver Armor Set (Formerly Martyr Armor) <img width="300" height="187" alt="image" src="https://github.com/user-attachments/assets/20362b18-a6ab-4ccb-a22d-8d884f9c9838" /> <img width="215" height="138" alt="image" src="https://github.com/user-attachments/assets/8b215454-3335-405d-a799-7cb77cf35f25" /> Craftable Silver Armor and a Fine Silk Tabard. Ported from: Azure-Peak/Azure-Peak#1505 This Armor Set will likely be repurposed in the future for Tyger's Grand Templar jobrole. But right now, its obtainable through crafting. Also, **YOUNGLINGS CANNOT WEAR THIS ARMOUR DUE TO MISSING ONMOB SPRITES**. When we have the onmob sprites, they'll be able to equip it (despite it being silly seeing literal children wearing full heavy plate armor, but that's not within the scope of this). Recipes: - Silver Full Plate: 2x Silver Bars, 3x Steel Bar - Silver Platelegs: 1x Silver Bar, 2x Steel Bar - Silver Bascinet: 1x Silver Bar, 2x Steel Bar - Fine Silk Tabard: 4x Silk ### Decorated Silver Longsword (Formerly Martyr Longsword) <img width="318" height="170" alt="image" src="https://github.com/user-attachments/assets/8cbe327f-bcce-4d09-ac72-6a3e161fa323" /> Craftable Decorated Silver Longsword. Ported from: Azure-Peak/Azure-Peak#1505 Same deal as the above armour set. Likely to be repurposed for Grand Templar, but for now it'll be craftable. Recipe: 2x Silver Bars, 1x Gold Bar ### Leather Collar and Bell Collar <img width="392" height="229" alt="image" src="https://github.com/user-attachments/assets/d066cbf5-f692-4487-beea-ac0092e99f2d" /> <img width="175" height="108" alt="image" src="https://github.com/user-attachments/assets/e151d69e-9a7d-4c16-b78c-347aea041466" /> Craftable Leather Collar and Bell Collar. Ported from: Azure-Peak/Azure-Peak#1097 (A port of a port? Wowza!) Fashion for Hollowkins, and for anyone else if they so wish. Now they can actually look the part of pets for their Dark Elf masters. Also doubles as neck armor. Craftable, and the recipes are the same as the ones found on Azure + an extra 2 fibers, and has to be crafted on a drying rack. Leather Collar: 1 cured leather, 2 fibers. Bell Collar: 1 cured leather, 2 fibers, 1 jingle bells. Jingle Bells can be crafted with 1 iron bar with an Artificer's Table, same as on Azure Peak. ### Silver Mask <img width="268" height="227" alt="image" src="https://github.com/user-attachments/assets/f53b32a5-f741-49f4-a2da-eaea07368cef" /> <img width="120" height="111" alt="image" src="https://github.com/user-attachments/assets/96bc3d80-7020-4cc4-a169-e57aa8397b69" /> This one isn't a port, but a new sprite and item! A Silver Mask, replacing the Adept's Iron Mask. | Both sprites done by karlgoblington More drip for Adepts that makes them more recognisable at a glance. This is uncraftable, and only spawns on Adepts, but it can be purchased for 2 favors. ### Xylix Templar Helm <img width="110" height="107" alt="image" src="https://github.com/user-attachments/assets/97a36195-942b-4b21-80cf-4ea1a9ac15bf" /> Xylix Templars now finally get some drip. Definitely a step in the right direction, because Xylix does need more love... Ported from: Azure-Peak/Azure-Peak#2681 ### Port of Azure's Blacksteel Armor Sprites <img width="348" height="215" alt="blacksteel screenshot" src="https://github.com/user-attachments/assets/6e791a94-5f61-42cf-b3d5-bcd5f6f1170d" /> <img width="609" height="101" alt="image" src="https://github.com/user-attachments/assets/67b80090-4eed-46ba-95c4-67ec2209f7a0" /> Ported the sprites for Azure's version of Blacksteel Armour. Stats and crafting remain unchanged, this is just a visual improvement. ### Graggarite Armor Set <img width="343" height="213" alt="graggar screenshot" src="https://github.com/user-attachments/assets/5ae2f562-c867-4ecc-8691-4ac1a09f853a" /> <img width="721" height="108" alt="image" src="https://github.com/user-attachments/assets/32fe5d7d-084c-4a0c-a827-2ac4407704cc" /> Another set of evil armour to go along with the Zizo & Matthios armour we already have. This cannot be crafted, and is only obtainable through Admin commands. Coming soon to the next Admin Event near you! Ported from: Azure-Peak/Azure-Peak#2676 ### Extra, non-port treats... You may have noticed above, but The Brutal Zealot, and Reformed Thief subclass will spawn with the Adept's Cowl, but it can also be purchased for 1 favor. This was custom made to fit the new masks, and was sprited by karlgoblington <img width="95" height="107" alt="image" src="https://github.com/user-attachments/assets/41a47f6d-7d42-42d1-b1c8-b8de69f4f4ea" /> Its now possible to block clothes from being worn by Younglings. Only implemented currently to block them from wearing the Silver Armor Set due to lack of onmob sprites, but this could be used in the future if we wish to stop them from wearing full plate or any armor we want. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> More drip is always good! More ways to express your character, and Azure has a lot of really nice armor, clothes and weapons that I definitely want to port in the future. ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> --------- Co-authored-by: grungussuss <96586172+grungussuss@users.noreply.github.com>
…onkestation#2550) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Somehow a court mage ended up leaving the jaunt without triggering the leave, this assures any method of leaving the jaunt dummy removes the traits granted by jaunting. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Added a way to adjust gender-locks for some jobs for maps. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Something, Something, Drow map zizo map or something, i don't know, i don't remember <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Adds the medicator species, another bird that's more bird and also like a snail. Cleans up external/internal organ file organisation and moves all organs to there. Organs update on mob when severed (Medicators without beaks are hideous), organs without severed icons use the on mob icon so they have one at least. Fix severed pointy ear sprites for those dwaves out there. todo - [x] Sane method of decals when not moving - [ ] Implement the neck features better and implement the arm and hand fluff as bodypart_features that are severable Sprites done by cre. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> This PR cleans up and fixes normal marriages, and adds secret marriages. **Changes:** - General code cleanup of the marriage code - Better user feedback in case marriage failed - More sensible marriage checks, like forbidding officiant to be able to conduct their own wedding - Apple does not burn anymore in case marriage failed - Eora's chosen in the matchmaker event now gets an option to conduct secret marriage outside of the church, which also won't make a world announcement. Ceremony is otherwise the same ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Working marriages, better feedback and more eora's chosen flavor. ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
…ault (Monkestation#2562) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Damage converting made with TG health in mind and needs a rework for us to not just be 100% beneficial <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Changes the heartfelt migrant wave considerably. 1. Everyone now gets varying degrees of engineering skill. 2. Adds wave downgrades. Instead of 6 players or bust, it now has 4 total versions, with only the Lord on the last wave. 3. Moved Lords leyline recharge to the magos, was probably an oversight. The scomstone now spawns on his ring slot and he gets the heartfelt satchel with the note containing his (optional) goal, alongside a waterskin purifier. 4. The lady doesn't spawn with almost nothing anymore. They now get a belt (probably oversight), pants, satchel, bow and arrow with average skill, steel dagger and a pouch of coins. 5. Hand also starts with the scomstone on his ring slot, and only gets a normal satchel now. If only the Lord spawns, then they should get the note IMO. 6. The Knight now gets a full suit of steam armor, and a random amount of steam left over in the boiler (50%-90%) as well as a minor stat debuff and int buff, similarly to the RK steam knight. 7. Magos now gets the intrinsic leyline recharge from the lord. 8. The prior got removed from the wave, replaced by the supreme artificer. The role itself still remains in the code for now. Felt like a dedicated artificer made more sense to be alongside the rest of the court, and the wave did not need any more bloat IMO. 9. The Supreme Artificer! Basicaly just a copy of the towner artificer, but with Legendary Engineering, a purifier waterskin and the cooling backpack. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game More heartfelty <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request If there is only 1 recipe available and it's a cooking recipe, initiate it without a menu. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Compromise. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: better cooking qol /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> This PR adds a new communal triumph buy: - **Longer Week** - Costs 100 triumphs. Preround only. When fully funded, it will delay the time the first round end vote appears by roughly 40 real time minutes, allowing players to count on a guaranteed longer round. Moreover it also cleans up some situations with multiple buys, so you don't always get leprosy for example on a new character when you respawn, unless you buy it again. It also reduces leprosy and fart ability triumph buys costs by 1 and tweaks leprosy stat debuff to be -3 across the board instead of one missing, two of them being -2 and the rest being - 5, lepers also get no pain, as its very thematic for them. ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> More interesting triumph buys. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: Arkatos add: Added a new communal triumph buy - Longer Week. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request - Greatsword and halberd wield damage reduced - swift intent does less damage - Royal knights no longer get master skills <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game balanceslop <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: balance: royal knights no longer get master skill balance: swift intent does less damage balance: greatswords and halberds do less damage /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Title ## Why It's Good For The Game Why did they had in the first place? They come from outside Vanderlin and none of those has a lore pointing to being part of the maker guild, even the Supreme Aritifcer in the Heartfelt Migration don't got Vanderlin Artificer keys. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: del: Remove Artificer Keys from pilgrims. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request right clicking someone with an item offers it, but better: https://github.com/user-attachments/assets/61be2b8a-9f35-4515-92ec-519f129bbdaf pointing at an item in your inventory does this: <img width="194" height="207" alt="image" src="https://github.com/user-attachments/assets/5bdde842-6824-422c-8c5d-7a15f616336d" /> thought bubble is a port of this: tgstation/tgstation#68642 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game qol <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: qol: pointing at items in your inventory displays them above you /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game yeah maybe we were too hasty and we still need a role for teaching new players <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: admin: orphans are once again a 0 pq role /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
…tion#2852) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Replace Vampire lord's thralls's infinite stamina with infinite energy, Vampire lord will retain their infinite stamina. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Damn, Who would have thought that having a antag that can convert peoples into antags with infinite stamina would be a good idea? (no.) Let's have it be clear, I prefer MAIN antagonist to retain their inf stamina, like lich. Thralls, Skeletons that are subservient to the lich or vampire lord which would be SECONDARY antagonist should not have infinite stamina, that is all. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: balance: Replace Vampire lord's thralls's infinite stamina with infinite energy, Vampire lord will retain their infinite stamina. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request closes Monkestation#2837 closes Monkestation#2802 closes Monkestation#2824 closes Monkestation#2782 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: fixed vicious mockery being an untargeted spell fix: fixed admin liquid spawn cancel button not working fix: fixed infinite bronze and steel gear smelt oversight fix: fixed freshly smithed items being damaged /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request byond keeps resources loaded in RAM for 5 minutes by default, if it hasn't been used in that time, it unloads it back into your storage disk, so when changing areas, because our music files are 3 or more mb in storage space, it takes a while to load it from the disk into ram, so the client waits until it's loaded, freezing up, then plays it. instead let's keep all the music files loaded at all times, so we don't have to load it every time and get locked up, this means we'll have around 250mb of sound files loaded into ram at all times, but this shouldn't be a problem. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game less lag, smoother gaem <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: fixed lag when changing areas caused by loading music files /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Rosewood Changes Added merchant stall WPP Changes Reduction of overall loot outside the city and in city dungeons Reduction of mines by about 1/3 of old number. Also they are more spread out. Mage tower doors changed with locks Fixing of other minor issues like main gate walls being to easy to climb. Added merchant stall ## Why It's Good For The Game Fixes needed to make the map playable again. ## Changelog :cl: add: Added new mechanics or gameplay changes add: Added more things del: Removed old things fix: fixed a few things map: added/modified/removed map content spellcheck: fixed a few typos /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [X] You tested this on a local server. - [X] This code did not runtime during testing. - [X] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> This PR makes it so that Xylix storyteller respects round start event requirements, so he will try to roll them normally, his ability to force events will activate only after the round has started, basically. Its probably for the best, as players and admins are reporting this quirk as a bug, and it could lead to duller rounds if midrounds failed to show up. Next up, it modifies Xylix's point gain - increased for personal and intervention, as Xylix surely likes drama they can create. Finally, it also gives standard point gain for omen and raid tracks, as there is not really a reason for him to have none in these. ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> More consistent round start events, more interesting xylix storyteller. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: Arkatos add: Xylix as a storyteller now respects round start events requirements. (But then true silliness begins) /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request thing for mappers to use <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
… nocs-a-petty-bitch-(or,-lore-accurate-magick)
Owner
Author
|
Ugh this is gonna suck to clean |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About The Pull Request
fill out later once we get to a state where I can actually list the changes
I love Zizo - Aberra "Abigial" Quirrest
Why It's Good For The Game
Pre-Merge Checklist