mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-29 23:57:29 +00:00
Vapetastic-Gaming-patch-1
3
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
  VanessaandSir Warock
|
f027ae4566 |
Fix Shadekin Inheritence (#6381)
* Make shadekin organic * Removed shadekin lungs * Update Content.Server/_Starlight/ShadekinSystem.cs Co-authored-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> --------- Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> |
||
        
|
064fd77a11 |
Shadekins arrived (#5481)
* Merge pull request #838 from FoxxoTrystan/Shadekin Shadekin # Conflicts: # Resources/Prototypes/Body/species_base.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml # Resources/Prototypes/Guidebook/species.yml # Resources/Prototypes/Species/species_weights.yml * Merge pull request #868 from FoxxoTrystan/Shadekin-Perf Shadekin Performence * Merge pull request #883 from FoxxoTrystan/Shadekin-Patch Shadekin Patch + Markings * Merge pull request #947 from RHSvenson/Shadekin_SurvivalBox Added and implemented emergency boxes for nonbreathers * Merge pull request #1861 from ilovehans10/shadekin-guidebook-typo-fixes Shadekin guidebook typo fixes * Mars -> Marrs (#2381) <!-- IT'S NOT WIZDENS REPO, IF YOU WANT TO ADD YOUR CHANGES ON ALL SERVERS, CREATE PR TO WIZDENS REPO --> <!-- What do you propose to change with your PR? --> Changes `@ mars` to `@ marr`s for Shadekin. <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Parity with emote wheel. Also, `<PLAYERNAME> mars` feels weird. (...probably because Mars as in the planet.) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [Starlight Fork License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE-Starlight.TXT) and grant permission for use in this repository under its conditions. **Changelog** 🆑 Fractalflower - tweak: Changed Mar emote text to `@ marrs`. * Fix shadekin guidebook resistance info (#2881) The shadekin guidebook currently overstates the cellular resistance by 10% and vastly underestimates the bloodloss damage. The guidebook being accurate helps guide player understanding. <img width="563" height="669" alt="image" src="https://github.com/user-attachments/assets/bece997a-5aa4-46f5-9b9f-2fe41dc98e97" /> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [Starlight Fork License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE-Starlight.TXT) and grant permission for use in this repository under its conditions. **Changelog** 🆑 Penguinwizzard - fix: Turns out that we were issuing wildly incorrect guidebooks on Shadekin; an updated edition should now be available for crews. * New Shadekin Disabilities * Light hurts Shadekin Shadekin should get more than a mild sunburn in extreme light * Changes to make it work * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Foam Immunity Readded * Flash Modifer works now * Remove DarkLightComponent * Add missing Locale for Markings from Den * Fix Issues, Seperate from _DV namespace * Yaml Linter Fixes * ARGH * ARGHv.2 * ARGHv.3 * Nutribatard instead of Baguette * Exchange Nutribricks with PSB * Cotton Baguette * Changing away from BaseOrganic and Respirator Removal in Code * Fulfill Content Review Requests * Remove Eye Coloration - Unused * Remove ShadekinPhase entirely * Attribution correctly linked * Review Changes * done yml links correctly now * yml format in shadekin effects * Remove yml file mention and read Internal * Readd Internals * _StarLight -> _Starlight * Port to Nubody and maybe fixing some fuckups * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Shadekin Yaml Errors * Add missing markings name, add missing base_scale * Remove Internal Removal in base_species. Make it Component based * Add missing readonly * Remove Non Breahter emergency boxes, Shadekin normal box * DV Comment Fixes * Untouched File? * Use FlashMultiplierDurationEvent * Add missing attribution * Fixed scream attributions * Shadekins can now properly succumb. Starlight#4746 --------- Co-authored-by: Matthew Herber <32679887+Happyrobot33@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: Rinary <rinary.super@gmail.com> Co-authored-by: FoxxoTrystan <trystan.garnierhein@gmail.com> Co-authored-by: Tess_the_Evil <tessawfresh@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Tobias Berger <toby@tobot.dev> Co-authored-by: Vanessa <vanessalouwagie@gmail.com> |
||
     
|
58cc793e86 |
Port Starlight's expanded makeshift items (#4984)
* 1 * 2 * remove dismantle testing changes * add ammount handling, and add random angle * code-side things * code-side things * code-side things * 3 * 4 * 5 * 6 * changed description for now * whoops * 7 * 8 * 9 * Texture fix * Tada! I diiid iiitttt * Delete .icon.png-autosave.kra * 10 * test another * 11 * Localization fixes 2 Also some minor rebalancing of armor/shield/helmet crafting * ROOOUND 33333 * test wawa * wiz * fixes * MORE FIXES * MORE MORE FIXES * Smg mag fix * Why does it have reflet Removed reflect chance and made the damage the same as a plasteel arming sword * belt fix * phosphorus addition * improvised round bulk crafting * Update tags * tags update 2 * Update tags.yml * fix tags AGAIN * TAG FIX AGAIN * Fixed the sound path * Fixed missing components hopefully * fix it hopefully * Update tidebreaker.yml * fixed errors * fixed? * Update shields.yml * Update tools.yml * Fixes * Update tools.yml * Update tools.yml * Update tools.yml * Update tools.yml * Update tools.yml * screwdriver fix 200 * Update tools.yml * Update tools.yml * Apply suggestions from code review Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update SharedItemSwitchSystem.cs * review changes * Fix server and client files * Namespace fixes. * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/crowbars.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/tools.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/tools.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/tools.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Entities/Objects/Tools/tools.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/Entities/Clothing/Belt/belts.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Recipes/Crafting/Graphs/improvised/improvised_omnitool.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Recipes/Crafting/Graphs/improvised/improvised_omnitool.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Recipes/Crafting/Graphs/improvised/improvised_omnitool.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/Recipes/Crafting/Graphs/improvised/improvised_omnitool.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_StarLight/tags.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update SharedWeaponDismantleOnShootSystem.cs * Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> * Update Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/improvised.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> --------- Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com> Co-authored-by: KillerTheFlareon <tyler443344@outlook.com> Co-authored-by: Matthew Herber <matthewherber@sbcglobal.net> Co-authored-by: Athena-AI <AthenaTheAI@outlook.com> Co-authored-by: stickycheZ101 <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> Co-authored-by: stickycheZ101 <96800602+stickycheZ101@users.noreply.github.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: Vanessa <vanessalouwagie@gmail.com> |