Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into powerdrawrebalance
Browse files Browse the repository at this point in the history
  • Loading branch information
Thera-Pissed committed Jan 15, 2024
2 parents c63eae7 + 491baea commit 0c94007
Show file tree
Hide file tree
Showing 47 changed files with 94 additions and 6,968 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/autowiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: |
sudo dpkg --add-architecture i386
sudo apt update || true
sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
bash tools/ci/install_rust_g.sh
- name: Install auxmos
if: steps.secrets_set.outputs.SECRETS_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/corporate_mining.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@
/area/ruin/space)
"ov" = (
/obj/structure/table/wood/poker,
/obj/effect/holodeck_effect/cards,
/obj/item/toy/cards/deck,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
},
Expand Down
177 changes: 0 additions & 177 deletions _maps/templates/holodeck_animeschool.dmm

This file was deleted.

130 changes: 0 additions & 130 deletions _maps/templates/holodeck_anthophillia.dmm

This file was deleted.

Loading

0 comments on commit 0c94007

Please sign in to comment.