Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

Commit

Permalink
Merge pull request #7 from SagaStars/hispania_update
Browse files Browse the repository at this point in the history
Hispania Update 17/7/23
  • Loading branch information
SagaStars authored Jul 17, 2023
2 parents d45a1bd + 2f0a9af commit 64ec9b3
Show file tree
Hide file tree
Showing 255 changed files with 13,887 additions and 5,898 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/autowiki.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Autowiki
on:
schedule:
- cron: "5 4 * * *"
workflow_dispatch:

permissions:
contents: read

jobs:
autowiki:
runs-on: ubuntu-20.04
steps:
- name: "Check for AUTOWIKI_USERNAME"
id: secrets_set
env:
ENABLER_SECRET: ${{ secrets.AUTOWIKI_USERNAME }}
run: |
unset SECRET_EXISTS
if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: Checkout
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/checkout@v3
- name: Restore BYOND cache
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/cache@v3
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
- name: Install rust-g
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
sudo dpkg --add-architecture i386
sudo apt update || true
sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
bash tools/ci/install_rust_g.sh
- name: Install auxmos
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
bash tools/ci/install_auxmos.sh
- name: Compile and generate Autowiki files
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci autowiki
- name: Run Autowiki
if: steps.secrets_set.outputs.SECRETS_ENABLED
env:
USERNAME: ${{ secrets.AUTOWIKI_USERNAME }}
PASSWORD: ${{ secrets.AUTOWIKI_PASSWORD }}
run: |
cd tools/autowiki
npm install
cd ../..
node tools/autowiki/autowiki.js data/autowiki_edits.txt data/autowiki_files/
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,8 @@ Temporary Items
# JavaScript tools
**/node_modules

# Screenshot tests
/artifacts

# tool-generated files
check_regex_output.txt

# Autowiki
/tools/autowiki/node_modules
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,3 @@ The TGS DMAPI API is licensed as a subproject under the MIT license.
See the footer of [code/\_\_DEFINES/tgs.dm](./code/__DEFINES/tgs.dm) and [code/modules/tgs/LICENSE](./code/modules/tgs/LICENSE) for the MIT license.

All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.

All assets located in the `goon` and `whitesands/goon` directory are under a [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/). Assets created by Goonstation.
123 changes: 52 additions & 71 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@
},
/turf/open/water/beach,
/area/ruin/beach/oceantown)
"aK" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/bananalamp,
/turf/open/floor/carpet,
/area/ruin/beach/oceantown)
"aM" = (
/obj/machinery/door/airlock{
name = "Employees Only"
Expand Down Expand Up @@ -527,6 +532,11 @@
/obj/structure/flora/ausbushes/leafybush,
/turf/open/floor/plating/grass/beach/lit,
/area/ruin/beach/oceantown)
"gp" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/west,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown)
"gu" = (
/obj/effect/turf_decal/sand/plating{
light_range = 2
Expand Down Expand Up @@ -1264,10 +1274,6 @@
},
/turf/open/floor/plating/asteroid/sand/lit,
/area/ruin/beach/oceantown)
"qJ" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating/grass/beach/lit,
/area/ruin/beach/oceantown)
"qW" = (
/obj/structure/chair/wood{
dir = 4
Expand Down Expand Up @@ -1775,6 +1781,12 @@
},
/turf/open/floor/plating/grass/beach/lit,
/area/ruin/beach/oceantown)
"xu" = (
/obj/structure/table/wood,
/obj/item/book/manual/ripley_build_and_repair,
/obj/machinery/light/small/directional/north,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"xx" = (
/obj/structure/flora/tree/palm{
icon_state = "palm2"
Expand Down Expand Up @@ -1886,11 +1898,6 @@
light_range = 2
},
/area/ruin/beach/oceantown)
"yC" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/north,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown)
"yD" = (
/obj/effect/turf_decal/corner/opaque/white/diagonal{
dir = 8
Expand Down Expand Up @@ -2148,11 +2155,6 @@
/obj/structure/flora/ausbushes/ywflowers,
/turf/open/floor/plating/grass/beach/lit,
/area/ruin/beach/oceantown)
"BQ" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating/grass/beach/lit,
/area/ruin/beach/oceantown)
"BV" = (
/obj/structure/filingcabinet,
/turf/open/floor/plasteel/grimy,
Expand Down Expand Up @@ -2498,12 +2500,6 @@
light_range = 2
},
/area/ruin/beach/oceantown)
"EX" = (
/obj/structure/table/wood,
/obj/item/book/manual/ripley_build_and_repair,
/obj/machinery/light/small/directional/north,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"FA" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
Expand Down Expand Up @@ -2641,12 +2637,6 @@
light_range = 2
},
/area/ruin/beach/oceantown)
"Gz" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/medical_cloning,
/obj/machinery/light/small/directional/west,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"GA" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
Expand Down Expand Up @@ -2731,6 +2721,11 @@
light_range = 2
},
/area/ruin/beach/oceantown)
"Hk" = (
/obj/effect/turf_decal/weather/sand,
/obj/effect/turf_decal/weather/sand,
/turf/open/water/beach,
/area/ruin/beach/oceantown)
"Hp" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{
Expand Down Expand Up @@ -3035,11 +3030,6 @@
light_range = 2
},
/area/ruin/beach/oceantown)
"Kr" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/bananalamp,
/turf/open/floor/carpet,
/area/ruin/beach/oceantown)
"Kx" = (
/obj/effect/turf_decal/road/stripes,
/obj/effect/turf_decal/road/stripes{
Expand Down Expand Up @@ -3313,6 +3303,12 @@
light_range = 2
},
/area/ruin/beach/oceantown)
"Ni" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/medical_cloning,
/obj/machinery/light/small/directional/west,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
"Np" = (
/turf/open/floor/plasteel,
/area/ruin/beach/oceantown)
Expand Down Expand Up @@ -3756,11 +3752,6 @@
/obj/effect/spawner/lootdrop/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"SV" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/west,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown)
"SY" = (
/obj/structure/chair/comfy/brown{
dir = 1
Expand Down Expand Up @@ -3918,26 +3909,11 @@
"UX" = (
/turf/closed/wall/mineral/wood/nonmetal,
/area/ruin/beach/oceantown/shop)
"Vb" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/machinery/light/small/directional/west,
/turf/open/floor/wood{
light_range = 2
},
/area/ruin/beach/oceantown)
"Vf" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/effect/turf_decal/box,
/turf/open/floor/plasteel/white,
/area/ruin/beach/oceantown/bar)
"Vn" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/concrete/pavement{
light_range = 2
},
/area/ruin/beach/oceantown)
"Vr" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
Expand Down Expand Up @@ -4249,6 +4225,11 @@
/obj/structure/closet/crate/bin,
/turf/open/floor/plating/asteroid/sand/lit,
/area/ruin/beach/oceantown)
"Zc" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/north,
/turf/open/floor/carpet/green,
/area/ruin/beach/oceantown)
"Zf" = (
/obj/machinery/door/airlock{
name = "Bathroom"
Expand Down Expand Up @@ -6048,7 +6029,7 @@ Ru
Ru
Ru
Ru
Vn
Ru
Ru
Ru
Ru
Expand Down Expand Up @@ -6117,11 +6098,11 @@ xo
xo
xo
xo
Vb
Vb
Vb
xo
Vb
xo
xo
xo
xo
xo
xo
xo
Expand Down Expand Up @@ -6190,10 +6171,10 @@ uC
FF
Wl
Wl
qJ
qJ
qJ
qJ
Wl
Wl
Wl
Wl
Wl
Wl
Wl
Expand Down Expand Up @@ -6266,8 +6247,8 @@ pB
Wl
Wl
FF
BQ
BQ
FF
FF
Wl
rl
qw
Expand Down Expand Up @@ -6510,14 +6491,14 @@ rl
FF
FF
xh
SV
gp
xF
im
dT
IU
VZ
sj
Gz
Ni
lc
Al
sp
Expand Down Expand Up @@ -6896,7 +6877,7 @@ PC
qw
xh
KO
Kr
aK
sy
xh
ao
Expand Down Expand Up @@ -8471,7 +8452,7 @@ YU
YU
"}
(55,1,1) = {"
qp
Hk
sa
sa
sa
Expand Down Expand Up @@ -8548,7 +8529,7 @@ YU
YU
"}
(56,1,1) = {"
ev
qp
sa
sa
sa
Expand Down Expand Up @@ -8625,7 +8606,7 @@ YU
YU
"}
(57,1,1) = {"
ev
qp
sa
sa
sa
Expand Down Expand Up @@ -8702,7 +8683,7 @@ YU
YU
"}
(58,1,1) = {"
ev
qp
sa
sa
sa
Expand Down Expand Up @@ -9228,7 +9209,7 @@ Ru
fG
Wl
xh
EX
xu
dT
zl
bu
Expand Down Expand Up @@ -9767,7 +9748,7 @@ Ru
fG
gn
xh
yC
Zc
im
Pm
dT
Expand Down
Loading

0 comments on commit 64ec9b3

Please sign in to comment.