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.

Sign up for GitHub

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

Jump to bottom

Exosuit Nuclear Power Cores #18268

Merged
merged 11 commits into from
Jun 9, 2024
Merged

Exosuit Nuclear Power Cores #18268

merged 11 commits into from
Jun 9, 2024

Commits on Jan 20, 2024

  1. Exosuit Nuclear Power Cores

    @Geevies
    Geevies committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    155f8df View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Merge remote-tracking branch 'Aurorastation/master' into power_core_o… 

    …nline

# Conflicts:
#	aurorastation.dme
#	code/game/objects/items/devices/suit_cooling.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/modules/heavy_vehicle/mech_interaction.dm
#	maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
    @Geevies
    Geevies committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    899a707 View commit details
    Browse the repository at this point in the history

  2. readd uranium

    @Geevies
    Geevies committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    ee90f53 View commit details
    Browse the repository at this point in the history

  3. fluffy changes

    @Geevies
    Geevies committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    15ccd17 View commit details
    Browse the repository at this point in the history

  4. cl update

    @Geevies
    Geevies committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    484f6f3 View commit details
    Browse the repository at this point in the history

  5. move functions

    @Geevies
    Geevies committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    501ba26 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. Merge remote-tracking branch 'Aurorastation/master' into power_core_o… 

    …nline
    @Geevies
    Geevies committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    5eebcfe View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. Merge remote-tracking branch 'Aurorastation/master' into power_core_o… 

    …nline

# Conflicts:
#	code/game/objects/items/weapons/power_cells.dm
#	icons/obj/machinery/cell_charger.dmi
    @Geevies
    Geevies committed May 5, 2024
    Configuration menu
    Copy the full SHA
    4695eab View commit details
    Browse the repository at this point in the history

  2. readd sprite after merge

    @Geevies
    Geevies committed May 5, 2024
    Configuration menu
    Copy the full SHA
    8d1ea51 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. Merge remote-tracking branch 'Aurorastation/master' into power_core_o… 

    …nline
    @Geevies
    Geevies committed May 19, 2024
    Configuration menu
    Copy the full SHA
    47623a5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'Aurorastation/master' into power_core_o… 

    …nline

# Conflicts:
#	code/modules/heavy_vehicle/mech_interaction.dm
    @Geevies
    Geevies committed May 19, 2024
    Configuration menu
    Copy the full SHA
    d1a5048 View commit details
    Browse the repository at this point in the history