110 Commits

Include renames

Author	SHA1	Message	Date
nevimer	baf3837ae8	Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29 ... # Conflicts: # _maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm # _maps/RandomRuins/SpaceRuins/garbagetruck2.dmm # _maps/map_files/CatwalkStation/CatwalkStation_2023.dmm # _maps/map_files/tramstation/tramstation.dmm # code/_onclick/hud/new_player.dm # code/datums/components/squashable.dm # code/datums/diseases/advance/symptoms/heal.dm # code/datums/diseases/chronic_illness.dm # code/datums/status_effects/buffs.dm # code/datums/status_effects/debuffs/drunk.dm # code/datums/status_effects/debuffs/stamcrit.dm # code/game/machinery/computer/crew.dm # code/game/objects/items/devices/scanners/health_analyzer.dm # code/game/objects/items/wall_mounted.dm # code/game/turfs/closed/indestructible.dm # code/modules/admin/view_variables/filterrific.dm # code/modules/antagonists/heretic/influences.dm # code/modules/cargo/orderconsole.dm # code/modules/client/preferences.dm # code/modules/events/space_vines/vine_mutations.dm # code/modules/mob/dead/new_player/new_player.dm # code/modules/mob/living/carbon/human/death.dm # code/modules/mob/living/carbon/human/species_types/jellypeople.dm # code/modules/mob/living/damage_procs.dm # code/modules/mob/living/living.dm # code/modules/mob_spawn/ghost_roles/mining_roles.dm # code/modules/mob_spawn/mob_spawn.dm # code/modules/projectiles/ammunition/energy/laser.dm # code/modules/projectiles/guns/ballistic/launchers.dm # code/modules/projectiles/guns/energy/laser.dm # code/modules/reagents/chemistry/machinery/chem_dispenser.dm # code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm # code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm # code/modules/reagents/chemistry/reagents/medicine_reagents.dm # code/modules/surgery/healing.dm # code/modules/unit_tests/designs.dm # icons/mob/inhands/items_lefthand.dmi # icons/mob/inhands/items_righthand.dmi # tgui/packages/tgui/interfaces/ChemDispenser.tsx	2025-11-29 22:49:21 -05:00
Joshua KidderandGitHub	7a3ad79506	All camelCase (Brute|Burn|Fire|Tox|Oxy|Organ|Stamina)(Loss) procs now use snake_case. UNDERSCORES RULE! (#94111) ... ## About The Pull Request It's just a partial cleanup of anti-[STYLE](https://github.com/tgstation/tgstation/blob/master/.github/guides/STYLE.md) code from /tg/'s ancient history. I compiled & tested with my helpful assistant and damage is still working. <img width="1920" height="1040" alt="image" src="https://github.com/user-attachments/assets/26dabc17-088f-4008-b299-3ff4c27142c3" /> I'll upload the .cs script I used to do it shortly. ## Why It's Good For The Game Just minor code cleanup. Script used is located at https://metek.tech/camelTo-Snake.7z EDIT 11/23/25: Updated the script to use multithreading and sequential scan so it works a hell of a lot faster ``` /* // Copyright 2025 Joshua 'Joan Metekillot' Kidder This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. // */ using System.Text.RegularExpressions; class Program { static async Task Main(string[] args) { var readFile = new FileStreamOptions { Access = FileAccess.Read, Share = FileShare.ReadWrite, Options = FileOptions.Asynchronous | FileOptions.SequentialScan }; FileStreamOptions writeFile = new FileStreamOptions { Share = FileShare.ReadWrite, Access = FileAccess.ReadWrite, Mode = FileMode.Truncate, Options = FileOptions.Asynchronous }; RegexOptions regexOptions = RegexOptions.Multiline | RegexOptions.Compiled; Dictionary<string, int> changedProcs = new(); string regexPattern = @"(?<=\P{L})([a-z]+)([A-Z]{1,2}[a-z]+)*(Brute|Burn|Fire|Tox|Oxy|Organ|Stamina)(Loss)([A-Z]{1,2}[a-z]+)*"; Regex camelCaseProcRegex = new(regexPattern, regexOptions); string snakeify(Match matchingRegex) { var vals = matchingRegex.Groups.Cast<Group>().SelectMany(_ => _.Captures).Select(_ => _.Value).ToArray(); var newVal = string.Join("_", vals.Skip(1).ToArray()).ToLower(); string logString = $"{vals[0]} => {newVal}"; if (changedProcs.TryGetValue(logString, out int value)) { changedProcs[logString] = value + 1; } else { changedProcs.Add(logString, 1); } return newVal; } var dmFiles = Directory.EnumerateFiles(".", "*.dm", SearchOption.AllDirectories).ToAsyncEnumerable<string>(); // uses default ParallelOptions // https://learn.microsoft.com/en-us/dotnet/api/system.threading.tasks.paralleloptions?view=net-10.0#main await Parallel.ForEachAsync(dmFiles, async (filePath, UnusedCancellationToken) => { var reader = new StreamReader(filePath, readFile); string oldContent = await reader.ReadToEndAsync(); string newContent = camelCaseProcRegex.Replace(oldContent, new MatchEvaluator((Func<Match, string>)snakeify)); if (oldContent != newContent) { var writer = new StreamWriter(filePath, writeFile); await writer.WriteAsync(newContent); await writer.DisposeAsync(); } reader.Dispose(); }); var logToList = changedProcs.Cast<KeyValuePair<string, int>>().ToList(); foreach (var pair in logToList) { Console.WriteLine($"{pair.Key}: {pair.Value} locations"); } } } ``` ## Changelog 🆑 Bisar code: All (Brute|Burn|Fire|Tox|Oxy|Organ|Stamina)(Loss) procs now use snake_case, in-line with the STYLE guide. Underscores rule! /🆑	2025-11-27 15:50:23 -05:00
necromanceranneandRoxy	a8fe50f4f4	Makes the mech clamp attack do only brute damage, checks for block and armor, and gives it an attack animation and sound. (#91563) ... ## About The Pull Request If you use the mech clamp offensively, it actually performs an attack animation and sound, and properly checks armor and block. It only deals brute damage. As a consequence of these changes, it actually logs attacks made against mobs that die when gibbed. Also, xenos take x3 damage from the clamp. ## Why It's Good For The Game This is a pretty sinister kind of attack, as it is completely silent except for throwing a warning into chat, and can be done even in a large crowd of people. Someone who isn't aware that the clamp can be used this way may not even understand what is happening before it is too late. > block check While mech melee doesn't normally check block, this is an improvised attack on a non-combat mech. I think it should stay a bit weak compared to a proper mech melee in most ways and have some additional limitations. > Xenos I thought this was already a thing. It's thematically on point, no? ## Changelog 🆑 balance: Mech hydraulic clamps perform an attack animation and sound when attacking mobs. balance: Mech hydraulic clamps can be blocked and respect armor. balance: Mech hydraulic clamps do triple damage to xenomorphs. /🆑 (cherry picked from commit fb9824a401)	2025-06-28 20:38:35 -04:00
necromanceranneandGitHub	fb9824a401	Makes the mech clamp attack do only brute damage, checks for block and armor, and gives it an attack animation and sound. (#91563) ... ## About The Pull Request If you use the mech clamp offensively, it actually performs an attack animation and sound, and properly checks armor and block. It only deals brute damage. As a consequence of these changes, it actually logs attacks made against mobs that die when gibbed. Also, xenos take x3 damage from the clamp. ## Why It's Good For The Game This is a pretty sinister kind of attack, as it is completely silent except for throwing a warning into chat, and can be done even in a large crowd of people. Someone who isn't aware that the clamp can be used this way may not even understand what is happening before it is too late. > block check While mech melee doesn't normally check block, this is an improvised attack on a non-combat mech. I think it should stay a bit weak compared to a proper mech melee in most ways and have some additional limitations. > Xenos I thought this was already a thing. It's thematically on point, no? ## Changelog 🆑 balance: Mech hydraulic clamps perform an attack animation and sound when attacking mobs. balance: Mech hydraulic clamps can be blocked and respect armor. balance: Mech hydraulic clamps do triple damage to xenomorphs. /🆑	2025-06-27 23:08:09 -07:00
MrMelbertandRoxy	c16ae8fe78	Use any item as a prosthetic arm, what's the worst that could happen? (#91573) ...  Makes the chainsaw arm code generic, so you can attach any normal or bulky sized item as an arm Impl. detail: Items-as-arms just use inhand sprites unless it has `/datum/element/prosthetic_icon`. Currently used for chainsaws as the only item with an implanted sprite. Chainsaw arm nullrod now fully replaces the arm rather than being a nodrop item. When surgically adding any non-bodypart item, applying the item will result in a loose fitting, and it might fall off on attack. The following step (tape/suture) removes the fall chance. Chainsaw arms are funny, but why stop at chainsaws beyond it being an Evil Dead reference? 🆑 Melbert add: Any normal or bulky sized item can be used as a prosthetic arm, instead of just chainsaws. /🆑	2025-06-21 22:35:58 -04:00
3 people	690bfc04b4	Rebalances wound determination values, wounding escalation and wound armor to hopefully be less explosive (#91099) ... This is a big one so please bear with me, wounds are complicated We've decreased the max contributed damage to wound rolls from 35 to 25. This results, after the exponent, a max possible wound roll of 1 to 91 before any modifiers (assuming the attack, after armor, is 25 or above). The minimum value to wound is still 5. Most wounds were contributing significant numbers per wound type to the potential for a new wound to occur. Getting wounded once meant you were getting wound a lot, but actually getting past that first wounding may be the tricky part. We have significantly reigned in the wound penalty that having a wound contributes, and instead utilize the series wound penalty to allow same type wounds to escalate themselves faster as a priority. Having wounds still makes you more wound vulnerable, just not to such an extreme degree. The priority here for what wounds matter most for contributing to overall wounding vulnerability is ``Infected BURNS > BURNS > SLASH|PIERCE > BLUNT.`` Wound armor, unlike all other kinds of armor, was used as a additive value to the wound roll modifiers rather than a multiplicative value. We have reworked how wound armor is determined by changing how wound modifiers are calculated. Firstly, we're passing our entire injury roll into the ``check_woundings_mod()`` proc, as we're not treating this as a proc that just adds values anymore. Secondly, bare wound bonus only applies if there is no potential wound protection from any source, as expected. But it comes last in the calculations. Thirdly, wound protection is applied to the injury roll last, after wound bonuses from the attack, wound bonuses from other wounds and wound bonuses from a disabled limb are applied. This does not include serial wound bonuses, which are determined outside of this proc. Wound protection comes from two sources. Clothing and limb wound resistance. Your chest and head have an amount of wound resistance so long as they are not mangled in any fashion. Being mangled means having either a hairline fracture or a weeping avulsion wound. Wound protection reduces the final injury roll by a percentage. Say our roll is 50, and we have effectively 50% wound protection. The final roll would be 25. ~~Most clothing have had their wound armor values changed. As a loose rule, I used the highest of melee or bomb armor, except where that value was 100, in which case I used the lowest instead. I'm basing this decision on how embeds are calculated, which is attack type agnostic.~~ ~~Some armor have inconsistent values because they are alternative armors to an existing armor type or are hyperspecialized armor. Ablative, bulletproof and security vests all share a value of 35, despite the former two not having decent melee or bomb armor.~~ ~~Some clothing missing wound armor that should have had them now have wound armor.~~ ~~This may need a bit of scrutiny in case one or two seem weirdly high. Some have maybe become too low. Its a bit hard to say.~~ I changed it to ``exposed_wound_bonus`` to better represent when it applies. You can be naked and still not be affected by this bonus if the limb has wound resistance. I'm not promising anything with this PR, but this is an attempt to sanity check the values on wounds so that we're not seeing what the data that determined the removal of beheading presented. An extreme over-representation of tier 3 wounds. ~~And, from that, maybe I can argue for beheadings coming back. That's my goal. I think beheadings happened so much because the numbers were in need of work.~~ Well okay I just wanna make wounds a bit more workable actually more than I want beheadings. Why is it that tier 3 wounds were so over-represented? Because wounds will often force more severe wounds of other types by merit of any wounds existing at all on a limb. Having **_a_** wound makes you more wound prone for any kind of wound, and not just making you more likely to suffer a more severe type of the same wound. The threshold mechanic was intended to simulate making a wound worse, but oddly just made a limb broadly more prone to getting worse from any kind of attack to such a degree that future wound rolls of different types were often going to start at the threshold necessary to be a tier 3 wound. Dismemberment, mind you, requires you to suffer a flesh wound while you have a bone wound of tier 2 or higher (with tier 3 giving a bonus to this). You can do this readily via just a sharp weapon, because having a mangled limb causes the wound to turn into a bone wound. Technically, this is meant to be less likely as the effective damage for this wound is halved. But the wound bonus from having a flesh wound was almost always significant enough to kick your new bone wound up to a tier 3. In other words; its not surprising that you saw so many beheadings, because the system wanted to behead you as fast as it possibly can thanks to all these escalating values. Wound armor was only applied as a flat reduction on the roll. The average for wound armor was 10. After receiving a single wound, you can expect wound rolls to reach upwards of 100, even if the actual damage roll was not particularly high, due to wound stacking bonuses form being wounded. This meant that wounds, if they happened, came thick and fast after the first, regardless of what your protection might be to wounds. It was just a matter of getting past the initial bump. This is why effects that forced wounds were so powerful. They basically made a given limb more prone to taking a wound without having to deal with the protection problem first. Finally, this is just a broad flaw with the system that is not its fault. It is actually a problem that isn't a problem. Most people in the game are not wearing helmets that protect their head. So most people are going to suffer from a higher proclivity of being wounded if people are aiming for the head. There is this...kind of cargo cult belief that aiming for the head means you do more damage, or can stun someone if you're lucky or what have you. It's entirely nonsense, but it has a grain of truth in that people rarely wear, or even have access too, headwear that provides wound protection or any protection at all. People have jumpsuits, which are universally wound protected, but that isn't true of the head. Look, the point is, they're not aiming at the head because it is usually less armored, its for other reasons but it just so happens to become true due to wounds and how wounds roll their type. To soften this issue, I've decided to treat wound resistance as armor until the limb suffers a tier 3 wound. This way, hits to the head MAY not necessarily escalate to tier 3 instantly as they would on live even from relatively low power weapons. Some weapons have very low force, but have extreme bare wound bonuses. This should be less likely after this change. I doubt this will necessarily make high damage high wound weapons like energy swords any less prone to cutting you clean open, but it might thanks to the reduction to contributed damage to the injury roll. The system is now _a bit more random_. 🆑 balance: Wounds do not make you as vulnerable to suffering wounds of all types as before. Instead, wounds make you more vulnerable to suffering worse versions of themselves as a priority. balance: Wound armor is now more impactful when protecting you from wounds when you have already been wounded. balance: Your head and chest are more difficult to wound until they have been mangled; either from suffering from a weeping avulsion or a hairline fracture. code: Changed the variable for bare_wound_bonus to exposed_wound_bonus to better explain what that variable is doing. /🆑 --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>	2025-06-21 22:32:18 -04:00
MrMelbertandGitHub	558afad6a4	Use any item as a prosthetic arm, what's the worst that could happen? (#91573) ... ## About The Pull Request  Makes the chainsaw arm code generic, so you can attach any normal or bulky sized item as an arm Impl. detail: Items-as-arms just use inhand sprites unless it has `/datum/element/prosthetic_icon`. Currently used for chainsaws as the only item with an implanted sprite. Chainsaw arm nullrod now fully replaces the arm rather than being a nodrop item. When surgically adding any non-bodypart item, applying the item will result in a loose fitting, and it might fall off on attack. The following step (tape/suture) removes the fall chance. ## Why It's Good For The Game Chainsaw arms are funny, but why stop at chainsaws beyond it being an Evil Dead reference? ## Changelog 🆑 Melbert add: Any normal or bulky sized item can be used as a prosthetic arm, instead of just chainsaws. /🆑	2025-06-19 20:02:07 +02:00
3 people	57624ca1e2	Rebalances wound determination values, wounding escalation and wound armor to hopefully be less explosive (#91099) ... ## About The Pull Request This is a big one so please bear with me, wounds are complicated ### Max Potential Wound Rolls We've decreased the max contributed damage to wound rolls from 35 to 25. This results, after the exponent, a max possible wound roll of 1 to 91 before any modifiers (assuming the attack, after armor, is 25 or above). The minimum value to wound is still 5. ### Wound Escalation Penalties Most wounds were contributing significant numbers per wound type to the potential for a new wound to occur. Getting wounded once meant you were getting wound a lot, but actually getting past that first wounding may be the tricky part. We have significantly reigned in the wound penalty that having a wound contributes, and instead utilize the series wound penalty to allow same type wounds to escalate themselves faster as a priority. Having wounds still makes you more wound vulnerable, just not to such an extreme degree. The priority here for what wounds matter most for contributing to overall wounding vulnerability is ``Infected BURNS > BURNS > SLASH|PIERCE > BLUNT.`` ### Wound Armor Wound armor, unlike all other kinds of armor, was used as a additive value to the wound roll modifiers rather than a multiplicative value. We have reworked how wound armor is determined by changing how wound modifiers are calculated. Firstly, we're passing our entire injury roll into the ``check_woundings_mod()`` proc, as we're not treating this as a proc that just adds values anymore. Secondly, bare wound bonus only applies if there is no potential wound protection from any source, as expected. But it comes last in the calculations. Thirdly, wound protection is applied to the injury roll last, after wound bonuses from the attack, wound bonuses from other wounds and wound bonuses from a disabled limb are applied. This does not include serial wound bonuses, which are determined outside of this proc. Wound protection comes from two sources. Clothing and limb wound resistance. Your chest and head have an amount of wound resistance so long as they are not mangled in any fashion. Being mangled means having either a hairline fracture or a weeping avulsion wound. Wound protection reduces the final injury roll by a percentage. Say our roll is 50, and we have effectively 50% wound protection. The final roll would be 25. ### ~~Wound Armor on Clothing~~ Reverted ~~Most clothing have had their wound armor values changed. As a loose rule, I used the highest of melee or bomb armor, except where that value was 100, in which case I used the lowest instead. I'm basing this decision on how embeds are calculated, which is attack type agnostic.~~ ~~Some armor have inconsistent values because they are alternative armors to an existing armor type or are hyperspecialized armor. Ablative, bulletproof and security vests all share a value of 35, despite the former two not having decent melee or bomb armor.~~ ~~Some clothing missing wound armor that should have had them now have wound armor.~~ ~~This may need a bit of scrutiny in case one or two seem weirdly high. Some have maybe become too low. Its a bit hard to say.~~ ### The ``bare_wound_bonus`` variable I changed it to ``exposed_wound_bonus`` to better represent when it applies. You can be naked and still not be affected by this bonus if the limb has wound resistance. ## Why It's Good For The Game I'm not promising anything with this PR, but this is an attempt to sanity check the values on wounds so that we're not seeing what the data that determined the removal of beheading presented. An extreme over-representation of tier 3 wounds. ~~And, from that, maybe I can argue for beheadings coming back. That's my goal. I think beheadings happened so much because the numbers were in need of work.~~ Well okay I just wanna make wounds a bit more workable actually more than I want beheadings. Why is it that tier 3 wounds were so over-represented? Because wounds will often force more severe wounds of other types by merit of any wounds existing at all on a limb. Having **_a_** wound makes you more wound prone for any kind of wound, and not just making you more likely to suffer a more severe type of the same wound. The threshold mechanic was intended to simulate making a wound worse, but oddly just made a limb broadly more prone to getting worse from any kind of attack to such a degree that future wound rolls of different types were often going to start at the threshold necessary to be a tier 3 wound. Dismemberment, mind you, requires you to suffer a flesh wound while you have a bone wound of tier 2 or higher (with tier 3 giving a bonus to this). You can do this readily via just a sharp weapon, because having a mangled limb causes the wound to turn into a bone wound. Technically, this is meant to be less likely as the effective damage for this wound is halved. But the wound bonus from having a flesh wound was almost always significant enough to kick your new bone wound up to a tier 3. In other words; its not surprising that you saw so many beheadings, because the system wanted to behead you as fast as it possibly can thanks to all these escalating values. Wound armor was only applied as a flat reduction on the roll. The average for wound armor was 10. After receiving a single wound, you can expect wound rolls to reach upwards of 100, even if the actual damage roll was not particularly high, due to wound stacking bonuses form being wounded. This meant that wounds, if they happened, came thick and fast after the first, regardless of what your protection might be to wounds. It was just a matter of getting past the initial bump. This is why effects that forced wounds were so powerful. They basically made a given limb more prone to taking a wound without having to deal with the protection problem first. Finally, this is just a broad flaw with the system that is not its fault. It is actually a problem that isn't a problem. Most people in the game are not wearing helmets that protect their head. So most people are going to suffer from a higher proclivity of being wounded if people are aiming for the head. There is this...kind of cargo cult belief that aiming for the head means you do more damage, or can stun someone if you're lucky or what have you. It's entirely nonsense, but it has a grain of truth in that people rarely wear, or even have access too, headwear that provides wound protection or any protection at all. People have jumpsuits, which are universally wound protected, but that isn't true of the head. Look, the point is, they're not aiming at the head because it is usually less armored, its for other reasons but it just so happens to become true due to wounds and how wounds roll their type. To soften this issue, I've decided to treat wound resistance as armor until the limb suffers a tier 3 wound. This way, hits to the head MAY not necessarily escalate to tier 3 instantly as they would on live even from relatively low power weapons. Some weapons have very low force, but have extreme bare wound bonuses. This should be less likely after this change. I doubt this will necessarily make high damage high wound weapons like energy swords any less prone to cutting you clean open, but it might thanks to the reduction to contributed damage to the injury roll. The system is now _a bit more random_. ## Changelog 🆑 balance: Wounds do not make you as vulnerable to suffering wounds of all types as before. Instead, wounds make you more vulnerable to suffering worse versions of themselves as a priority. balance: Wound armor is now more impactful when protecting you from wounds when you have already been wounded. balance: Your head and chest are more difficult to wound until they have been mangled; either from suffering from a weeping avulsion or a hairline fracture. code: Changed the variable for bare_wound_bonus to exposed_wound_bonus to better explain what that variable is doing. /🆑 --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>	2025-06-19 17:49:59 +02:00
MrMelbertandRoxy	bc2215667f	Re-refactors batons / Refactors attack chain force modifiers (#90809) ... Melee attack chain now has a list passed along with it, `attack_modifiers`, which you can stick force modifiers to change the resulting attack This is basically a soft implementation of damage packets until a more definitive pr, but one that only applies to item attack chain, and not unarmed attacks. This change was done to facilitate a baton refactor - batons no longer hack together their own attack chain, and are now integrated straight into the real attack chain. This refactor itself was done because batons don't send any attack signals, which has been annoying in the past (for swing combat). 🆑 Melbert refactor: Batons have been refactored again. Baton stuns now properly count as an attack, when before it was a nothing. Report any oddities, particularly in regards to harmbatonning vs normal batonning. refactor: The method of adjusting item damage mid-attack has been refactored - some affected items include the Nullblade and knives. Report any strange happenings with damage numbers. refactor: A few objects have been moved to the new interaction chain - records consoles, mawed crucible, alien weeds and space vines, hedges, restaurant portals, and some mobs - to name a few. fix: Spears only deal bonus damage against secure lockers, not all closet types (including crates) /🆑	2025-05-22 21:30:07 -04:00
MrMelbertandGitHub	5261efb67f	Re-refactors batons / Refactors attack chain force modifiers (#90809) ... ## About The Pull Request Melee attack chain now has a list passed along with it, `attack_modifiers`, which you can stick force modifiers to change the resulting attack This is basically a soft implementation of damage packets until a more definitive pr, but one that only applies to item attack chain, and not unarmed attacks. This change was done to facilitate a baton refactor - batons no longer hack together their own attack chain, and are now integrated straight into the real attack chain. This refactor itself was done because batons don't send any attack signals, which has been annoying in the past (for swing combat). ## Changelog 🆑 Melbert refactor: Batons have been refactored again. Baton stuns now properly count as an attack, when before it was a nothing. Report any oddities, particularly in regards to harmbatonning vs normal batonning. refactor: The method of adjusting item damage mid-attack has been refactored - some affected items include the Nullblade and knives. Report any strange happenings with damage numbers. refactor: A few objects have been moved to the new interaction chain - records consoles, mawed crucible, alien weeds and space vines, hedges, restaurant portals, and some mobs - to name a few. fix: Spears only deal bonus damage against secure lockers, not all closet types (including crates) /🆑	2025-05-19 13:32:12 +10:00
GhomandShadow-Quill	11d82b7995	You can now interact with held mobs beside wearing them (feat: "minor" melee attack chain cleanup) (#90080) ... People can now pet held mothroaches and pugs if they want to, or use items on them, hopefully without causing many issues. After all, it only took about a couple dozen lines of code to make... ...Oh, did the 527 files changed or the 850~ lines added/removed perhaps catch your eye? Made you wonder if I accidentally pushed the wrong branch? or skewed something up big time? Well, nuh uh. I just happen to be fed up with the melee attack chain still using stringized params instead of an array/list. It was frankly revolting to see how I'd have had to otherwise call `list2params` for what I'm trying to accomplish here, and make this PR another tessera to the immense stupidity of our attack chain procs calling `params2list` over and over and over instead of just using that one call instance from `ClickOn` as an argument. It's 2025, honey, wake up! I also tried to replace some of those single letter vars/args but there are just way too many of them. Improving old code. And I want to be able to pet mobroaches while holding them too. 🆑 qol: You can now interact with held mobs in more ways beside wearing them. /🆑	2025-04-29 18:22:44 -06:00
GhomandGitHub	339616ae78	You can now interact with held mobs beside wearing them (feat: "minor" melee attack chain cleanup) (#90080) ... ## About The Pull Request People can now pet held mothroaches and pugs if they want to, or use items on them, hopefully without causing many issues. After all, it only took about a couple dozen lines of code to make... ...Oh, did the 527 files changed or the 850~ lines added/removed perhaps catch your eye? Made you wonder if I accidentally pushed the wrong branch? or skewed something up big time? Well, nuh uh. I just happen to be fed up with the melee attack chain still using stringized params instead of an array/list. It was frankly revolting to see how I'd have had to otherwise call `list2params` for what I'm trying to accomplish here, and make this PR another tessera to the immense stupidity of our attack chain procs calling `params2list` over and over and over instead of just using that one call instance from `ClickOn` as an argument. It's 2025, honey, wake up! I also tried to replace some of those single letter vars/args but there are just way too many of them. ## Why It's Good For The Game Improving old code. And I want to be able to pet mobroaches while holding them too. ## Changelog 🆑 qol: You can now interact with held mobs in more ways beside wearing them. /🆑	2025-04-23 20:18:26 +00:00
Majkl-J	b6b8306fda	Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-02a	2025-02-20 00:00:19 -08:00
MrMelbertandGitHub	586710e0d4	You can light a match on the heel of your boot (#88690) ... ## About The Pull Request - Matches can be ignited with boots. - Matches have a rare chance of failing to ignite (prompting you to try again) or an even rarer chance of snapping (wasting it). - Also makes ignition span use mostly-consistent (using rose span for the "cooler" ignition effects). ## Why It's Good For The Game You may be thinking "hey, matches won't light on just friction unless they're from the 1800s", and you'd be right. But it's a cool movie trope, which means it should be possible, I don't make the rules. ## Changelog 🆑 Melbert add: You can light matches on the heel of your boots - Just don't do it too hard. /🆑	2025-01-06 03:16:59 +01:00
SmArtKarandGitHub	7ddc30783a	Adds better attack animations and alternate attack modes (#88418) ... ## About The Pull Request This is the first PR in a series attempting to modernize our damage and armor, both from a code and a gameplay perspective. This part implements unique attack animations, adds alternate attack modes for items and fixes some minor oversights. Items now have unique attack animation based on their sharpness - sharp items are now swung in an arc, while pointy items are thrust forward. This change is ***purely visual***, this is not swing combat. (However, this does assign icon rotation data to many items, which should help swing combat later down the line). Certain items like knives and swords now have secondary attacks - right clicks will perform stabbing attacks instead of slashing for a chance to leave piercing wounds, albeit with slightly lower damage - trying to stick a katana through someone won't get you very far! https://github.com/user-attachments/assets/1f92bbcd-9aa1-482f-bc26-5e84fe2a07e1 Turns out that spears acted as oversized knives this entire time, being SHARP_EDGED instead of SHARP_POINTY - in order for their animations to make sense, they're now once again pointy (according to comment, originally they were made sharp because piercing wounds weren't very threatening, which is no longer the case) Another major change is that structure damage is now influenced by armor penetration - I am not sure if this is intentional or not, but attacking item's AP never applied to non-mob damage. Additionally, also fixes an issue where attack verbs for you and everyone else may differ.	2024-12-17 12:35:52 -06:00
GhomandGitHub	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
Majkl-J	e59d8ba64b	Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b	2024-10-23 23:27:16 -07:00
grungussussandGitHub	58501dce77	Reorganizes the sound folder (#86726) ... ## About The Pull Request <details> - renamed ai folder to announcer -- announcer -- - moved vox_fem to announcer - moved approachingTG to announcer - separated the ambience folder into ambience and instrumental -- ambience -- - created holy folder moved all related sounds there - created engineering folder and moved all related sounds there - created security folder and moved ambidet there - created general folder and moved ambigen there - created icemoon folder and moved all icebox-related ambience there - created medical folder and moved all medbay-related ambi there - created ruin folder and moves all ruins ambi there - created beach folder and moved seag and shore there - created lavaland folder and moved related ambi there - created aurora_caelus folder and placed its ambi there - created misc folder and moved the rest of the files that don't have a specific category into it -- instrumental -- - moved traitor folder here - created lobby_music folder and placed our songs there (title0 not used anywhere? - server-side modification?) -- items -- - moved secdeath to hailer - moved surgery to handling -- effects -- - moved chemistry into effects - moved hallucinations into effects - moved health into effects - moved magic into effects -- vehicles -- - moved mecha into vehicles created mobs folder -- mobs -- - moved creatures folder into mobs - moved voice into mobs renamed creatures to non-humanoids renamed voice to humanoids -- non-humanoids-- created cyborg folder created hiss folder moved harmalarm.ogg to cyborg -- humanoids -- -- misc -- moved ghostwhisper to misc moved insane_low_laugh to misc I give up trying to document this. </details> - [X] ambience - [x] announcer - [x] effects - [X] instrumental - [x] items - [x] machines - [x] misc - [X] mobs - [X] runtime - [X] vehicles - [ ] attributions ## Why It's Good For The Game This folder is so disorganized that it's vomit inducing, will make it easier to find and add new sounds, providng a minor structure to the sound folder. ## Changelog 🆑 grungussuss refactor: the sound folder in the source code has been reorganized, please report any oddities with sounds playing or not playing server: lobby music has been repathed to sound/music/lobby_music /🆑	2024-09-23 22:24:50 -07:00
StrangeWeirdKitten	38c3a6336d	Merge branch 'master' of https://github.com/skyrat-ss13/skyrat-tg into upstream-7-24/204	2024-07-25 00:08:53 -06:00
3 people	f033ac05a8	[MIRROR] Small hulk cleanup / nukes TRAIT_IGNOREDAMAGESLOWDOWN (#28882) ... * Small hulk cleanup / nukes `TRAIT_IGNOREDAMAGESLOWDOWN` (#85003) ## About The Pull Request I was investigating a bug with hulk in which using it while damaged doesn't put you back on full speed I noticed `TRAIT_IGNOREDAMAGESLOWDOWN` on its own was subtly broken, in that it did nothing if the user did not call `updatehealth` afterwards And guess what, most (if not all) uses of the trait did not do this, so it never applied correctly So I nuked the trait entirely, made all uses of it use the same thing morphine uses (`/datum/movespeed_modifier/damage_slowdown`) And since I was auditing this I saw the ball module was broke, it removed the immunity but never added it. Quick fix I also cleaned up some Hulk stuff while I was in the area because I was in the area. I removed all instances of `check_mutation` and replaced it with trait checking because it made more sense. I also also fixed a bug with the simple flying element never removing on detach because I touched something that uses it for the above change. ## Changelog 🆑 Melbert fix: Using hulk (and a myriad of similar effects) now properly updates your movespeed to ignore the damage movespeed penalty fix: Some things which temporarily make you fly don't make you fly forever fix: MODsuit ball module now properly makes you immune to damage movespeed penalty when in ball form fix: Adding Hulk via VV dropdown doesn't default to adding the strongest hulk available (that which is used by the medieval pirates) /🆑 * Small hulk cleanup / nukes `TRAIT_IGNOREDAMAGESLOWDOWN` --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>	2024-07-17 21:02:21 +05:30
MrMelbertandGitHub	34f3f479ae	Small hulk cleanup / nukes TRAIT_IGNOREDAMAGESLOWDOWN (#85003) ... ## About The Pull Request I was investigating a bug with hulk in which using it while damaged doesn't put you back on full speed I noticed `TRAIT_IGNOREDAMAGESLOWDOWN` on its own was subtly broken, in that it did nothing if the user did not call `updatehealth` afterwards And guess what, most (if not all) uses of the trait did not do this, so it never applied correctly So I nuked the trait entirely, made all uses of it use the same thing morphine uses (`/datum/movespeed_modifier/damage_slowdown`) And since I was auditing this I saw the ball module was broke, it removed the immunity but never added it. Quick fix I also cleaned up some Hulk stuff while I was in the area because I was in the area. I removed all instances of `check_mutation` and replaced it with trait checking because it made more sense. I also also fixed a bug with the simple flying element never removing on detach because I touched something that uses it for the above change. ## Changelog 🆑 Melbert fix: Using hulk (and a myriad of similar effects) now properly updates your movespeed to ignore the damage movespeed penalty fix: Some things which temporarily make you fly don't make you fly forever fix: MODsuit ball module now properly makes you immune to damage movespeed penalty when in ball form fix: Adding Hulk via VV dropdown doesn't default to adding the strongest hulk available (that which is used by the medieval pirates) /🆑	2024-07-17 01:14:08 +02:00
Waterpig	004e466cea	Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406b	2024-06-08 14:33:29 +02:00
4 people	c9ca7165f4	[MIRROR] Centcom/Nukie mechs receive better innate armor but cannot be upgraded (#28031) ... * Centcom/Nukie mechs receive better innate armor but cannot be upgraded (#83580) ## About The Pull Request QoL for antag mechs: no longer are you expected to sit around station Robotics with a [materials] [inducer] [experiment scanner] to upgrade your antag mechs, they are now appropriately armoured out of the box! Unfortunately, this high end armour cannot accept third party upgrade modules. Also good because of incoming (hopefully) sprite upgrades, maulers should become more attractive to buy. Inspired by maplestation.. NOTE: WEB-EDITED! NOT TESTED! ## Why It's Good For The Game Antags like Centcom or Syndicates don't have no time to sit around in the station robotics bay trying to upgrade their mechs - and it's insane to expect them to do so. This is especially poor for newer players who aren't aware of mech mechanics - such as a basic chainsaw or fireaxe dealing 15 or over damage to their mech when a upgraded Durand isn't affected by this. Makes antag/centcom mechs good 'against most threats' out of the box, so better for newbies and less stressful for experienced players who won't have to literally _do station jobs_ to get a good mech. Did you know: mech mechanics aren't even explained at all in-game? Balance wise, it's "good against everything" and loses the ability to be super-specialized against a single thing, while retaining higher-then-normal grades on everything else. Station mechs still have the ability to specialize in one armor, say, melee, but have much worse grades on bullet/laser/EMP, and often have less health. Previously, a trip to Robotics could get a D-GYGAX up to 85% melee while still retaining 40%/50% of bullet/laser which imo is a biit *too* good. The difference between say - 70% and 85% is fairly significant - 9 damage / 13.5 damage for 70% melee vs 4.5 / 6.7 damage for 85%, so twice as good. NOTE: Some of the mechs receive better bomb/energy armors, which weren't affected by armor upgrades. ## Changelog 🆑 balance: Antag/Centcom mechs now have top notch un-upgradeable armor out of the box. You can't add armor to centcom or nukie mechs anymore, but their default armor rating is a lot higher. /🆑 * eswords now have a demoliton_mod of 1.5x (#73004) most energy sword-like weapons have had their demolition_mod increased to 1.5x (from 1x). energy scalpels did not receive this buff, as they're easily crew-accessible and I don't want to deal with a balance flamewar. this affects damage vs. robots, objects, structures, etc. the melee part of the mecha damage unit test now accounts for demolition_mod.  🆑 ATHATH balance: Most energy sword-like weapons have had their demolition_mod increased to 1.5x (from 1x). This affects damage vs. robots, objects, structures, etc. Energy scalpels did not receive this buff. /🆑 --------- Co-authored-by: githubuser4141 <61243846+githubuser4141@users.noreply.github.com> Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>	2024-06-07 09:08:56 +02:00
nevimer	fa65d517dd	fixups	2024-04-28 19:24:33 -04:00
+818 people	7aa6664021	Mirror (#27453) ... * Fix Conflicts * Change COGBAR_ANIMATION_TIME to seconds and not deciseconds (#82530) Most people should not be using this define * New Battle Arcade (#81810) Remakes Battle Arcade from just about the ground up, with exceptions taken for emagged stuff since I didn't really want to touch its behavior. The Battle Arcade now has stages that players can go through, unlocking a stage by beating 2 enemies and the boss of the previous one, but this must all be done in a row. You can choose to take a break between each battle and there's a good chance you'll sleep just fine but there's also a chance it can go wrong either through an ambush or robbery. The Inn lets you restore everything for 15 gold and you can buy a sword and armor, each level you unlock is a new sword and armor pair you can buy that's better than the last, it's 30 gold each but scales up as you progress through levels. They are really worth getting so it's best to try to not lose your money early in. The battle system is nearly the same as how it was before but I removed the poor combo system that plagued the old arcade as one big knowledge lock, now it's more just turn based. The game is built on permadeath so dying means you restart from the beginning, but if you are going to lose you can try to escape instead which costs you half of your gold. Getting to higher levels increases the difficulty of enemies but also increases the gaming exp rewards which could make this a better way to get exp if you can get good at it. Gaming EXP is used to increase chances of counterattacking but doesn't give any extra health to the player. I also removed the exploit of being able to screwdriver arcade cabinets because people would do that if they thought they were on the verge of losing to bypass the effects of loss. I instead replaced it with a new interaction that the Curator's display case key can be used to reset arcade cabinets (there's several keys on the chain so it made sense to me), which I added solely because I thought Curators would be the type of person to have run an actual arcade. This is some gameplay https://github.com/tgstation/tgstation/assets/53777086/499083f5-75cc-43b5-b457-017a012beede As a misc sidenote, I also split up the arcade file just like how Orion Trail was before, just for neat code organization. The Inn keeper is straight up just a photo of my localhost dude, he's not a player reference or anything it's not my actual character. I also have no idea how well balanced this is cause I suck at it lol. Battle Arcade is one of 3 last machines in my hackmd here to turn into TGUI https://hackmd.io/XLt5MoRvRxuhFbwtk4VAUA?view I've always thought the current version of battle arcade is quite lame and lacks any progression, like Orion Trail I thought that since I was moving this to TGUI, it would also be a perfect opportunity to revamp it and try to improve on where it failed before, especially since the alternative (NTOS Arcade) is also lame as hell and is even lamer than HTML battle arcade (spam mana, then spam health, then just spam attack, rinse and repeat). This will hopefully be more entertaining and give players sense that they are getting through a series of tasks rather than doing one same one again and again. 🆑 JohnFulpWillard, Zeek the Rat add: Battle Arcade has been completely overhauled in a new progression system, this time using TGUI. add: The Curator's keys can now reset arcade cabinets. balance: You now need to be literate to play arcade games, except for Mediborg's Amputation Adventure. fix: You can no longer screwdriver emagged arcade consoles. Accept your fate. fix: Silicons can no longer play Mediborg's Amputation Adventure. /🆑 --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> * Change setting item weight class to a setter to patch some weight class related shenanigans (#82494) ## About The Pull Request Fixes #81052 Fixes #58008 Setting weight class of items is now done via `update_weight_class`. I updated as many occurrences of manually setting `w_class` as I could find but I may have missed some. Let me know if you know of any I missed. This is done to allow datums to react to an item having its weight class changed. Humans and atom storage are two such datums which now react to having an item in its contents change weight class, to allow it to expel items that grow to a weight class beyond what is normally allowed. ## Changelog 🆑 Melbert fix: You can't fit items which are normally too large for a storage by fitting it in the storage when it is small, then growing it to a larger size. /🆑 * Material datum color update, plus touching up some material items (knight armor, tiles) (#82500) ## About The Pull Request Tries to bring the material datum colors in closer approximation to the stacks they're attached too. I literally used the colors on the stacks. some might need to be lighter or darker, but for the most part they'll look...closer to their actual material hues.  I've also tweaked the sprites of both the tile object and the actual material tile turf to give it the right shading.  In addition to the tiles, I've also updated the knight armor and helmet to look closer to the much higher quality plate armor already in the game. ## Why It's Good For The Game It bothered me that the material datum coloring was inconsistent with the actual colors used for the material stacks. When they were updated, and even before they were updated, material datum stuff just never looked _right_. I wanted to change that so that it looks just right. I did not like the old material knight armor whatsoever. It was a dithered mess, and seemed to already use parts of the standard plate armor but with all the actual shading removed or replaced with the wrong colors. This fixes that so that the armor is actually readable for what it is. ## Changelog 🆑 image: Updates the colors of various material datum to bring them closer in-line with their actual material stacks image: Improves the sprites for the material knight armor and helmet. /🆑 * LateInitialize is not allowed to call parent anymore (#82540) ## About The Pull Request I've seen a few cases in the past where LateInitialize is done cause of the init return value being set to do so for no real reason, I thought I should try to avoid that by ensuring LateInitialize isn't ever called without overriding. This fixes a ton of machine's LateInitialize not calling parent (mechpad, door buttons, message monitor, a lot of tram machines, abductor console, holodeck computer & disposal bin), avoiding having to set itself up to be connected to power. If they were intended to not connect to power, they should be using ``NO_POWER_USE`` instead. Also removes a ton of returns to LateInit when it's already getting it from parent regardless (many cases of that in machine code). ## Why It's Good For The Game I think this is better for coding standard reasons as well as just making sure we're not calling this proc on things that does absolutely nothing with them. A machine not using power can be seen evidently not using power with ``NO_POWER_USE``, not so much if it's LateInitialize not calling parent. ## Changelog 🆑 fix: Mech pads, door buttons, message monitors, tram machines, abductor consoles & holodeck computers now use power. /🆑 * Fix table top deconstruction (#82508) ## About The Pull Request Edited: updated changelog, read comments for changes in implementation details So previously, tables would let you use a wrench to fully deconstruct them, or a screwdriver to take off only their top. This, however, broke in two different ways in #82280, when their deconstruction logic got changed. First off, deconstructed tables would only drop the materials for their top and not their frame. For this, the primary culprit seems to be on line 307: https://github.com/tgstation/tgstation/blob/c34d56a45b0461f5e0fad3cc75e81580c3357119/code/game/objects/structures/tables_racks.dm#L300-L307 Where `new framestack(target_turf, framestackamount)` accidentally got an extra indent, and ended up in the less common half of the if-else chain. Just moving this outside of the if-else chain again fixes it. Secondly, tables had their own special deconstruction logic, which got 'standardized'. Issue. This was special to accommodate for having two different deconstruction logics: full or top only. With `deconstruct(...)` no longer being overridable, I feel it's awkward to attempt to proxy that information to the new `atom_deconstruct(...)` So we introduce a new method, `deconstruct_top`, for the screwdriver to use, which handles deconstructing only the top. ```dm /obj/structure/table/proc/deconstruct_top() var/obj/table_frame = new frame(loc) if(obj_flags & NO_DECONSTRUCTION) table_frame.obj_flags |= NO_DECONSTRUCTION else // Mimic deconstruction logic, only drop our materials without NO_DECONSTRUCTION var/turf/target_turf = get_turf(src) drop_top_mats(target_turf) qdel(src) ``` Mimicking the `NO_DECONSTRUCTION` logic of normal deconstruction, and copying over the flag onto its frames if need be. This fixes screwdriver deconstruction. ## Why It's Good For The Game Fixes #82503. We can now deconstruct the table top separately again, AND get the right materials back too. ## Changelog 🆑 00-Steven, SyncIt21 fix: Wrench table deconstruction gives the right materials again. fix: Screwdriver table deconstruction only deconstructs the top again. /🆑 * [NO GBP] Reagent grinders display reagents on examination (#82535) ## About The Pull Request - Fixes #82531 Somehow omitted this during the general maintenance thing ## Changelog 🆑 fix: Reagent grinders display reagents of its beaker on examination /🆑 * Monkeys now use height offset (and monkey tail works) (#81598) This PR adds the ability for monkeys to wear any jumpsuit in the game, and adds support for them to wear things like coats, gloves, and shoes (though this cannot be obtained in-game and is solely achieved through admins, which I also improved a bit upon by adding a defined bitfield for no equip flags). This reverts a lot of changes from https://github.com/tgstation/tgstation/pull/73325 - We no longer check height from limbs and such to bring sprites down, instead monkeys now work more similarly to humans, so the entire PR was made irrelevant, and I didn't really want to leave around dead code for the sake of having a human with longer legs. I've now also added support for Dwarfism, which makes monkeys look even smaller. Very minor change but at least now the mutation doesn't feel like it does literally nothing to monkeys (since they can already walk over tables). Here's a few examples of how it can appear in game (purely for demonstration, as it is currently intentionally made impossible to obtain in-game, though if someone wants to change that post-this PR now that support is added, feel free): Tails have been broken for a while now, the only reason you see them in-game is because they are baked into the monkey sprites. This fixes that, which means humans can now get monkey tails implanted into them (hell yeah) and monkeys can have their tails removed (also hell yeah) * Gets [weird] with (spies) by adding protect and deuteragonist-flavored objectives. (#82447) ## About The Pull Request What are their goals? Why are they doing this? gets weird with Spy objectives - namely by adding a lot more ways spies might be asked to affect various targets around the station. the first of these is by several flavors of Protecting targets (these do NOT print a success at roundend in keeping with Spy design:) - Protect (get a humanoid target off alive) - Protect Nonhuman (get an entity off alive) - Jailbreak (make sure a humanoid target escapes free) - Detain (make sure a humanoid target gets taken out arrested) the second of this is by a new escape condition: - Exile (get off-station or off the Z-level by the end of the shift - sometimes it's not just pods, you need to fuck off to space to win.) the third is through a massive increase in the number of possible: - objective templates - departments to target (Command + Service added) - specific locations to target - general classes of objects to target (medicines, floor tiles, critical infrastructure, etc.) - efforts to target (such as meals, mechs, public supplies) - ways to leave (you can be asked to abscond from the scene of your crimes?) ## Why It's Good For The Game More goofy and weird prompts to do more interesting things with Spies. One thing I think we're sorely missing in our lineup is antagonists that can act a bit more as deuteragonists - very possibly helping the crew under certain conditions and frustrating the Hell out of them in others. Since there's no way to check their objectives, and they get their gear/progression through stealing shit, they're still very much an antagonist and exist under the suspicion of doing bad... but, just going by their objectives, introducing more varied (and in some cases even benign) goals for them creates suggestions pointing to a lot more varied and interesting stories if people choose to run with it. * Adds anosmia quirk (#82206) ## About The Pull Request Adds anosmia quirk. Anosmia, also known as smell blindness, is the loss of the ability to detect one or more smells. I tried to find all smells action and (most likely) update all of them, unfortunately I can't change descriptions for this quirk. ## Why It's Good For The Game Some characters will be able to not feel smells That affect: * Gases feelings and alerts (CO2, Plasma, miasm) - you don't feel them * Bakery and cooking * Changeling ability to feel other changelings by smell * Some unimportant spans * Explosions Part I - Directional Explosions (#82429) ## About The Pull Request Adds the ability for explosions to be directional. This is achieved by adding an angle check to `prepare_explosion_turfs()` to drop any turfs outside the cone of the explosion. If the arc covers a full 360 degrees, as is the default, it will accept all the turfs without performing the angle check. Uses this functionality to rework both rocket launcher backblast and X4 explosions. Rocket launcher backblast has been changed from a shotgun of indendiary bullets to a directional explosion of similar length. X4 now uses a directional explosion to "ensure user safety". Apparently the old method of moving the explosion one tile away didn't even work, as it blew up `target` before trying to check its density for the directional behaviour. https://youtu.be/Mzdt7d7Le2Y ## Why It's Good For The Game Directional explosions - Useful functionality for a range of potential use cases, which can be implemented with minimal extra processing cost (Worst case scenario being very large directional explosions) Backblast - Looks way cooler than a bunch of projectiles, and should be significantly more functional in high-lag situations where projectile code tends to get fucky X4 - More predictable for players wanting to use it as a breaching charge, you can actually stand near the charge and not have to worry about being hoist upon your own petard. ## Changelog 🆑 add: Added support for directional explosions. add: Rocket launcher backblast is now 271% more explosive, check your six for friendlies! add: X4 charges now explode in a cone away from the user when placed on a sufficiently solid object. fix: X4 charges will now behave correctly when placed on dense atoms (note: don't try to read a variable from an atom you just blew up) /🆑 * Add balloon alerts to plunging (#82559) ## About The Pull Request Makes all plunging actions (pretty much anything using `plunger_act`) have a visible balloon alert. ## Why It's Good For The Game Makes sense that others would easily notice you plunging the shit out of something. Also, more people might finally learn that you can plunge the vent clogs instead of welding them. ## Changelog 🆑 qol: Added balloon alerts whenever you start plunging something (i.e ) /🆑 * Fixes spurious runtime on Icemoon caused by turf calling unimplemented LateInitialize() (#82572) ## About The Pull Request As of https://github.com/tgstation/tgstation/pull/82540 this runtime was happening,  `/turf/open/openspace/icemoon/` can be changed to `/turf/open/misc/asteroid/snow/icemoon/do_not_chasm` before `Initialize()` returns, which resulted in it `INITIALIZE_HINT_LATELOAD` getting returned on a turf that does not have an implementation of that proc. This should fix that. ## Why It's Good For The Game Fixes CI error * Blueprints tgui (#82565) Blueprints now use a TGUI panel instead of the old HTML one. Also did general code improvement and maintaining to blueprints in general and also destroyed the ``areaeditor`` level, repathing it to just 'blueprints'. Also adds a sound when you look at structural data cause why not Video demonstration: https://github.com/tgstation/tgstation/assets/53777086/861773fd-3d57-472d-bc94-d67b0d4f1dbd The 4 blueprint types:  Another HTML menu dead underground. This is more responsive and doesn't require constant updating to see which area you're in, feels less OOC (instead of saying "the blueprints say", just say it, you ARE the blueprints). Like, come on  Look at all this wasted space  🆑 refactor: Blueprints now use TGUI. qol: Blueprints can now be used while lying down. /🆑 * General maintenance for chem master (#82002) **1. Qol** - Adds screen tips & examines for screwdriver, wrench, crowbar & beaker insertion, removal & replacing actions - Analyzing reagents is now a client side feature & not a back end mode, meaning one person can see details of a reagent while the other can print stuff and do other operations so it's a non blocking operation. This also means 2 players can see information of 2 different reagents in their own screens, With that the overlay for analysis mode has been removed - You cannot do any tool acts on machines while printing. Balloon alerts will be displayed warning you of that. - The preferred container for the master reagent in the beaker is now showed in both condiment & chem master. It can be enabled/disabled via a CheckBox **2. Code Improvements** - Removed defines like `TARGET_BEAKER` , `TARGET_BEAKER` etc. ther functionality is implemented as params in the `transfer_reagent()` proc directly - Removed all variables relating to analyzing reagents like `reagent_analysis_mode`, `has_container_suggestion` etc. all memory savings - `printable_containers` now stores static values that can be shared across many chem masters - Updates only overlays and not the whole icon during operations for efficiency **3. Fixes** - You can hit the chem master with the screwdriver, wrench, crowbar & beaker when in combat mode - You cannot insert hologram items into the chem master - Deconstructing a condiment master will give you the circuit board already pre-programmed with that option selected so you don't need to use a screwdriver to re program it - `printing_amount` is now the maximum number of containers that can be printed at a time. Presently this number with upgraded parts would print out empty containers especially for patches. This is because `volume_per_item` does not take into consideration this var. Also this var would not give control to the player on exactly how many containers to print as whatever amount the player entered would be multiplied with this value producing a lot of waste & worse empty containers. Now this var determines exactly how many containers you can print and is imposed on the client side UI as well **4. Refactors (UI performance)** - Beaker data is compressed into a single entity & sent to the UI. This is set to null if no beaker is loaded thus saving data sent - Reuses Beaker props from chem synthesizer to reduce code - reagent REF replaced with direct type converted to text and later converted with `text2path()` cause its much faster 🆑 qol: Adds screen tips & examines for screwdriver, wrench, crowbar & beaker insertion, removal & replacing actions qol: Analyzing reagents no longer blocks other players from doing other operations. Multiple players can analyze different reagents on the same machine qol: You cannot do any tool acts on the machine while printing to prevent any side effects. qol: The preferred container for the master reagent in the beaker is now showed in both condiment & chem master. The feature can be enabled/disabled via a check box code: removed defines for reagent transfer, vars for reagent analyzis to save memory. Autodoc for other vars & procs fix: You can hit the chem master with tools like screwdriver, crowbar, wrench & beaker in combat mode fix: You cannot insert hologram items into the chem master fix: Deconstructing a condiment master will give you the circuit board already pre-programmed with that option fix: You now print the exact amount of containers requested even with upgraded parts without creating empty containers. Max printable containers is 13 with tier 4 parts able to print 50 containers. refactor: Optimized client side UI code & chem master as a whole. /🆑 --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> * Wraps `lowertext()` to ensure proper stringification. (#82442) Fixes #82440 This PR just creates a new macro, `LOWER_TEXT()` (yes the irony is not lost on me) to wrap around all calls of `lowertext()` and ensure that whatever we input into that proc will be stringified using the `"[]"` (or `tostring()` for the nerds) operator. very simple. I also added a linter to enforce this (and prevent all forms of regression) because I think that machines should do the menial work and we shouldn't expect maintainers to remember this, let me know if you disagree. if there is a time when it should be opted out for some reason, the linter does respect it if you wrap your input with the `UNLINT()` function. * Clowns can now make balloon... toys. And also mallets and hats. (#82288) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> Clowns will now start with a box of 24 random long balloons and a skillchip in their noggin allowing them to create balloon animals by combining two of them of different colour together. Owners of the skillchip also gain access to crafting recepies of balloon mallets, vests, helmets and tophats, all created from long balloons. A crate of long balloons, with a box of balloons inside, can be bought at cargo, in case the clown runs out. I might edit this once I wake up, its 3 in the morning right now. Oh also, resprited how balloons look in inventory.  Balloon animals funny. Silly features are my favourite kind of features, and this one's open-ended too. Someone on the coder chat recommended someone would do it that one time, here it goes. <!-- 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. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. 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. --> 🆑 add: Added long balloon box to the clown's starting inventory, and a skill-chip of long lost honk-motherian knowledge to their brain. add: Added long balloons. Consequently, added balloon animals to make from such balloons. Also, balloon top hat, vest, helmet, and a mallet. Don't ask about the mallet. add: A long balloons box harvested fresh from the farms on the clown planet will be able to be shipped in a crate to the cargo department near you! add: As per requests; water balloons can now be printed at service lathe, and entertainment modsuit can now blow long balloons! image: Balloons will now have an unique sprite when in the inventory, compared when to on the ground. /🆑 <!-- 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. --> --------- Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Jacquerel <hnevard@gmail.com> * Quick spellcheck 'steall' (#82560) ## About The Pull Request https://github.com/tgstation/tgstation/pull/82447 quick followup to this, caught it while glancing through the code. * Fix * merge conflicts * Revert "Monkeys now use height offset (and monkey tail works) (#81598)" This reverts commit 5cfdc5972d16c6b509220e8874a927696249d36a. * fix * Fixed lateinitialize * This should cut it * Oh right * There? * Damn, here? * There * [NO GBP] Fixes spurious runtime caused by icemoon (again) (#82582) ## About The Pull Request https://github.com/tgstation/tgstation/pull/82572 I tried to fix this but there was an unaccounted race condition which just caused a separate runtime...  Since the type is being changed mid-execution `replacement_turf` will become out of scope. My bad--this should fix it now for good. --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com> Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Co-authored-by: Higgin <cdonny11@yahoo.com> Co-authored-by: NeonNik2245 <106491639+NeonNik2245@users.noreply.github.com> Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com> Co-authored-by: Lucy <lucy@absolucy.moe> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com> Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com> Co-authored-by: Jacquerel <hnevard@gmail.com> Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>	2024-04-26 01:22:24 +02:00
MrMelbertandGitHub	0dc6b71a87	Change setting item weight class to a setter to patch some weight class related shenanigans (#82494) ... ## About The Pull Request Fixes #81052 Fixes #58008 Setting weight class of items is now done via `update_weight_class`. I updated as many occurrences of manually setting `w_class` as I could find but I may have missed some. Let me know if you know of any I missed. This is done to allow datums to react to an item having its weight class changed. Humans and atom storage are two such datums which now react to having an item in its contents change weight class, to allow it to expel items that grow to a weight class beyond what is normally allowed. ## Changelog 🆑 Melbert fix: You can't fit items which are normally too large for a storage by fitting it in the storage when it is small, then growing it to a larger size. /🆑	2024-04-08 19:01:30 -06:00
Waterpig	e8f9767a11	Merge remote-tracking branch 'Skyrat/upstream-merge-81373' into upstream-2024-3	2024-03-03 10:55:23 +01:00
4 people	4f53ec2660	[MIRROR] Fixes complex lights not handling moving well, renames lighting defines (#26484) ... * Fixes complex lights not handling moving well, renames lighting defines (#81423) ## About The Pull Request [Fixes static lights not moving](https://github.com/tgstation/tgstation/commit/ffef43c05a55dae414ef94558ecf9b9df709ded7) Worked fine when the owner moved, but if the owner was inside something else, it would try and trigger an update on the PARENT's lights, which are obviously not us. [Renames MOVABLE_LIGHT and STATIC_LIGHT to better describe what they do](https://github.com/tgstation/tgstation/commit/de73a63bd4d97783c69c95370726d1c253ffb8fe) People keep trying to change the lighting system of lamps and it makes me mad. I choose OVERLAY_LIGHT and COMPLEX_LIGHT here, I couldn't figure out a better name for turf matrix lighting. Suggestions welcome ## Why It's Good For The Game Closes #80005 Hopefully improves understanding of lighting at a glance ## Changelog 🆑 fix: Fixes fancy lights not updating their source location when picked up and moved /🆑 * Oh well --------- Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>	2024-02-12 22:25:22 +00:00
LemonInTheDarkandGitHub	70651816c2	Fixes complex lights not handling moving well, renames lighting defines (#81423) ... ## About The Pull Request [Fixes static lights not moving](https://github.com/tgstation/tgstation/commit/ffef43c05a55dae414ef94558ecf9b9df709ded7) Worked fine when the owner moved, but if the owner was inside something else, it would try and trigger an update on the PARENT's lights, which are obviously not us. [Renames MOVABLE_LIGHT and STATIC_LIGHT to better describe what they do](https://github.com/tgstation/tgstation/commit/de73a63bd4d97783c69c95370726d1c253ffb8fe) People keep trying to change the lighting system of lamps and it makes me mad. I choose OVERLAY_LIGHT and COMPLEX_LIGHT here, I couldn't figure out a better name for turf matrix lighting. Suggestions welcome ## Why It's Good For The Game Closes #80005 Hopefully improves understanding of lighting at a glance ## Changelog 🆑 fix: Fixes fancy lights not updating their source location when picked up and moved /🆑	2024-02-12 20:50:20 +01:00
nevimer	4d8898fdef	Merge remote-tracking branch 'skrat/master' into upstream-2024-02-03 ... # Conflicts: # _maps/map_files/IceBoxStation/IceBoxStation.dmm # _maps/map_files/KiloStation/KiloStation.dmm # _maps/map_files/tramstation/tramstation.dmm # _maps/skyrat/automapper/automapper_config.toml # code/controllers/subsystem/statpanel.dm # code/datums/chatmessage.dm # code/datums/quirks/negative_quirks/claustrophobia.dm # code/game/objects/items/tools/weldingtool.dm # code/modules/client/preferences/middleware/quirks.dm # code/modules/mob/living/carbon/carbon_defense.dm # code/modules/mob/living/carbon/human/human_defense.dm # code/modules/mob/living/carbon/human/inventory.dm # code/modules/mob/living/living_say.dm # code/modules/modular_computers/file_system/programs/jobmanagement.dm # code/modules/projectiles/guns/energy/kinetic_accelerator.dm # code/modules/research/designs/mechfabricator_designs.dm # code/modules/research/machinery/_production.dm # code/modules/surgery/organs/internal/_internal_organ.dm # html/changelogs/archive/2024-01.yml # modular_skyrat/modules/automapper/code/area_spawn_entries.dm # modular_skyrat/modules/jukebox/code/jukebox_subsystem.dm # modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm # modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm # modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm # modular_skyrat/modules/synths/code/bodyparts/power_cord.dm # tgstation.dme # tgui/packages/tgui/components/Dropdown.tsx # tgui/packages/tgui/components/Input.tsx # tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx # tgui/packages/tgui/interfaces/Jukebox.jsx # tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx # tgui/packages/tgui/interfaces/PreferencesMenu/data.ts # tgui/packages/tgui/interfaces/common/SearchBar.tsx	2024-02-03 21:08:40 -05:00
3 people	c3bb222d26	[MIRROR] Some Processing improvements [MDB IGNORE] (#25944) ... * Some Processing improvements (#80693) ## About The Pull Request Got the idea from #80682. A lot of parent procs don't do anything, some are just formatted in a bad way, and others early return and do no ops, it's bad in general but this should give us a head start. Some good overhead saved here * Some Processing improvements --------- Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>	2024-01-01 23:42:38 +00:00
SyncIt21andGitHub	926d000d76	Some Processing improvements (#80693) ... ## About The Pull Request Got the idea from #80682. A lot of parent procs don't do anything, some are just formatted in a bad way, and others early return and do no ops, it's bad in general but this should give us a head start. Some good overhead saved here	2024-01-01 20:58:34 +01:00
StrangeWeirdKitten	5e950115a6	Merge remote-tracking branch 'skyrat/master' into upstream-12/19/2023	2023-12-19 09:14:53 -07:00
4 people	2fa469566c	[MIRROR] Balance changes to swords, energy shields and modsuit shields. [MDB IGNORE] (#25531) ... * Balance changes to swords, energy shields and modsuit shields. (#80072) ## About The Pull Request ### Sword Weaponry Mundane sword weapons of all sorts do not block ``LEAP_ATTACK`` attacks whatsoever. These attacks include tackles, xeno tackles and bodythrows. Energy swords and double energy swords only gain 25% block probability against such attacks. ### Double Energy Sword No longer grants outright energy projectile immunity while employed. Instead, it just has a high probability of reflecting (the typical 75% to block any other attack). So, very solid defense against energy projectiles, but not immunity. Against non-reflectable projectiles, like ballistics or nanite bullets, the desword only has 50% block, similar to an energy sword. To compensate for the loss of defensive power, we'll make it all the more rewarding for getting on top of someone with the sword by giving it 40 force while active. And also it costs 13 TC. ### Combat Energy Shield This also lost outright energy projectile immunity, but gained the standard blocking power of shields on top of the ability to reflect energy projectiles when they block them. This significantly increases the shields potential effectiveness while no longer pigeonholing the shield to only energy weapons. (This makes them exceptionally good against tackles and body throws, by the by). Deathsquads still have the perfect deflection energy shield so that they can continue to spam pulse shots with impunity. ### MODsuit Shield Module Only has one charge instead of three, but it recharges in half the time. This is no longer such a perfect defense, and does somewhat need you to be thinking about how you're utilizing the shield rather than not thinking about defense at all by barreling forward under three potential hits worth of protection. Also much cheaper, at almost half price of 8 TC. Because of how cheap it is (and how much it still is necessary to keep you alive), I've put it into the core equipment box (which brings the price up to 22 TC. As a reminder, this is not meant to be at any discount, and is more aimed towards teaching newer players which items contribute towards success. If you don't want all the times within, don't buy this box, just buy what you want separately.) ## Why It's Good For The Game This is a doozy of an explanation, I hope you're ready for it under the spoiler. <details> With my tackling and bodythrow prs, numerous people expressed exasperation at the fact that these two tools may have been keeping some outlier antagonist gear from becoming too easy to steamroll with if you already knew what you were doing. My intent was to create consistent rules and behaviours that both A) did not rely on bugs to keep the balance of power from tipping one way or the other, and B) was at least consistent or had consistent rules established. This PR is tackling overperforming gear combinations for already competent nukies that may have, over time, crept out of control, and applying some consistency to the rules around similar equipment. AND also deals with quite possibly the most braindead element of game design we've tolerated for about a decade, and half a decade after it was necessary to maintain that decision. Part of the culprit of this issue is that, specifically in regards to nukies, crew can't use the vast majority of their weapons effectively against them. This largely is because this antagonist can gain immunities to those types of equipment. And that is rapidly increasing as we move closer towards outright ballistic removal. I don't think the game is made healthier by everyone on the station having to fight armed mercenaries with spears, and doesn't make much thematic sense either. More so, most greener players probably just don't know this is how it works, and so surprise Pikachu when their lasers bounce off nukies harmlessly. (This bit reminds me of the problem of new players using disablers against simple mobs) But of course, that isn't the only part of the problem. The other half is due to being able to be layered on a much more broad defensive tool in the form of the MODsuit Shield Module, whose three charges could render the mindful nukie near untouchable if they're pairing it with some other layered defense, such as a desword. Notice that this doesn't really address armor. The culprit is negation, and not mitigation, and we should be sparing in how easily we hand out outright effect negation simply because it isn't super obvious to a new player why it happened, and how to resolve it. At the very least, we should look to find ways to add options for players to overcome these problems. Especially with teamwork. Energy projectile immunity made sense while there floated around an energy projectile that ostensibly would down you in a single shot. Nukies ALSO had projectile weapons that worked much the same (c-20r stun bullets, taser shot bulldogs, etc.), so it was predominantly tit-for-tat. These immunity granting equipment pieces forced crew members to get shotguns and ballistic guns to fight these dangers; something more available at the time. We've exercised large bits and pieces of this from the game a long time ago, but we still have some remnants convinced we're still in a taser-rich, ballistic available environment. We need to move the games languishing tools into the modern era and re-established their place in the game. Namely, the double-energy sword and the combat energy shield are almost entirely unchanged besides refactors for the last decade or so, even while the game around them have changed. They've been a continuous sore point for me in all my time developing and a constant nagging issue. I want to deal with it now. MODsuit Shield Module is just kind of really good and only made stronger the more defenses you have. It's good to have a defense like this, but I think it is too brain dead. With only one charge, it will save you from a lost joust here and there, but it won't make it as simple as running right at every problem you encounter and eating a volley of attacks while you kill someone with impunity. **With regards to traitors**, since they also get double-energy swords; I'm open to suggestions if this is hitting them far too hard, but I'm not terribly concerned using this weapon for a few reasons. **Firstly**, I think their presence amongst the crew make it a much better weapon for tots than nukies (in isolation) simply because they can find ways to exploit it via tools they gather from the station. It is a force multiplier. Traitors also have a much bigger element of surprise usually. **Secondly**, round-start traitors typically grow to be a bit stronger over time, but I don't foresee many waiting to pay for the double-energy sword unless they're already flush with TC. So if a traitor is in a position after they've unlocked access to it to buy one of these, they are probably doing pretty okay for themselves. </details> ### TL;DR Defense stacking and attack immunities are not particularly healthy things to both design around, or experience in-game. They are kind of just relics of the past made only sorer once I ripped off a few bandaids. This is a source of a number of symptomatic issues in the game, so let's fix that and make it easier on all of us going forward. Much of the way these things worked operated on extremely outdated design considerations. It doesn't make sense for them to work like this today, and only makes things harder by keeping the status quo. ## Changelog 🆑 balance: Mundane sword-like and medieval weapons are not able to block tackles, xenomorph tackles and body throws. balance: The double-energy sword and energy sword have trouble blocking physical projectiles, body throws and tackles. balance: The double-energy sword also no longer has guaranteed energy projectile deflection; only doing so on a successful block (75% chance to block). balance: But it does have 40 force now, so it is more lethal a weapon. Traitors can purchase the sword for only 13 TC (down from 16 TC). balance: The combat energy shield (The one you hold) now functions as a normal shield (it used to only protect you against energy projectiles and nothing else). It loses guaranteed energy projectile deflection, but still reflects the projectile so on a block. feature: Death commandos continue to have their energy shields deflect all incoming energy projectiles. Because who cares about deathsquads being balanced? balance: The MODsuit shield module only has one charge, but recharges every 10 seconds. It also costs 8 TC (down from 15). It is also now in the Core Gear beginner box (bringing the total price up to 22 TC). /🆑 --------- Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com> * Balance changes to swords, energy shields and modsuit shields. --------- Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>	2023-12-10 20:51:37 -05:00
3 people	8d77b1be89	Balance changes to swords, energy shields and modsuit shields. (#80072) ... ## About The Pull Request ### Sword Weaponry Mundane sword weapons of all sorts do not block ``LEAP_ATTACK`` attacks whatsoever. These attacks include tackles, xeno tackles and bodythrows. Energy swords and double energy swords only gain 25% block probability against such attacks. ### Double Energy Sword No longer grants outright energy projectile immunity while employed. Instead, it just has a high probability of reflecting (the typical 75% to block any other attack). So, very solid defense against energy projectiles, but not immunity. Against non-reflectable projectiles, like ballistics or nanite bullets, the desword only has 50% block, similar to an energy sword. To compensate for the loss of defensive power, we'll make it all the more rewarding for getting on top of someone with the sword by giving it 40 force while active. And also it costs 13 TC. ### Combat Energy Shield This also lost outright energy projectile immunity, but gained the standard blocking power of shields on top of the ability to reflect energy projectiles when they block them. This significantly increases the shields potential effectiveness while no longer pigeonholing the shield to only energy weapons. (This makes them exceptionally good against tackles and body throws, by the by). Deathsquads still have the perfect deflection energy shield so that they can continue to spam pulse shots with impunity. ### MODsuit Shield Module Only has one charge instead of three, but it recharges in half the time. This is no longer such a perfect defense, and does somewhat need you to be thinking about how you're utilizing the shield rather than not thinking about defense at all by barreling forward under three potential hits worth of protection. Also much cheaper, at almost half price of 8 TC. Because of how cheap it is (and how much it still is necessary to keep you alive), I've put it into the core equipment box (which brings the price up to 22 TC. As a reminder, this is not meant to be at any discount, and is more aimed towards teaching newer players which items contribute towards success. If you don't want all the times within, don't buy this box, just buy what you want separately.) ## Why It's Good For The Game This is a doozy of an explanation, I hope you're ready for it under the spoiler. <details> With my tackling and bodythrow prs, numerous people expressed exasperation at the fact that these two tools may have been keeping some outlier antagonist gear from becoming too easy to steamroll with if you already knew what you were doing. My intent was to create consistent rules and behaviours that both A) did not rely on bugs to keep the balance of power from tipping one way or the other, and B) was at least consistent or had consistent rules established. This PR is tackling overperforming gear combinations for already competent nukies that may have, over time, crept out of control, and applying some consistency to the rules around similar equipment. AND also deals with quite possibly the most braindead element of game design we've tolerated for about a decade, and half a decade after it was necessary to maintain that decision. Part of the culprit of this issue is that, specifically in regards to nukies, crew can't use the vast majority of their weapons effectively against them. This largely is because this antagonist can gain immunities to those types of equipment. And that is rapidly increasing as we move closer towards outright ballistic removal. I don't think the game is made healthier by everyone on the station having to fight armed mercenaries with spears, and doesn't make much thematic sense either. More so, most greener players probably just don't know this is how it works, and so surprise Pikachu when their lasers bounce off nukies harmlessly. (This bit reminds me of the problem of new players using disablers against simple mobs) But of course, that isn't the only part of the problem. The other half is due to being able to be layered on a much more broad defensive tool in the form of the MODsuit Shield Module, whose three charges could render the mindful nukie near untouchable if they're pairing it with some other layered defense, such as a desword. Notice that this doesn't really address armor. The culprit is negation, and not mitigation, and we should be sparing in how easily we hand out outright effect negation simply because it isn't super obvious to a new player why it happened, and how to resolve it. At the very least, we should look to find ways to add options for players to overcome these problems. Especially with teamwork. Energy projectile immunity made sense while there floated around an energy projectile that ostensibly would down you in a single shot. Nukies ALSO had projectile weapons that worked much the same (c-20r stun bullets, taser shot bulldogs, etc.), so it was predominantly tit-for-tat. These immunity granting equipment pieces forced crew members to get shotguns and ballistic guns to fight these dangers; something more available at the time. We've exercised large bits and pieces of this from the game a long time ago, but we still have some remnants convinced we're still in a taser-rich, ballistic available environment. We need to move the games languishing tools into the modern era and re-established their place in the game. Namely, the double-energy sword and the combat energy shield are almost entirely unchanged besides refactors for the last decade or so, even while the game around them have changed. They've been a continuous sore point for me in all my time developing and a constant nagging issue. I want to deal with it now. MODsuit Shield Module is just kind of really good and only made stronger the more defenses you have. It's good to have a defense like this, but I think it is too brain dead. With only one charge, it will save you from a lost joust here and there, but it won't make it as simple as running right at every problem you encounter and eating a volley of attacks while you kill someone with impunity. **With regards to traitors**, since they also get double-energy swords; I'm open to suggestions if this is hitting them far too hard, but I'm not terribly concerned using this weapon for a few reasons. **Firstly**, I think their presence amongst the crew make it a much better weapon for tots than nukies (in isolation) simply because they can find ways to exploit it via tools they gather from the station. It is a force multiplier. Traitors also have a much bigger element of surprise usually. **Secondly**, round-start traitors typically grow to be a bit stronger over time, but I don't foresee many waiting to pay for the double-energy sword unless they're already flush with TC. So if a traitor is in a position after they've unlocked access to it to buy one of these, they are probably doing pretty okay for themselves. </details> ### TL;DR Defense stacking and attack immunities are not particularly healthy things to both design around, or experience in-game. They are kind of just relics of the past made only sorer once I ripped off a few bandaids. This is a source of a number of symptomatic issues in the game, so let's fix that and make it easier on all of us going forward. Much of the way these things worked operated on extremely outdated design considerations. It doesn't make sense for them to work like this today, and only makes things harder by keeping the status quo. ## Changelog 🆑 balance: Mundane sword-like and medieval weapons are not able to block tackles, xenomorph tackles and body throws. balance: The double-energy sword and energy sword have trouble blocking physical projectiles, body throws and tackles. balance: The double-energy sword also no longer has guaranteed energy projectile deflection; only doing so on a successful block (75% chance to block). balance: But it does have 40 force now, so it is more lethal a weapon. Traitors can purchase the sword for only 13 TC (down from 16 TC). balance: The combat energy shield (The one you hold) now functions as a normal shield (it used to only protect you against energy projectiles and nothing else). It loses guaranteed energy projectile deflection, but still reflects the projectile so on a block. feature: Death commandos continue to have their energy shields deflect all incoming energy projectiles. Because who cares about deathsquads being balanced? balance: The MODsuit shield module only has one charge, but recharges every 10 seconds. It also costs 8 TC (down from 15). It is also now in the Core Gear beginner box (bringing the total price up to 22 TC). /🆑 --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>	2023-12-09 18:54:18 +01:00
chemistrymain2andGitHub	25172072e5	Revert "[Non-modular] Reverts desword block_chance nerf" (#24577) ... Revert "[Non-modular] Reverts desword block_chance nerf (#24508)" This reverts commit d075e44466.	2023-10-25 11:18:59 -07:00
lilaandGitHub	d075e44466	[Non-modular] Reverts desword block_chance nerf (#24508)	2023-10-24 12:30:08 -07:00
MoostardandGitHub	fe46ae4489	Unskyratifies the batons and double esword. (#556) ... <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Brings back TG balance to the batons and double energy sword. Batons now deal appropriate(original) stamina damage and apply confusion effect. Double esword is no longer worse at blocking than normal esword. I did a local test and it worked. Please test merge first just in case anyway. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> ## Why It's Good For The Game More balanced melee combat. "High risk high reward". Batons were nerfed out of spite and dislike for stun combat, making them deal pathetic stamina damage. Knockdown being the only thing keeping them from being "useless". This and lethals being absurdly powerful (guncargo and cmgs) do not promote nonlethal takedowns at all. These changes will allow antags and security to use their batons more confidently without resorting to lethals. Double esword was nerfed in response to that. This change makes the desword once again the feared weapon worth its cost. <!-- 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. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. 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. --> 🆑 balance: Batons are back with their original TG power. balance: Double energy sword is no longer worse at blocking than normal esword. /🆑 <!-- 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. -->	2023-09-24 12:40:49 -04:00
5 people	07fa5992a4	[MIRROR] Adds p_They (and friends) for capitalized pronoun helpers [MDB IGNORE] (#22555) ... * Adds p_They (and friends) for capitalized pronoun helpers * Fixes modular pronouns * Merge conflict * Update spank_related.dm --------- Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> Co-authored-by: Bloop <vinylspiders@gmail.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>	2023-07-18 22:10:59 -04:00
3 people	dfd4801122	Adds p_They (and friends) for capitalized pronoun helpers (#76910) ... ## About The Pull Request  Basically replaces p_they(TRUE) with p_They ## Why It's Good For The Game Fewer ambiguous parameters (what does TRUE mean when passed to p_they?) More comprehensive helper functions. ## Changelog 🆑 Tattle spellcheck: Fixed the grammar on a few revenant messages /🆑 --------- Co-authored-by: tattle <article.disaster@gmail.com>	2023-07-17 22:55:58 -07:00
3 people	f7d35bc80d	[MIRROR] Stops shields getting broken by pillows and disablers. [MDB IGNORE] (#21588) ... * Stops shields getting broken by pillows and disablers. (#75759) ## About The Pull Request See the title. Doing so by adding a new arg for damage type to `check_shields()` and `hit_reaction()`. The other way would had involved a couple istype checks for item or projectile damage type, but this is a longer term solution and can tackle more than just that. ## Why It's Good For The Game Fixes #74876. ## Changelog 🆑 fix: Stops shields getting broken by pillows and disablers. /🆑 * Stops shields getting broken by pillows and disablers. --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>	2023-06-02 21:36:53 -07:00
GhomandGitHub	88b898dffd	Stops shields getting broken by pillows and disablers. (#75759) ... ## About The Pull Request See the title. Doing so by adding a new arg for damage type to `check_shields()` and `hit_reaction()`. The other way would had involved a couple istype checks for item or projectile damage type, but this is a longer term solution and can tackle more than just that. ## Why It's Good For The Game Fixes #74876. ## Changelog 🆑 fix: Stops shields getting broken by pillows and disablers. /🆑	2023-06-01 16:26:10 -04:00
4 people	637ac53109	[MIRROR] Now blocking is more noticeable! New blocking and parrying sounds [MDB IGNORE] (#21090) ... * Now blocking is more noticeable! New blocking and parrying sounds * Update code/game/objects/items/dualsaber.dm --------- Co-authored-by: DrTuxedo <42353186+DrDiasyl@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>	2023-05-15 18:07:25 +01:00
3 people	a4822c165b	Now blocking is more noticeable! New blocking and parrying sounds (#74998) ... ## About The Pull Request Now whenever an attack is blocked, the sound will play and deflection with the item now plays sound too: https://github.com/tgstation/tgstation/assets/42353186/1a0cc5b7-f2af-4d72-88d7-57cc11f5baa3 The parry.ogg was updated to a better-sounding one https://github.com/tgstation/tgstation/assets/42353186/5ffc53d8-0b3c-4e6b-9256-b7b9735918bc Every item now has a "block_sound" that can be set, it determines what sound is played when you block an attack with it. Cult items no longer have their own way of fuckery to play parry sounds, now they use this system as well. Now shield bash sound is 80% smaller after cutting out all of its noise and silence. ## Why It's Good For The Game Adds feedback on whether the attack was blocked or not, signalling both to the attacker and defender that it didn't go through even if the animation played, which is a great QoL. Same with the deflection sound (although deflection is still pretty visible, the sound would not hurt) New sounds add more flavour to the weapons, especially the energy sword, giving it even more badassery. Cutting down the noise from the shield bash sound has made it better to listen and saved some kilobytes of information. And making every item use the universal system for blocking sounds, removing cultist items' own code for playing parrying sounds. ## Changelog 🆑 DrDiasyl aka DrTuxedo#0931 qol: Now blocking an attack will play a sound and display a spark effect, giving back feedback sound: parry.ogg was updated to a better-sounding version sound: shieldbash.ogg no longer has noise and unnecessary silence sound: New block_shield.ogg and block_blade.ogg for shields and energy swords code: Cultists items no longer have their own code for playing parrying sounds /🆑 --------- Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>	2023-05-11 17:53:46 +00:00
4 people	3464b6bfb2	[MIRROR] Refactors Regenerate Organs, and a few organ helpers [MDB IGNORE] (#20094) ... * Refactors Regenerate Organs, and a few organ helpers * MERGE CONFLICTS * GETORGANSLOT > GET_ORGAN_SLOT * GETORGAN > get_organ_by_type * lint repairs * more lint * Update tgstation.dme * Update surgery_step.dm --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>	2023-04-01 02:51:06 +01:00
3 people	ecbcef778d	Refactors Regenerate Organs, and a few organ helpers (#74219) ... ## About The Pull Request Refactors regenerate organs to be slightly more intelligent in handling organ changes and replacements. Noteably: - We don't remove organs that were modified by the owner; such as changing out your heart for a cybernetic - We early break out of the for loop if they aren't supposed to have an organ there and remove it - We check for the organ already being correct, and just healing it and continuing if it is Also changes the names of some of the organ helpers into snake_case ### Mapping March Ckey to receive rewards: N/A ## Why It's Good For The Game ## Changelog --------- Co-authored-by: Jacquerel <hnevard@gmail.com>	2023-03-26 17:54:36 +01:00
ATH1909andGitHub	5c44b03bfc	eswords now have a demoliton_mod of 1.5x (#73004) ... ## About The Pull Request most energy sword-like weapons have had their demolition_mod increased to 1.5x (from 1x). energy scalpels did not receive this buff, as they're easily crew-accessible and I don't want to deal with a balance flamewar. this affects damage vs. robots, objects, structures, etc. the melee part of the mecha damage unit test now accounts for demolition_mod. ## Why It's Good For The Game  ## Changelog 🆑 ATHATH balance: Most energy sword-like weapons have had their demolition_mod increased to 1.5x (from 1x). This affects damage vs. robots, objects, structures, etc. Energy scalpels did not receive this buff. /🆑	2023-01-29 16:26:17 -08:00
4 people	0fd25257a9	[MIRROR] Fix blood overlays on energy daggers [MDB IGNORE] (#18682) ... * Fix blood overlays on energy daggers * CLANG * has this ever worked? Co-authored-by: Tim <timothymtorres@gmail.com> Co-authored-by: John Doe <gamingskeleton3@gmail.com>	2023-01-13 21:56:37 -08:00
3 people	8fabd54ad6	Mirrors #72354 (#18654) ... * [no gbp] removes all duplicate armor datums (#72354) closes #72348 Title My bad Heres the script I used this time if you want to ```cs var baseDir = Environment.CurrentDirectory; var allFiles = Directory.EnumerateFiles($@"{baseDir}\code", "*.dm", SearchOption.AllDirectories).ToList(); var known = new Dictionary<string, List<KeyValuePair<string, int>>>(); foreach (var file in allFiles) { var fileLines = File.ReadAllLines(file); for (var i = 0; i < fileLines.Length; i++) { var line = fileLines[i]; if (line.StartsWith("/datum/armor/")) { var armorName = line.Replace("/datum/armor/", "").Trim(); if (!known.ContainsKey(armorName)) known[armorName] = new List<KeyValuePair<string, int>>(); var knownList = known[armorName]; knownList.Add(new KeyValuePair<string, int>(file, i)); } } } Console.WriteLine($"There are {known.Sum(d => d.Value.Count)} duplicate armor datums."); var duplicates = new Dictionary<string, List<int>>(); foreach (var (_, entries) in known) { var actuals = entries.Skip(1).ToList(); foreach (var actual in actuals) { if (!duplicates.ContainsKey(actual.Key)) duplicates[actual.Key] = new List<int>(); duplicates[actual.Key].Add(actual.Value); } } Console.WriteLine($"There are {duplicates.Count} files to update."); foreach (var (file, idxes) in duplicates) { var fileContents = File.ReadAllLines(file).ToList(); foreach (var idx in idxes.OrderByDescending(i => i)) { string line; do { line = fileContents[idx]; fileContents.RemoveAt(idx); } while (!String.IsNullOrWhiteSpace(line)); } File.WriteAllLines(file, fileContents); } ``` * modular Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>	2023-01-13 18:05:12 -05:00
4 people	8d67f614b5	Fix blood overlays on energy daggers (#72624) ... ## About The Pull Request Fixes #72338 (again) Energy blades had blood splatters on them and it looked very funky.  Items now have a `NO_BLOOD_ON_ITEM` flag for to ignore the blood overlay. ## Why It's Good For The Game  ## Changelog 🆑 fix: Fix blood overlays on energy daggers code: Add `NO_BLOOD_ON_ITEM` bitfield for items /🆑 Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>	2023-01-13 04:31:53 +00:00