diff --git a/.github/workflows/turdis.yml b/.github/workflows/turdis.yml index 62b8517eab19..3bec8046d2c2 100644 --- a/.github/workflows/turdis.yml +++ b/.github/workflows/turdis.yml @@ -14,7 +14,7 @@ on: jobs: lint: name: Lints - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -82,7 +82,7 @@ jobs: compile: name: Compile All Maps - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -114,7 +114,7 @@ jobs: find_all_maps: if: "!contains(github.event.head_commit.message, '[ci skip]')" name: Find Maps to Test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: maps: ${{ steps.map_finder.outputs.maps }} steps: @@ -128,7 +128,7 @@ jobs: echo "maps={\"paths\":[$(cat maps_output.txt)]}" >> $GITHUB_OUTPUT test: name: Compile and Run Tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [find_all_maps] strategy: fail-fast: false @@ -151,7 +151,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt install libstdc++6:i386 gcc-multilib g++-7 g++-7-multilib zlib1g:i386 libssl1.1 libssl1.1:i386 + sudo apt install libstdc++6:i386 gcc-multilib g++-10 g++-10-multilib zlib1g:i386 libssl3 libssl3:i386 - name: Restore Cache BYOND uses: actions/cache@v4 diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 528bbedda4e7..e049707c8c64 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -101,14 +101,14 @@ //Allow you to drag-drop disposal pipes and transit tubes into it -/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/usr) - if(usr.incapacitated()) +/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/user) + if(user.incapacitated()) return if (!istype(pipe, /obj/structure/disposalconstruct) && !istype(pipe, /obj/structure/c_transit_tube) && !istype(pipe, /obj/structure/c_transit_tube_pod)) return - if (get_dist(usr, src) > 1 || get_dist(src,pipe) > 1 ) + if (get_dist(user, src) > 1 || get_dist(src,pipe) > 1 ) return if (pipe.anchored) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 8373f79aa8fb..c428ff8b2a50 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -153,7 +153,7 @@ var/copying = FALSE var/in_use = FALSE -/datum/action/cooldown/chameleon_copy/InterceptClickOn(mob/living/caller, params, atom/target) +/datum/action/cooldown/chameleon_copy/InterceptClickOn(mob/living/caller_but_not_a_byond_built_in_proc, params, atom/target) click_with_power(target) /datum/action/cooldown/chameleon_copy/Grant(mob/M) diff --git a/tools/travis/install_byond.sh b/tools/travis/install_byond.sh index 4a688755d3d9..c5c75e805c7b 100755 --- a/tools/travis/install_byond.sh +++ b/tools/travis/install_byond.sh @@ -11,7 +11,7 @@ else rm -rf "$HOME/BYOND" mkdir -p "$HOME/BYOND" cd "$HOME/BYOND" - curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip + curl -H "User-Agent: Hogstation CI Script" "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip unzip byond.zip rm byond.zip cd byond