Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#15 Перенос обновлений с Beta на Alpha сервер #877

Merged
merged 31 commits into from
Aug 3, 2024

Commits on Jul 23, 2024

  1. Configuration menu
    Copy the full SHA
    7458883 View commit details
    Browse the repository at this point in the history
  2. readme, funneh

    Yata9ar4su committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    211a5d2 View commit details
    Browse the repository at this point in the history
  3. readme fix...

    Yata9ar4su committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    b09158a View commit details
    Browse the repository at this point in the history
  4. moth

    Yata9ar4su committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    5e6ba40 View commit details
    Browse the repository at this point in the history
  5. PR issue fixes

    Yata9ar4su committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    16f10fb View commit details
    Browse the repository at this point in the history
  6. no moth

    Yata9ar4su committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    c1e19e7 View commit details
    Browse the repository at this point in the history
  7. more fixes

    Yata9ar4su committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    8c20e19 View commit details
    Browse the repository at this point in the history
  8. fixfixifx

    Yata9ar4su committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    8329f6c View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. reverts 'Increases the price of automatic weapons and some handguns' (s…

    …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
    
    ![woe2](https://github.com/user-attachments/assets/94c29def-6fe8-4bad-8b72-e66af04276fd)
    
    :cl:
    balance: Undoubles the price on every automatic gun and removed 250 from
    the price of every semi-auto pistol.
    /:cl:
    generalthrax authored and MysticalFaceLesS committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    d15c130 View commit details
    Browse the repository at this point in the history
  2. BG-16 fixes (shiptest-ss13#3230)

    <!-- 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]>
    SomeguyManperson authored and MysticalFaceLesS committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    1cacb9f View commit details
    Browse the repository at this point in the history
  3. Mission Drills and Containers display what they need (shiptest-ss13#3211

    )
    
    <!-- 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.
    
    ![image](https://github.com/user-attachments/assets/fb10de74-f6f8-4c52-8757-eb85efa275cd)
    
    ![image](https://github.com/user-attachments/assets/b9c6ac35-b5f8-404b-b343-c5073a3f627d)
    
    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. -->
    Gristlebee authored and MysticalFaceLesS committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    f5f3b9d View commit details
    Browse the repository at this point in the history
  4. Changes the ingredients of two Gezenan drinks to better reflect their…

    … 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. -->
    DIB-DOG authored and MysticalFaceLesS committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    f41ff55 View commit details
    Browse the repository at this point in the history
  5. Frontiersman Distillery Ruin (shiptest-ss13#2907)

    ## hey look it's a new ruin
    <details><summary>The Ruin</summary>
    
    
    
    ![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/e9b43902-945a-4090-9be9-a0da753ebcff)
    
    
    ![2c5f52abe42891f0bfc41d57205f0e86](https://github.com/shiptest-ss13/Shiptest/assets/118859017/4697ec2b-a78b-46ad-930e-d1ce491295dc)
    
    
    ![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/d05d6996-47da-46ea-8f35-ef35ac5578ca)
    
    </details>
    
    ## and another <s>pill</s> subshuttle
    
    ![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/39eb60d5-1244-4cc1-9524-96f31438d689)
    
    ## 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]>
    2 people authored and MysticalFaceLesS committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    097a620 View commit details
    Browse the repository at this point in the history
  6. Adds a new ruin: the Abandoned Listening Post (shiptest-ss13#3103)

    ## 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:
    
    ![image](https://github.com/user-attachments/assets/3735ed3d-fda3-4528-845f-8124f6957fca)
    StrongDMM No Areas Screenshot:
    
    ![image](https://github.com/user-attachments/assets/14c12ef1-f323-4614-9a95-e865d6f272ac)
    In-Game Screenshot:
    
    ![image](https://github.com/user-attachments/assets/5abb80d7-1363-4f1f-95b3-97a7713a761e)
    ## 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]>
    2 people authored and MysticalFaceLesS committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    7fbd03d View commit details
    Browse the repository at this point in the history
  7. Marker Beacons can be printed in the autolathe (shiptest-ss13#3224)

    <!-- 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. -->
    Gristlebee authored and MysticalFaceLesS committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    601ac1a View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. Configuration menu
    Copy the full SHA
    f80fa9c View commit details
    Browse the repository at this point in the history
  2. rdme

    Yata9ar4su committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    b4ef21e View commit details
    Browse the repository at this point in the history
  3. merge conflict fix

    Yata9ar4su committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    36a00f4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ae060ac View commit details
    Browse the repository at this point in the history
  5. readme update

    Yata9ar4su committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    87ce750 View commit details
    Browse the repository at this point in the history
  6. final commit...

    Yata9ar4su committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    66460c2 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #859 from Yata9arasu/tgui-refresh-button-nd-ooc-cl…

    …eaning
    
    Tweak: TGUI refresh button and OOC tab cleaning
    MysticalFaceLesS committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    769d772 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Configuration menu
    Copy the full SHA
    5c22f5d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #871 from RalseiDreemuurr/codding

    Небольшая перебалансировка Пандоры и элиток. 
    Вернули обратно лут с тендрилов, с 2 до 3 артефактов.
    MrCat15352 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    6193324 View commit details
    Browse the repository at this point in the history
  3. Fix + Update: QoL

    molnizz committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    df64c0b View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Добавление масок и шлемов для морд сарати (#873)

    * Добавление масок для сарати
    
    * Исправление ошибок
    
    * Update update_icons.dm
    RalseiDreemuurr committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    e403f73 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #872 from molnizz/cringe18

    Fix + Update: QoL
    MrCat15352 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    c215190 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Configuration menu
    Copy the full SHA
    92879b8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #874 from RalseiDreemuurr/sprites

    Исправления ошибок спрайтов, книг и кривого кода
    MysticalFaceLesS committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    4c3c743 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Configuration menu
    Copy the full SHA
    76d42b7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #875 from RalseiDreemuurr/sprites

    Полировка кода для "носатых" шлемов и масок
    MysticalFaceLesS committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    1a54f44 View commit details
    Browse the repository at this point in the history