Skip to content

Commit 662f004

Browse files
PollardTheDragonPollardTheDragon
authored
Merge branch 'master' into smith-material-colors
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2 parents 393ab3c + adc65c5 commit 662f004

358 files changed

Lines changed: 10905 additions & 5546 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@
2121

2222
<!-- How did you test the PR, if at all? -->
2323

24-
<hr>
25-
26-
### Declaration
24+
## Declaration
2725

2826
- [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/docs/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.
2927
<!-- Replace the box with [x] to mark as complete. -->
3028
<!-- Ensure there are no spaces between the x and the square brackets [] else this will not work properly. -->
31-
<hr>
3229

3330
## Changelog
3431

‎.github/actions/restore_or_install_byond/action.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This action attempts to restore BYOND from a cache, or to install it otherwise.
2+
name: Restore or Install BYOND
3+
description: Attempts to restore a specified BYOND version from cache; if it can't, it installs it.
4+
5+
inputs:
6+
release:
7+
description: "The release channel of BYOND to install. Either STABLE or BETA."
8+
required: false
9+
type: string
10+
default: "STABLE"
11+
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Configure BYOND version from _build_dependencies.sh
16+
shell: bash
17+
run: |
18+
source _build_dependencies.sh
19+
echo "BYOND_MAJOR=$${{ inputs.release }}_BYOND_MAJOR" >> $GITHUB_ENV
20+
echo "BYOND_MINOR=$${{ inputs.release }}_BYOND_MINOR" >> $GITHUB_ENV
21+
22+
# The use of `actions/cache/restore` and `actions/cache/save` here is deliberate, as we want to
23+
# save the BYOND install to a cache as early as possible. If we used just `actions/cache`, it
24+
# would only attempt to save the cache at the end of a job. This ensures that if a workflow run
25+
# is cancelled, we already have a cache to restore from.
26+
- name: Restore BYOND cache
27+
id: restore_byond_cache
28+
uses: actions/cache/restore@v4
29+
with:
30+
path: ~/BYOND
31+
key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
32+
- name: Install BYOND
33+
if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
34+
shell: bash
35+
run: bash tools/ci/install_byond.sh
36+
- name: Save BYOND cache
37+
if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
38+
uses: actions/cache/save@v4
39+
with:
40+
path: ~/BYOND
41+
key: ${{ steps.restore_byond_cache.outputs.cache-primary-key }}

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Cache
1919
uses: actions/cache@v4
2020
with:
21-
path: $HOME/SpacemanDMM
21+
path: ~/SpacemanDMM
2222
key: ${{ runner.os }}-spacemandmm
2323

2424
- name: Install Tools
@@ -79,13 +79,16 @@ jobs:
7979
compile_all_maps:
8080
name: Compile All Maps
8181
runs-on: ubuntu-22.04
82+
strategy:
83+
fail-fast: false
84+
matrix:
85+
byondtype: ['STABLE', 'BETA']
8286
steps:
8387
- uses: actions/checkout@v4
84-
- name: Setup Cache
85-
uses: actions/cache@v4
88+
- name: Restore BYOND from Cache
89+
uses: ./.github/actions/restore_or_install_byond
8690
with:
87-
path: $HOME/BYOND
88-
key: ${{ runner.os }}-byond
91+
release: ${{ matrix.byondtype }}
8992
# We test PARADISE_PRODUCTION_HARDWARE here because we dont in station_mapload_tests
9093
- name: Compile All Maps
9194
run: |
@@ -104,11 +107,10 @@ jobs:
104107
byondtype: ['STABLE', 'BETA']
105108
steps:
106109
- uses: actions/checkout@v4
107-
- name: Setup Cache
108-
uses: actions/cache@v4
110+
- name: Restore BYOND from Cache
111+
uses: ./.github/actions/restore_or_install_byond
109112
with:
110-
path: $HOME/BYOND
111-
key: ${{ runner.os }}-byond
113+
release: ${{ matrix.byondtype }}
112114
- name: Install RUST_G Deps
113115
run: |
114116
sudo dpkg --add-architecture i386
@@ -132,11 +134,10 @@ jobs:
132134
byondtype: ['STABLE', 'BETA']
133135
steps:
134136
- uses: actions/checkout@v4
135-
- name: Setup Cache
136-
uses: actions/cache@v4
137+
- name: Restore BYOND from Cache
138+
uses: ./.github/actions/restore_or_install_byond
137139
with:
138-
path: $HOME/BYOND
139-
key: ${{ runner.os }}-byond
140+
release: ${{ matrix.byondtype }}
140141
- name: Setup & Validate DB
141142
run: |
142143
sudo systemctl start mysql

‎SQL/paradise_schema.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ CREATE TABLE `characters` (
8383
`runechat_color` VARCHAR(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '#FFFFFF',
8484
`cyborg_brain_type` ENUM('MMI', 'Robobrain', 'Positronic') NOT NULL DEFAULT 'MMI',
8585
`pda_ringtone` VARCHAR(16) NULL DEFAULT NULL COLLATE 'utf8mb3_general_ci',
86+
`quirks` LONGTEXT COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL,
8687
PRIMARY KEY (`id`),
8788
KEY `ckey` (`ckey`)
8889
) ENGINE=InnoDB AUTO_INCREMENT=125467 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

‎SQL/updates/66-67.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#Updates the DB from 66 to 67
2+
#Adds a column to the characters table that stores quirks in a JSON format
3+
ALTER TABLE `characters`
4+
ADD column `quirks` LONGTEXT COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL AFTER `pda_ringtone`;

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
/turf/simulated/floor/wood,
179179
/area/ruin/powered/snow_cabin)
180180
"aO" = (
181-
/obj/machinery/door/airlock/multi_tile/glass,
181+
/obj/machinery/door/airlock/multi_tile/glass/directional/east,
182182
/obj/structure/fans/tiny,
183183
/turf/simulated/floor/pod/dark,
184184
/area/ruin/powered/snow_biodome)
@@ -341,7 +341,7 @@
341341
/turf/simulated/floor/wood,
342342
/area/ruin/powered/snow_cabin)
343343
"vf" = (
344-
/obj/machinery/door/airlock/multi_tile/glass,
344+
/obj/machinery/door/airlock/multi_tile/glass/directional/east,
345345
/obj/structure/fans/tiny,
346346
/turf/simulated/floor/pod/dark,
347347
/area/ruin/powered/snow_cabin)
@@ -381,7 +381,7 @@
381381
/area/ruin/powered/snow_biodome)
382382
"Ez" = (
383383
/obj/structure/fans/tiny,
384-
/obj/machinery/door/airlock/multi_tile/glass,
384+
/obj/machinery/door/airlock/multi_tile/glass/directional/east,
385385
/turf/simulated/floor/pod/dark,
386386
/area/ruin/powered/snow_biodome)
387387
"FP" = (

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,7 @@
14961496
/turf/simulated/floor/plating/lavaland_air,
14971497
/area/ruin/unpowered/althland_excavation)
14981498
"WH" = (
1499-
/obj/machinery/door/poddoor/multi_tile/three_tile_hor,
1499+
/obj/machinery/door/poddoor/multi_tile/triple/directional/east,
15001500
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
15011501
/area/ruin/unpowered/althland_excavation)
15021502
"Xl" = (

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@
7777
"B" = (
7878
/turf/simulated/floor/lava/mapping_lava,
7979
/area/ruin/unpowered/misc_lavaruin)
80+
"Q" = (
81+
/turf/simulated/floor/lava/lava_land_surface/plasma,
82+
/area/ruin/unpowered/misc_lavaruin)
83+
"Z" = (
84+
/turf/simulated/floor/lava/lava_land_surface,
85+
/area/ruin/unpowered/misc_lavaruin)
8086

8187
(1,1,1) = {"
8288
a
@@ -86,7 +92,7 @@ a
8692
a
8793
a
8894
b
89-
B
95+
Q
9096
b
9197
a
9298
a
@@ -99,15 +105,15 @@ a
99105
a
100106
d
101107
e
102-
B
108+
Z
103109
s
104110
B
105111
b
106112
b
107113
b
108114
B
109115
s
110-
B
116+
Z
111117
s
112118
d
113119
a
@@ -131,7 +137,7 @@ a
131137
"}
132138
(4,1,1) = {"
133139
a
134-
B
140+
Q
135141
s
136142
B
137143
B
@@ -143,7 +149,7 @@ B
143149
B
144150
B
145151
e
146-
B
152+
Q
147153
a
148154
"}
149155
(5,1,1) = {"
@@ -198,7 +204,7 @@ b
198204
b
199205
"}
200206
(8,1,1) = {"
201-
B
207+
Z
202208
b
203209
g
204210
b
@@ -212,7 +218,7 @@ b
212218
b
213219
g
214220
b
215-
B
221+
Z
216222
"}
217223
(9,1,1) = {"
218224
b
@@ -267,7 +273,7 @@ a
267273
"}
268274
(12,1,1) = {"
269275
a
270-
B
276+
Q
271277
s
272278
B
273279
B
@@ -279,7 +285,7 @@ B
279285
B
280286
B
281287
e
282-
B
288+
Q
283289
a
284290
"}
285291
(13,1,1) = {"
@@ -303,15 +309,15 @@ a
303309
a
304310
d
305311
e
306-
B
312+
Z
307313
s
308314
B
309315
b
310316
b
311317
b
312318
B
313319
s
314-
B
320+
Z
315321
s
316322
d
317323
a
@@ -324,7 +330,7 @@ a
324330
a
325331
a
326332
b
327-
B
333+
Q
328334
b
329335
a
330336
a

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
/area/lavaland/surface/outdoors)
109109
"B" = (
110110
/obj/effect/mapping_helpers/no_lava,
111-
/obj/item/clockwork/weapon/ratvarian_spear,
111+
/obj/item/spear/ratvarian_spear,
112112
/turf/simulated/floor/clockwork/lavaland_air,
113113
/area/lavaland/surface/outdoors)
114114
"C" = (

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,9 +1714,8 @@
17141714
},
17151715
/area/mine/outpost/hallway/west)
17161716
"jQ" = (
1717-
/obj/machinery/door/airlock/multi_tile/glass{
1718-
name = "Main Airlock";
1719-
dir = 1
1717+
/obj/machinery/door/airlock/multi_tile/glass/directional/north{
1718+
name = "Main Airlock"
17201719
},
17211720
/obj/structure/fans/tiny,
17221721
/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
@@ -3964,7 +3963,7 @@
39643963
/area/mine/outpost/production)
39653964
"vP" = (
39663965
/obj/structure/fans/tiny,
3967-
/obj/machinery/door/airlock/multi_tile/glass{
3966+
/obj/machinery/door/airlock/multi_tile/glass/directional/east{
39683967
name = "Main Airlock"
39693968
},
39703969
/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,

0 commit comments

Comments
 (0)