Update 12/11/2024 #113
Merged
Update 12/11/2024 #113
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> [Ports this downstream PR.](Fansana/floofstation1#315) --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: fenndragon - tweak: Moved the uplink deception category into utility. --------- Co-authored-by: fenndragon <[email protected]>
…bjectives (#1323) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description Title --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Reintroduced 3 traitors objectives: steal Ian's meat, Die Glorious Death and Hijack Evacuation Shuttle Signed-off-by: Remuchi <[email protected]>
# Description Turns a plethora of items into throwing weapons that deal damage when thrown. Throwing weapons cost stamina to throw. ## Technical/Balance Details To make a melee weapon also a throwing weapon, just add `- type: DamageOtherOnHit`, and it will automatically inherit the damage from a light melee attack and the melee sound effect as the thrown hit sound effect. You can set a custom damage value with the `damage` field (necessary when the item is not a `MeleeWeapon`) and stamina cost with `staminaCost`. To make the throwing weapon embed and deal damage over time when embedded, add `- type: EmbeddableProjectile` and `- type: EmbedPassiveDamage`. By default, the embed damage per second is 5% of the throwing damage, but it can be modified on `EmbedPassiveDamage` with `throwingDamageMultiplier`. The default stamina cost for throwing is 3.5 stamina. The baseline cost for almost all DoT embeddables is 5 stamina, because of the extra damage the DoT brings. When a thrown item hits a target with body parts, it will randomly select a body part and only deal throwing damage to that body part. It will also embed to the same body part and only deal passive embed damage to it. ## TODO The unchecked checkmarks are best addressed in another PR but they will stay here for now. <details><summary>Show Todo</summary> - [ ] Deal with prediction issue on embeddable projectile removal - [ ] This happens even before this PR so not really a big issue, maybe in a separate PR - [x] Add embeddable damage numbers to embeddables - [x] Fix throwing angle for surgery tools after the surgical tools sprite update - [ ] Try to make the throw knockback function as if it hit a wall - [x] Esword/desword/e-dagger toggle embed damage - [x] Don't start passive embed damage if EmbedPassiveDamageComponent has no damage - [x] Make DamageOtherOnHit.Damage not nullable - [x] Throwing damage only to a specific body part ### Traits - [ ] **Enraged Throw** (Oni) - [ ] Oni/trait damage bonus applied to throwing weapon too - [ ] Can throw carried bodies, which will do a MassContest between the thrown body and the hit body to determine blunt damage, and stun duration for each party - [ ] 15% resistance to thrown/embed damage - This helps when their enemy uses the items they throw against them. - [ ] **Sharpthrower** (Human) - [ ] 10% more Brute thrown damage - [ ] 50% chance of throw hitting targetted body part - [ ] 40% throwing stamina cost reduction - [ ] 15% resistance to thrown/embed damage ### Embeds - [x] Adjust embed damage per second to be like /tg/ (in /tg/ spear has around ~1.2 embed DPS, adjust for ~45% embed chance since we're not implementing embed chance and its 0.54) - [ ] Merge EmbeddableProjectileComponent and EmbeddablePassiveDamageComponent - [ ] Split SharedProjectileSystem into EmbeddableProjectileSystem - [x] Embed to a specific body part and deal damage only to that part, for now can randomly select body parts on embed - [ ] ~~Normal passive damage becomes x0.2 when lying down~~ - [ ] Increased damage when moving, more bonus damage for running (Jostle DPS on /tg/ is 0.2 running and 0.1 when walking/crawling) - [x] All embeddables have a fall out time (30 or 45 secs) - [ ] - [x] On damage examine, can see that an object is embeddable "It can embed on a target if thrown." - [ ] Negative moodlet for attached harmful embeddables - [ ] On health examine target with embeds, can see embedded objects "He has a spear embedded in his left arm." - [x] On examine item that is embedded, can see to which body part the item is embedded "The spear is embedded on Urist McHands's left arm." - [ ] An embeddable removed outside of surgery deals a lot of damage (x2 thrown damage) - [ ] Lying down prevents natural falling out and thus the damage with non-surgical removal - [ ] Surgical procedure on a body part to remove all embeds on it, using hemostat for removal - [x] Allow anyone to remove embedded cultist weapons even if they're not a cultist </details> ## Media **Throwing Toolbox Tools** https://github.com/user-attachments/assets/4e20568f-adf0-4be8-ac38-fc6b21fed03c **Examine**  **Examine After Embedding**  ## Changelog :cl: Skubman - add: The Throwing Update is here. You can throw most melee weapons at the cost of stamina to deal damage from afar. - add: Dozens of throwable weapons, mainly sharp weapons will now embed on throw and deal damage every second until they're manually removed or naturally fall off after some time. - add: Examining the damage values of an item now shows its throwing damage, throwing stamina cost, whether or not it embeds on a throw, and if the embed deals damage over time. - add: Examining an embedded item now shows what body part it's embedded in. - tweak: The traits High Adrenaline, Adrenal Dysfunction, Masochism and Low Pain Tolerance now affect throwing attacks just like melee attacks. - tweak: The default time to remove embedded items has been increased from 3 to 5 seconds, and both the remover and the target with the embedded item need to stand still during the removal. - tweak: The time to pry up a floor tile with a crowbar and other tools has been decreased from 1 second to 0.5 seconds. The throwing damage of floor tiles has been increased. Go figure. - fix: Attempting to throw a Blood Cultist item without being a cultist will stun you and drop the item you're holding properly. --------- Co-authored-by: sleepyyapril <[email protected]>
…22) (#1329) Cherry picks "Fix station events schedulers, antag selection and possibly other systems acting weird in a rare scenario." # Description This is being PRed mostly as a fix to an issue which caused the round to fail to start due to an error in antag selection, which did happen in Thief antags and may also happen with Bloodcult gamemode. Double posting from discord: > It fixed issues caused with antag selection at roundstart which affected roundstart Thief selection. > > Since cultists are also selected exactly at roundstart - unlike traitors for instance, I think this might help with cultists too. > > I tried to force start bloodcult gamemode in the past and it failed to start but I since I had tracebacks disabled trying to improve performance I'm not sure this was the cause. > Credits to April for pointing this out for me after I commented on the issue. ---- This cherry picks 79ff990ddf7c7af40f70bcc7ba2d3220730852ab removing changes which change methods which do not exist yet on our side. <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> Co-authored-by: faint <[email protected]>
nothin' crazy, just annoying.
Description. Melee weapons got swapped from attacks/second to second/attack but the actual attack rate value didn't get changed so weapons got all jumbled. I'm pretty sure I got them all but I might've missed a few in weird folders :cl: - fix: Fixed melee weapons. --------- Signed-off-by: dge21 <[email protected]> Co-authored-by: sleepyyapril <[email protected]> Co-authored-by: VMSolidus <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> This takes in one CVar and one required value and simply checks if the CVar's value as a string is equal to the required value. I could make it use a list of them, but I really didn't think it was needed considering CharacterAndLogic. I also cleaned up CharacterRequirements.Profile.cs a bit. --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
Original commit changeset: c3dcc7a # Description Dark flash is cowardly. Billions must be flashbanged irl # Changelog :cl: - tweak: Flashes are bright again!
Just some nix dev env maintenance don't mind me
# Description By request from Old Dance Jacket, who wanted to be able to use N14 Mapping Assets in SS14. We should probably trim this list down for what assets aren't actually needed (Any asset that is 100% unique to Fallout for instance) # Changelog :cl: - add: Added a large number of mapping assets from Nuclear14
# Description Billions must flip. Goob-Station/Goob-Station#828 Goob-Station/Goob-Station#832 # Changelog :cl: - add: Spin, flip, and jump emotes have been added. --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: username <[email protected]> Co-authored-by: router <[email protected]>
# Description Reverses one of the countless content removals from the old codebase EE was based on by adding back the Clown hardsuit and Mime hardsuit as craftable items. Also re-enables the unique clown snoring sound. ## Media **Hardsuits (renamed to Vacsuit)** <img width=400px src="https://github.com/user-attachments/assets/92f77ef3-3380-4b98-a099-7ed28e260de2"> <br> <img width=400px src="https://github.com/user-attachments/assets/7940d34c-0e7c-4979-bd95-3992e3d79e98"> **Honk Mimimimi** https://github.com/user-attachments/assets/2d8af9a6-d17d-4a94-9f59-7b3aafd987a2 ## Changelog :cl: Skubman - fix: Fixed an issue where players could not craft clown hardsuits and mime hardsuits on the crafting menu. - fix: Fixed an issue where clowns did not have their signature silly snore sound when sleeping. --------- Co-authored-by: sleepyyapril <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description You don't actually have to pay for it, y'know? --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Fix bugs from discord thread. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: In-game guide book to kickstart your sinister activities. - add: Constructs now have abilities. - add: Rending rune and apocalypse rune now should only be placed in the specific spots on maps. Needs to be mapped. - add: Veil Shifter now displays how much charges it has when examining. - add: Cult runes now have descriptions. Also stating how much invokers required for each rune. - add: Blood rites can now be dropped&deleted. - add: Blood rites now suck... blood in 0.5 tiles radius. - remove: Non-cultists can no longer examine runes. - fix: Fixed Cult Objective Target selection. You can (and should) sacrifice your own people now. - fix: Non cultists can no longer use veil shifter. - fix: Teleport spell is no more a cheap rip-off and now actually teleports. - fix: Timed Factories can't no more produce infinite number of entities. - fix: Offering rune should now properly convert someone. - fix: Sacrificing body with mind now properly transfers their mind to soul shard. - fix: Shadow Shackles now cuffs the target instead of the caster (lmao). --------- Signed-off-by: Remuchi <[email protected]> Signed-off-by: Remuchi <[email protected]> Co-authored-by: Raphael Bertoche <[email protected]> Co-authored-by: VMSolidus <[email protected]>
# Description Adds the ability to use guns as melee weapons and throwing weapons. The gun melee attack is a Light Attack done with a right click. The attack rate is slower than average melee weapons. The cooldown on melee attacks after shooting has been removed entirely, so you can right-click immediately after shooting (like in hero shooters 😎). The cooldown on shooting after a melee attack has been set to a constant 0.5 seconds. ## Balance Technically speaking, weaving shooting and pistol-whipping lowers your overall DPS in most cases, because you can't shoot for 0.5 seconds after doing a melee attack. With _skillful_ usage, however, it provides some key tactical advantages: - Preserving ammo by dealing damage without firing a shot. - Deal stamina damage as a natural effect of dealing melee Blunt damage. - Most non-pistol guns have increased blunt stamina damage factors to help with this. - Bypassing Piercing resists of armors with a higher Piercing resist than Blunt resist like plate carriers. - Doing the combo of right-clicking immediately after shooting deals a big burst of damage. Pistol-whipping also helps as a last resort when you run out of ammo. However, it's almost always better to use a proper melee weapon instead of a gun as a pure melee weapon, because you can't power attack with guns and the guns' melee attack rate are slower by design than most melee weapons. Shotguns benefit the most from pistol-whipping, because their ideal range is close-range where a melee attack can be performed, and their low fire rate means they're not affected too much by the 0.5s shooting cooldown. Guns have received throwing damage. You can throw guns at the enemy once you're out of ammo to deal extra damage. I think this makes fights a little more spectacular to watch. Melee damage sorted by group (from least to greatest): 1. Revolver 2. Pistol (+ Energy Pistol) 3. Sniper rifle 4. Rifle (+ Energy Rifle) 5. Sub Machine Gun 6. Shotgun 7. Light Machine Gun (L6 saw) 8. Heavy Machine Gun ## Media **mk 58**  **Kardashev-Mosin (Wielded)**  **Basic Combat** https://github.com/user-attachments/assets/922998d1-0cd0-4fea-8f0b-365bcff3c12b **Particle Decelerator Combo (80 damage)** https://github.com/user-attachments/assets/ce62334a-13dd-46d9-9c0e-453e26bf1261 Combo: Shoot + Power Attack, wait 1.6s then Power Attack + Throw This combo costs 90 stamina which almost depletes 100 stamina leaving you vulnerable, so the Vigor trait can help you pull off this combo. ## Changelog :cl: Skubman - add: Pistol-whipping has been added. You can press right click with a gun to perform a Light Attack. Most guns will deal Blunt damage, apart from the Kardashev-Mosin dealing Piercing/Slash damage with its bayonet. Weaving bullets and melee attacks correctly will give you the upper hand in combat. - add: Guns can now be thrown to deal the same damage as their melee damage.
|
RSI Diff Bot; head commit 2b51f9c merging into fff32a9 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi
Resources/Textures/Structures/Decoration/barrels.rsi
Resources/Textures/Structures/Decoration/cave_decor.rsi
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Routine update, slightly early because ODJ needed some mapping asssets.