Skip to content

Commit

Permalink
Merge remote-tracking branch 'Aurora/master' into about_time
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Atlas committed May 12, 2024
2 parents 5344b1b + f2c05af commit 4ad4bf7
Show file tree
Hide file tree
Showing 761 changed files with 186,929 additions and 108,735 deletions.
93 changes: 93 additions & 0 deletions .github/workflows/build_bapi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Build BAPI
on:
issue_comment:
types: [created]

jobs:
build-bapi:
if: |
github.event.issue.pull_request &&
(github.event.comment.body == '!build_bapi') &&
((github.event.sender.id == github.event.issue.user.id) ||
(github.event.comment.author_association == 'COLLABORATOR') ||
(github.event.comment.author_association == 'MEMBER') ||
(github.event.comment.author_association == 'OWNER'))
runs-on: ubuntu-latest
steps:
- name: Like the comment
env:
BASE_REPOSITORY: ${{ github.repository }}
GH_TOKEN: ${{ github.token }}
run: |
gh api \
--method POST \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
/repos/$BASE_REPOSITORY/issues/comments/${{ github.event.comment.id }}/reactions \
-f content='+1'
- name: PR Data
run: |
pr_json=$(curl -L -s --fail-with-body -H "Authorization: token ${{ github.token }}" ${{ github.event.issue.pull_request.url }})
if [ `jq -r '.maintainer_can_modify' <<<$pr_json` == "false" ] ; then
gh pr comment ${{ github.event.issue.html_url }} --body 'GitHub Actions can not push to the repository without "Allow edits and access to secrets by maintainers" checked.'
echo "FAIL_NOTIFIED=true" >> "$GITHUB_ENV"
exit 1
fi
echo "PR_REPO=`jq -r '.head.repo.full_name' <<<$pr_json`" >> $GITHUB_ENV
echo "PR_BRANCH=`jq -r '.head.ref' <<<$pr_json`" >> $GITHUB_ENV
echo "PR_HEAD_LABEL=`jq -r '.head.label' <<<$pr_json`" >> $GITHUB_ENV
- uses: actions/checkout@v4
with:
repository: ${{ env.PR_REPO }}
ref: ${{ env.PR_BRANCH }}
token: ${{ github.token }}

- name: Build BAPI
env:
BASE_BRANCH: ${{ github.event.repository.default_branch }}
BASE_REPOSITORY: ${{ github.repository }}
GH_TOKEN: ${{ github.token }}
run: |
# Get the code.
git config user.name AuroraBuildBot
git config user.email "[email protected]"
git pull origin "$PR_BRANCH" --depth=$((ahead_by + 1))
git remote add upstream "https://github.com/$BASE_REPOSITORY.git"
git fetch upstream "$BASE_BRANCH" --depth=$((behind_by + 1))
cd rust/bapi
# Get dependencies.
rustup target add i686-unknown-linux-gnu
rustup target add i686-pc-windows-gnu
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install zlib1g-dev:i386 lib32gcc-11-dev mingw-w64 mingw-w64-i686-dev
# Build it.
cargo build --release --target i686-unknown-linux-gnu
cargo build --release --target i686-pc-windows-gnu
# Copy the built targets to their checked-in locations.
cp target/i686-unknown-linux-gnu/release/libbapi.so ../../tools/ci/libbapi_ci.so
cp target/i686-pc-windows-gnu/release/bapi.dll ../../bapi.dll
# Check if a workflow file would be modified by the merge (permissions prevent pushes if so)
latest_workflow_commit=$(git log -n 1 --pretty=format:"%H" upstream/$BASE_BRANCH -- .github/workflows)
if ! git branch --contains $latest_workflow_commit | grep -q "$(git rev-parse --abbrev-ref HEAD)"; then
gh pr comment ${{ github.event.issue.html_url }} --body "GitHub Actions can not push to this branch as workflow files have been changed since your branch was last updated. Please update your branch past https://github.com/$BASE_REPOSITORY/commit/$latest_workflow_commit before using this command again."
echo "FAIL_NOTIFIED=true" >> "$GITHUB_ENV"
exit 1
fi
git commit -a -m "Build BAPI" --allow-empty
git push origin
- name: Notify Failure
if: failure() && env.FAIL_NOTIFIED != 'true'
env:
GH_TOKEN: ${{ github.token }}
run: |
gh pr comment ${{ github.event.issue.html_url }} -b 'Building BAPI failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,8 @@
"editor.rulers": [80],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
}
},
"rust-analyzer.linkedProjects": [
"rust/bapi/Cargo.toml"
]
}
65 changes: 57 additions & 8 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
#include "code\__DEFINES\research.dm"
#include "code\__DEFINES\robopen.dm"
#include "code\__DEFINES\ruin_tags.dm"
#include "code\__DEFINES\rust_bapi.dm"
#include "code\__DEFINES\rust_g.dm"
#include "code\__DEFINES\rust_g_debug.dm"
#include "code\__DEFINES\rust_g_overrides.dm"
Expand Down Expand Up @@ -150,6 +151,7 @@
#include "code\__DEFINES\dcs\signals\signals_record.dm"
#include "code\__DEFINES\dcs\signals\signals_spatial_grid.dm"
#include "code\__DEFINES\dcs\signals\signals_subsystem.dm"
#include "code\__DEFINES\dcs\signals\signals_turf.dm"
#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_main.dm"
#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_movable.dm"
#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_movement.dm"
Expand Down Expand Up @@ -1258,6 +1260,7 @@
#include "code\game\objects\items\weapons\implants\implants\emp.dm"
#include "code\game\objects\items\weapons\implants\implants\explosive.dm"
#include "code\game\objects\items\weapons\implants\implants\freedom.dm"
#include "code\game\objects\items\weapons\implants\implants\galatean.dm"
#include "code\game\objects\items\weapons\implants\implants\health_tracker.dm"
#include "code\game\objects\items\weapons\implants\implants\loyalty.dm"
#include "code\game\objects\items\weapons\implants\implants\mindshield.dm"
Expand Down Expand Up @@ -3753,9 +3756,10 @@
#include "maps\away\away_site\abandoned_diner\abandoned_diner.dm"
#include "maps\away\away_site\abandoned_diner\abandoned_diner_areas.dm"
#include "maps\away\away_site\abandoned_diner\abandoned_diner_landmarks.dm"
#include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station.dm"
#include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station_.dm"
#include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station_areas.dm"
#include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station_items.dm"
#include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station_landmarks.dm"
#include "maps\away\away_site\abandoned_mining\cursed.dm"
#include "maps\away\away_site\abandoned_propellant_depot\abandoned_propellant_depot_.dm"
#include "maps\away\away_site\abandoned_propellant_depot\abandoned_propellant_depot_areas.dm"
Expand Down Expand Up @@ -3799,9 +3803,13 @@
#include "maps\away\away_site\tajara\mining_jack\mining_jack_landmarks.dm"
#include "maps\away\away_site\tajara\peoples_station\peoples_station.dm"
#include "maps\away\away_site\tajara\peoples_station\peoples_station_ghostroles.dm"
#include "maps\away\away_site\tajara\peoples_station\peoples_station_landmarks.dm"
#include "maps\away\away_site\tajara\peoples_station\peoples_station_zones.dm"
#include "maps\away\away_site\tajara\pra_satellite\pra_satellite.dm"
#include "maps\away\away_site\tajara\saniorios_smuggler\saniorios_smuggler.dm"
#include "maps\away\away_site\tajara\saniorios_outpost\saniorios_landmarks.dm"
#include "maps\away\away_site\tajara\saniorios_outpost\saniorios_outpost.dm"
#include "maps\away\away_site\tajara\saniorios_outpost\saniorios_outpost_ghostroles.dm"
#include "maps\away\away_site\tajara\saniorios_outpost\saniorios_outpost_zones.dm"
#include "maps\away\away_site\tajara\scrapper\scrapper.dm"
#include "maps\away\away_site\tajara\scrapper\scrapper_areas.dm"
#include "maps\away\away_site\tajara\scrapper\scrapper_ghostroles.dm"
Expand Down Expand Up @@ -3913,12 +3921,13 @@
#include "maps\away\ships\scc\scc_scout_ship_areas.dm"
#include "maps\away\ships\scc\scc_scout_ship_ghostroles.dm"
#include "maps\away\ships\scc\scc_scout_ship_landmarks.dm"
#include "maps\away\ships\sol_merc\fsf_patrol_ship.dm"
#include "maps\away\ships\sol_merc\fsf_patrol_ship_ghostroles.dm"
#include "maps\away\ships\sol_pirate\sfa_patrol_ship.dm"
#include "maps\away\ships\sol_pirate\sfa_patrol_ship_ghostroles.dm"
#include "maps\away\ships\sol_ssmd\ssmd_ship.dm"
#include "maps\away\ships\sol_ssmd\ssmd_ship_ghostroles.dm"
#include "maps\away\ships\sol\sol_merc\fsf_patrol_ship.dm"
#include "maps\away\ships\sol\sol_merc\fsf_patrol_ship_areas.dm"
#include "maps\away\ships\sol\sol_merc\fsf_patrol_ship_ghostroles.dm"
#include "maps\away\ships\sol\sol_pirate\sfa_patrol_ship.dm"
#include "maps\away\ships\sol\sol_pirate\sfa_patrol_ship_ghostroles.dm"
#include "maps\away\ships\sol\sol_ssmd\ssmd_ship.dm"
#include "maps\away\ships\sol\sol_ssmd\ssmd_ship_ghostroles.dm"
#include "maps\away\ships\tajara\circus\adhomian_circus.dm"
#include "maps\away\ships\tajara\circus\adhomian_circus_areas.dm"
#include "maps\away\ships\tajara\circus\adhomian_circus_items.dm"
Expand Down Expand Up @@ -4055,21 +4064,61 @@
#include "maps\random_ruins\exoplanets\konyang\abandoned\rural_clinic.dm"
#include "maps\random_ruins\exoplanets\lava\lava.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_bar.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_dead_guwandi.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_diona_traders.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_fishing_spot.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_gawgaryn_bikers.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_gawgaryn_riders.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_guild_mining.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_guwandi.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_hegemony_base.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_heph_mining.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_kataphract_wasteland.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_kung_fu.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_memorial.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_otzek_herd.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_ruined_base.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_siakh.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_skakh.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_thakh.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_threshbeast_herd.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_untouched_tyrant.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_untouched_village.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_battlefield.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_bomb.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_crash.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_crater.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_dorviza.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_izwesk.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_klax.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_mikuetz.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_oasis.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_ozeuoi.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_priests.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_queendom.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_reclaimer.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_tomb.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_tyrant.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_vihnmes.dm"
#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_village.dm"
#include "maps\random_ruins\exoplanets\new_gibson\gibson_mining.dm"
#include "maps\random_ruins\exoplanets\new_gibson\gibson_resupply.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_autakh.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_bar.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_battlefield.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_farm.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_fishing_spot.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_freewater.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_guild_mining.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_hegemony_base.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_heph_mining.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_nt_ruin.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_otzek_herd.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_rev_memorial.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_skrell_base.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_sol_base.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_threshbeast_herd.dm"
#include "maps\random_ruins\exoplanets\ouerea\ouerea_village.dm"
#include "maps\random_ruins\exoplanets\raskara\pra_exploration_drone.dm"
#include "maps\random_ruins\exoplanets\raskara\raskara_okon.dm"
#include "maps\random_ruins\exoplanets\raskara\raskara_ritual.dm"
Expand Down
4 changes: 2 additions & 2 deletions code/ZAS/Debug.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ var/image/mark = image('icons/zone.dmi', icon_state = "mark")
/turf/var/tmp/dbg_img
/turf/proc/dbg(image/img, d = 0)
if(d > 0) img.dir = d
cut_overlay(dbg_img)
add_overlay(img)
CutOverlays(dbg_img)
AddOverlays(img)
dbg_img = img

/proc/soft_assert(thing,fail)
Expand Down
4 changes: 2 additions & 2 deletions code/ZAS/Phoron.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
//Do a contamination overlay? Temporary measure to keep contamination less deadly than it was.
if(!contaminated)
contaminated = 1
add_overlay(contamination_overlay, TRUE)
AddOverlays(contamination_overlay, ATOM_ICON_CACHE_PROTECTED)

/obj/item/proc/decontaminate()
contaminated = 0
cut_overlay(contamination_overlay, TRUE)
CutOverlays(contamination_overlay, ATOM_ICON_CACHE_PROTECTED)

/mob/proc/contaminate()

Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/_macros.dm
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@
/// Decrease the size of L by 1 from the end. Is the old last entry index.
#define LIST_DEC(L) ((L).len--)

/// Explicitly set the length of L to NEWLEN, adding nulls or dropping entries. Is the same value as NEWLEN.
#define LIST_RESIZE(L, NEWLEN) ((L).len = (NEWLEN))

/// Drops x into the the src's location, and then nulls its reference.
#define DROP_NULL(x) if(x) { x.dropInto(loc); x = null}

Expand Down
10 changes: 10 additions & 0 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,16 @@
id = ACCESS_HOUSE_VOLVALAAD_SHIP
access_type = ACCESS_TYPE_CENTCOM

#define ACCESS_OZEUOI 227
/datum/access/moghes_wasteland_ozeuoi
id = ACCESS_OZEUOI
access_type = ACCESS_TYPE_CENTCOM

#define ACCESS_AUTAKH 228
/datum/access/autakh
id = ACCESS_AUTAKH
access_type = ACCESS_TYPE_CENTCOM

//guest rooms - for any ship/event that requires hotel-esque rooms

#define ACCESS_GUEST_ROOMS 230 //use with req_one_access
Expand Down
11 changes: 10 additions & 1 deletion code/__DEFINES/atmos.dm
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,13 @@
#define CONNECT_TYPE_FUEL 16
#define CONNECT_TYPE_AUX 32

var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "black" = PIPE_COLOR_BLACK, "purple" = PIPE_COLOR_PURPLE)
GLOBAL_LIST_INIT(pipe_colors, list(
"grey" = PIPE_COLOR_GREY,
"red" = PIPE_COLOR_RED,
"blue" = PIPE_COLOR_BLUE,
"cyan" = PIPE_COLOR_CYAN,
"green" = PIPE_COLOR_GREEN,
"yellow" = PIPE_COLOR_YELLOW,
"black" = PIPE_COLOR_BLACK,
"purple" = PIPE_COLOR_PURPLE
))
10 changes: 5 additions & 5 deletions code/__DEFINES/chemistry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@
#define INTOX_DEATH 0.45

//How many units of intoxication to remove per second
#define INTOX_FILTER_HEALTHY 0.10
#define INTOX_FILTER_BRUISED 0.07
#define INTOX_FILTER_DAMAGED 0.03
#define INTOX_FILTER_HEALTHY 0.015
#define INTOX_FILTER_BRUISED 0.007
#define INTOX_FILTER_DAMAGED 0.003

#define BASE_DIZZY 50 //Base dizziness from getting drunk.
#define DIZZY_ADD_SCALE 15 //Amount added for every 0.01 percent over the JUDGEIMP limit

#define BASE_VOMIT_CHANCE 10 //Base chance
#define VOMIT_CHANCE_SCALE 2.5 //Percent change added for every 0.01 percent over the VOMIT limit
#define BASE_VOMIT_CHANCE 1 //Base chance
#define VOMIT_CHANCE_SCALE 1 //Percent change added for every 0.01 percent over the VOMIT limit

#define REAGENTS_FREE_SPACE(R) (R.maximum_volume - R.total_volume)

Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/color.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
#define COLOR_SNOW "#9CADAD"
#define COLOR_LING_HIVEMIND "#583012"
#define COLOR_LINOLEUM "#4E4D41"
#define COLOR_LEATHER "#5C4831"

#define COLOR_TOOLS "#eac041"

Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
#define COMPONENT_ATOM_BLOCK_EXIT (1<<0)
///from base of atom/Exited(): (atom/movable/gone, direction)
#define COMSIG_ATOM_EXITED "atom_exited"
///from base of atom/has_gravity(): (turf/location, list/forced_gravities)
#define COMSIG_ATOM_HAS_GRAVITY "atom_has_gravity"
6 changes: 6 additions & 0 deletions code/__DEFINES/dcs/signals/signals_turf.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Turf signals. Format:
// When the signal is called: (signal arguments)
// All signals send the source datum of the signal as the first argument

///from base of atom/has_gravity(): (atom/asker, list/forced_gravities)
#define COMSIG_TURF_HAS_GRAVITY "turf_has_gravity"
2 changes: 2 additions & 0 deletions code/__DEFINES/flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ var/list/mimic_defines = list(
/// If a dense atom like a platform does not allow movement through it like a window pane BUT allows pickup.
#define ATOM_FLAG_ALWAYS_ALLOW_PICKUP FLAG(7)

#define ATOM_AWAITING_OVERLAY_UPDATE FLAG(10)

// Movable flags.

/// Does this object require proximity checking in Enter()?
Expand Down
4 changes: 0 additions & 4 deletions code/__DEFINES/global.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,12 @@ GLOBAL_DATUM(lobby_mobs_location, /turf)

//Spawnpoints.
GLOBAL_LIST_EMPTY(latejoin)
GLOBAL_LIST_EMPTY(latejoin_gateway)
GLOBAL_LIST_EMPTY(latejoin_cryo)
GLOBAL_LIST_EMPTY(latejoin_cryo_command)
GLOBAL_LIST_EMPTY(latejoin_cyborg)
GLOBAL_LIST_EMPTY(latejoin_merchant)
GLOBAL_LIST_EMPTY(latejoin_living_quarters_lift)
GLOBAL_LIST_EMPTY(kickoffsloc)
GLOBAL_LIST_EMPTY(virtual_reality_spawn)

GLOBAL_LIST_EMPTY(asteroid_spawn) // Asteroid "Dungeons" spawn at these.
GLOBAL_LIST_EMPTY(tdome1)
GLOBAL_LIST_EMPTY(tdome2)
GLOBAL_LIST_EMPTY(tdomeobserve)
Expand Down
Loading

0 comments on commit 4ad4bf7

Please sign in to comment.