Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/turdis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
lint:
name: Lints
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/pipe/pipe_dispenser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/chameleon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tools/travis/install_byond.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading