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

Add: new NAS Trurl #811

Merged
merged 63 commits into from
Jan 19, 2025
Merged

Add: new NAS Trurl #811

merged 63 commits into from
Jan 19, 2025

Conversation

konushi
Copy link

@konushi konushi commented Nov 26, 2024

About The Pull Request

Потихоньку пилим НАШ ЦК для НАШЕЙ Бандастейшон, ух.
Трурль в виде корабля.

Why It's Good For The Game

Прикольный кораблик с присущим 220 пафосом. РП, все дела.

ВСЕ ДЕКОР, КРОМЕ ЗОНЫ ОБР

Changelog

Вроде все
image

🆑
add: Новый Трурль.
/:cl:

Summary by Sourcery

New Features:

  • Introduce Argos and Specops shuttles for CentCom.

@github-actions github-actions bot added 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. labels Nov 26, 2024
@adskipups
Copy link

Боевые мехи это как-то слишком жирно для ЕРТшников

@konushi
Copy link
Author

konushi commented Nov 27, 2024

Боевые мехи это как-то слишком жирно для ЕРТшников

абсолютно похуй, раз 20 поменяется еще

@adskipups
Copy link

Боевые мехи это как-то слишком жирно для ЕРТшников

абсолютно похуй, раз 20 поменяется еще

Кстати, на цк должна быть админ зона (тандердром) и админ тюрьма(у админов есть смайт jail который кидает на цкшную тюрьму)

@konushi
Copy link
Author

konushi commented Nov 28, 2024

Боевые мехи это как-то слишком жирно для ЕРТшников

абсолютно похуй, раз 20 поменяется еще

Кстати, на цк должна быть админ зона (тандердром) и админ тюрьма(у админов есть смайт jail который кидает на цкшную тюрьму)

Тандердом у нас не юзается, админ зона будет скорее всего отдельно (может отдельным з-левелом, не знаю, могу ошибаться). Смайтом будет кидать в текущую тюрягу

@konushi konushi marked this pull request as draft November 28, 2024 22:54
Copy link

github-actions bot commented Dec 6, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale label Dec 6, 2024
@github-actions github-actions bot removed the Stale label Dec 7, 2024
@dj-34 dj-34 added the RED LABEL ПР не может быть устаревшим. Но всем всё равно на него похуй. label Dec 7, 2024
@konushi konushi marked this pull request as ready for review January 7, 2025 13:40
Copy link

sourcery-ai bot commented Jan 7, 2025

Reviewer's Guide by Sourcery

This pull request introduces a new NanoTrasen Central Command (NAS) ship named "Trurl". It includes new vending machines for ammunition and gear, updates area names for CentCom, adds docking ports and shuttles for Argos and Specops, new statues, map templates, outfit access changes, and various other additions.

Class diagram for new vending machines

classDiagram
    class obj_machinery_vending_nta {
        +name: NT Ammunition
        +desc: string
        +icon_state: nta
        +onstation: false
        +all_products_free: true
        +products: list
    }

    obj_machinery_vending_nta <|-- obj_machinery_vending_nta_light
    obj_machinery_vending_nta <|-- obj_machinery_vending_nta_heavy

    class obj_machinery_vending_nta_light {
        +name: NT Ammunition - Light Gear
        +product_categories: list
        -Weapons
        -Ammo & Grenades
        -Equipment
    }

    class obj_machinery_vending_nta_heavy {
        +name: NT Ammunition - Heavy Gear
        +product_categories: list
        -Weapons
        -Ammo & Grenades
        -Equipment
        -Medical
    }
Loading

Class diagram for new shuttle computers

classDiagram
    class obj_machinery_computer_camera_advanced_shuttle_docker {
        +name: string
        +desc: string
        +shuttleId: string
        +shuttlePortId: string
        +x_offset: number
        +y_offset: number
    }

    obj_machinery_computer_camera_advanced_shuttle_docker <|-- argos_docker
    obj_machinery_computer_camera_advanced_shuttle_docker <|-- specops_docker

    class argos_docker {
        +name: syndicate infiltrator navigation computer
        +shuttleId: argos
        +view_range: 5.5
    }

    class specops_docker {
        +name: Specops navigation computer
        +shuttleId: specops
    }

    class obj_machinery_computer_shuttle {
        +name: string
        +desc: string
        +shuttleId: string
        +possible_destinations: string
    }

    obj_machinery_computer_shuttle <|-- argos_console
    obj_machinery_computer_shuttle <|-- specops_console
Loading

File-Level Changes

Change Details Files
Added new vending machines for NanoTrasen Ammunition.
  • Created a vending machine for NT ammunition with categories for light and heavy gear.
  • Added a refill canister for the NT ammunition vending machine.
  • Included various weapons, ammo, grenades, and equipment in the vending machine's inventory.
modular_bandastation/objects/code/machinery/vending/vending.dm
Updated area names for CentCom.
  • Added 'ЦК -' prefix to various CentCom area names to clarify their location.
modular_bandastation/mapping/code/areas/off_station.dm
Added Argos and Specops shuttles and docking ports.
  • Created new shuttle dockers and consoles for Argos and Specops.
  • Added docking ports for Argos and Specops shuttles.
  • Defined shuttle areas for Argos and Specops.
  • Created circuitboards for Argos and Specops shuttles.
modular_bandastation/objects/code/shuttles.dm
Added new statues.
  • Added statues for Heinrich Treisen III, Camper Hunter (Elwycco), Normandy SOO, Venus, and a holoplanet statue.
modular_bandastation/objects/code/structures/statues.dm
Added map templates for Argos and Specops shuttles.
  • Created map templates for basic Argos and Specops shuttles, specifying their port IDs, purchase permissions, and file prefixes.
modular_bandastation/mapping/code/templates.dm
Modified outfit access for CentCom roles.
  • Updated diplomat access to include Captain and Specops access.
  • Added an ERT & Marine Commander ID with general CentCom access.
modular_bandastation/outfits/code/centcom.dm
Added fake lights.
  • Created fake light structures in small, spot, and floor variants.
  • Defined properties for light color, power, range, and resistance.
modular_bandastation/objects/code/structures/fake_light.dm
Added CentCom fluff paper.
  • Created a fluff paper detailing an updated order from the Department of Special Operations regarding ERT equipment and procedures.
modular_bandastation/objects/code/items/papers.dm
Added ERT and standard mechas.
  • Added a loaded Marauder mecha for ERT with specific equipment.
  • Added a loaded Gygax mecha with default equipment.
modular_bandastation/objects/code/mecha/mecha.dm
Added grenade and pepper spray boxes.
  • Created storage boxes for smoke grenades and pepper spray.
modular_bandastation/objects/code/items/storage/grenade_box.dm
modular_bandastation/objects/code/items/storage/paper_spray_box.dm
Updated automapper config and map files.
  • Added automapper templates for Argos and Specops ferry ports and updated map files accordingly.
_maps/bandastation/automapper/automapper_config.toml
_maps/bandastation/automapper/templates/deltastation/deltastation_argos_specops_ferry_ports.dmm
_maps/bandastation/automapper/templates/iceboxstation/iceboxstation_argos_port.dmm
_maps/bandastation/automapper/templates/iceboxstation/iceboxstation_specops_port.dmm
_maps/bandastation/automapper/templates/metastation/metastation_argos_port.dmm
_maps/bandastation/automapper/templates/metastation/metastation_specops_port.dmm
_maps/bandastation/automapper/templates/tramstation/tramstation_argos_port.dmm
_maps/bandastation/automapper/templates/tramstation/tramstation_specops_port.dmm
_maps/shuttles/ss220/argos_basic.dmm
_maps/shuttles/ss220/specops_basic.dmm
Updated decals and layers.
  • Adjusted layer for catwalk siding.
  • Added pixel offset for floor decals.
modular_bandastation/mapping/code/layers.dm
modular_bandastation/aesthetics/decals/code/floor_decals.dm

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time. You can also use
    this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@dj-34 dj-34 self-requested a review January 8, 2025 04:05
Copy link
Collaborator

@dj-34 dj-34 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ревью карты будет позже

modular_bandastation/mapping/code/templates.dm Outdated Show resolved Hide resolved
modular_bandastation/objects/code/mecha/mecha.dm Outdated Show resolved Hide resolved
modular_bandastation/objects/code/shuttles.dm Outdated Show resolved Hide resolved
modular_bandastation/objects/code/structures/fake_light.dm Outdated Show resolved Hide resolved
layer = ABOVE_MOB_LAYER
abstract_type = /obj/structure/statue/statue_holoplanet


Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

modular_bandastation/objects/code/shuttles.dm Show resolved Hide resolved
Copy link
Collaborator

@dj-34 dj-34 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Предварительный апрув.
То что увидел на картах - поправил сам.

@dj-34 dj-34 added 🛡️ Stale Exempt ПР не может быть устаревшим. Но всем всё равно на него похуй. and removed RED LABEL ПР не может быть устаревшим. Но всем всё равно на него похуй. labels Jan 12, 2025
@ss220app ss220app bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 19, 2025
@dj-34 dj-34 merged commit e039856 into ss220club:master Jan 19, 2025
25 of 28 checks passed
ss220app bot added a commit that referenced this pull request Jan 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден Этот чейнджлог будет успешно опубликован 🛡️ Stale Exempt ПР не может быть устаревшим. Но всем всё равно на него похуй. 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants