#15 Перенос обновлений с Beta на Alpha сервер #877
Merged
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
…hiptest-ss13#3223) Reverts shiptest-ss13#3111 as it was awaiting testmerges for being a Very Unpopular pr among maintainers and other voices in private-dev (extensively discussed) before it was full-merged without that happening. Lol  :cl: balance: Undoubles the price on every automatic gun and removed 250 from the price of every semi-auto pistol. /:cl:
<!-- 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 BG-16 ammo now costs 666 power as intended (I think) down from 1000, so they get 30 shots instead of not 30 with an advanced/military cell BG-16 also gets its automatic firemode back since it was lost in the firemode refactor ## Why It's Good For The Game fancy gun version gets less shots per cell without doing more damage when it shouldnt do that ## Changelog :cl: fix: the BG-16 is now as ammo efficient as the BG-12 fix: the BG-16 has automatic fire again /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: Theos <[email protected]>
) <!-- 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 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Outpost mission drills and containers from acquire missions show what they need in the object's name.   Also changes the name of the base fish type so it doesn't look odd when displayed. ## Why It's Good For The Game Quality of life change, and should help prevent bounty mission objectives being mixed up. It's fairly awkward mixing up two creature captures and having to shuffle them for example. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Acquire Mission containers and Mission drills display their objective type. add: Changed name of base fish type to generic fish /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
… descriptions. (shiptest-ss13#3209) <!-- 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 This PR changes the foodtypes of the Gezenan Dark Mead and Keh'Lu'Tex Liqueur to more accurately reflect their descriptions. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game This change is good for the game as it will enable Sarathi to enjoy drinks which are referenced to be popular Gezenan drinks. Both of the changed drinks are described to be made without the use of grain or vegetable products. This PR simply adjusts their foodtypes to reflect this and permit Gezena's majority population to enjoy native beverages. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: fixed the foodtype of two Gezenan drinks to match their descriptions add: added a taste description to Keh'Lu'Tex Liqueur /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## hey look it's a new ruin <details><summary>The Ruin</summary>    </details> ## and another <s>pill</s> subshuttle  ## About The Pull Request This PR adds a new ruin to rockplanets featuring a group of New Frontiersman bootleggers based out of a pre-ICW era Nanotrasen research facility. A new type of bottle crate for moonshine bottles has been added, as well as a new subtype of Frontiersmen, without need for air. Moonshine now requires a fermenting barrel or distillery to be produced. Thank you to @FalloutFalcon for providing the code that makes this work, as well as refactoring bottle crates to make them work with variables. <details><summary>Threats</summary> ``` - Melee Frontiersman (x3) - Revolver Frontiersman (x4) - Rifle Frontiersman Trooper (x4) - Rifle Frontiersman - Frontiersman Officer - Mi-go (Dog) - Explosive Mines (x5) ``` </details> <details><summary>Major Loot</summary> ``` - Moonshine Jugs (x31) - Moonshine Keg - Moonshine Vat - Regular Medkit - Bicaridine Bottles (x2) - Common Machine Boards (x2) - Common Computer Board - Drink Dispenser - Booze Dispenser - SRM Distiller - Autolathe - Uranium PACMAN Generator - ~4000 credits - Hydroponics Trays (x2) - .357 Revolver (x2) - HP Shadow - .45 Speedloader - .357 Speedloader (x2) - Commander - Stetchkin Pistol - Empty Commander Magazine (x2) - AP 9mm Ammo Box - Stetchkin Magazine (x2) - Mosin Rifle (x3) - Mosin Clip (x2) - Armor Vest (x3) - SWAT helmet (x2) ``` </details> ## Changelog 🆑 goober3, FalloutFalcon add: A new Frontiersman-themed rockplanet ruin. add: Frontiersmen now have subtypes with oxygen masks. tweak: Moonshine can now only be brewed via fermenting barrels & distillers. code: Drinks recipes can now have multiple required containers. /🆑 --------- Signed-off-by: goober3 <[email protected]> Co-authored-by: Theos <[email protected]>
## About The Pull Request Adds a brand new ruin to Lava Worlds, a remaster of the old listening post ruin now abandoned mid-ICW and searched by the Ramzi Clique for valuables. Major Loot: - Stechkin, loaded + 1 spare magazine - Safe containing Loadsamoney spawner and Secret Documents, plus folder to hold documents in - Blackbox - Telecommunications assembly, capable of receiving only - C-20r in end room with no magazine and one spare unloaded magazine - Scalpal, Cautery and Latex Gloves in the small infirmary Contains for threat: - 3 Pistol Ramzi Commandos - 1 SMG Ramzi Commando - 1 Shotgun Ramzi Commando in the final room StrongDMM Areas Screenshot:  StrongDMM No Areas Screenshot:  In-Game Screenshot:  ## Why It's Good For The Game With the recent Ruincut more ruins are necessary to round out the planets in-game, and replacing a poorly designed ruin from the past with a higher-quality remake is something I like doing. This also adds an interesting environment of an abandoned holding from the ICW, of which not many exist as ruins despite the ICW being such a large event. ## Changelog :cl: Cloudbreak add: A new ruin, the Abandoned Listening Post. add: Areas associated with the listening post. fix: Single line in maps catalogue. /:cl: --------- Signed-off-by: firebudgy <[email protected]> Co-authored-by: meem <[email protected]>
<!-- 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 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Marker beacons can be printed in the autolathe under the Misc tab ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> Marker beacons aren't practically obtainable outside of the occasional loot drops currently, and I think they're a nice thematic way to lay trails or mark points of interest as you navigate the planet rather than going around laying spray paint everywhere. ## Changelog :cl: add: Marker beacons can now be printed at the autolathe from the Misc tab /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
…eaning Tweak: TGUI refresh button and OOC tab cleaning
Небольшая перебалансировка Пандоры и элиток. Вернули обратно лут с тендрилов, с 2 до 3 артефактов.
* Добавление масок для сарати * Исправление ошибок * Update update_icons.dm
Fix + Update: QoL
Исправления ошибок спрайтов, книг и кривого кода
Полировка кода для "носатых" шлемов и масок
MysticalFaceLesS
requested review from
RalseiDreemuurr,
molnizz and
MrCat15352
as code owners
github-actions
bot
added
🪓 НЕ МОДУЛЬНО 🪓
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.
[Перенос №14] - (#868)