Skip to content

Commit 3fb45cc

Browse files
SyncIt21SyncIt21
committed
Merge remote-tracking branch 'upstream/master'
2 parents 76c1daa + 6474fcd commit 3fb45cc

820 files changed

Lines changed: 41039 additions & 27488 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/workflows/generate_documentation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
touch dmdoc/.nojekyll
2828
echo codedocs.tgstation13.org > dmdoc/CNAME
2929
- name: Deploy
30-
uses: JamesIves/github-pages-deploy-action@v4.7.6
30+
uses: JamesIves/github-pages-deploy-action@v4.8.0
3131
with:
3232
branch: gh-pages
3333
clean: true

‎SQL/database_changelog.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,27 @@ INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 33);
1111
or
1212

1313
```sql
14-
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 33);
14+
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 34);
1515
```
1616

1717
In any query remember to add a prefix to the table names if you use one.
1818

1919
---
2020

21+
Version 5.34, 16 January 2026, by Ghommie
22+
Added `pda_themes_progress` as the second 'progress' subtype of 'datum/award/scores'
23+
24+
```sql
25+
CREATE TABLE `pda_themes_progress` (
26+
`ckey` VARCHAR(32) NOT NULL,
27+
`progress_entry` VARCHAR(32) NOT NULL,
28+
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
29+
PRIMARY KEY (`ckey`,`progress_entry`)
30+
) ENGINE=InnoDB;
31+
```
32+
33+
---
34+
2135
Version 5.33, 28 September 2025, by Atlanta-Ned
2236
Modifies manifest ckey column to be consistent with other ckey columns
2337

‎SQL/tgstation_schema.sql‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,14 @@ CREATE TABLE `fish_progress` (
624624
PRIMARY KEY (`ckey`,`progress_entry`)
625625
) ENGINE=InnoDB;
626626

627+
DROP TABLE IF EXISTS `pda_themes_progress`;
628+
CREATE TABLE `pda_themes_progress` (
629+
`ckey` VARCHAR(32) NOT NULL,
630+
`progress_entry` VARCHAR(32) NOT NULL,
631+
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
632+
PRIMARY KEY (`ckey`,`progress_entry`)
633+
) ENGINE=InnoDB;
634+
627635
--
628636
-- Table structure for table `ticket`
629637
--

‎SQL/tgstation_schema_prefixed.sql‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,15 @@ CREATE TABLE `SS13_achievement_metadata` (
616616
-- Table structure for table 'SS13_x_progress'
617617

618618
DROP TABLE IF EXISTS `SS13_fish_progress`;
619-
CREATE TABLE `fish_progress` (
619+
CREATE TABLE `SS13_fish_progress` (
620+
`ckey` VARCHAR(32) NOT NULL,
621+
`progress_entry` VARCHAR(32) NOT NULL,
622+
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
623+
PRIMARY KEY (`ckey`,`progress_entry`)
624+
) ENGINE=InnoDB;
625+
626+
DROP TABLE IF EXISTS `SS13_pda_themes_progress`;
627+
CREATE TABLE `SS13_pda_themes_progress` (
620628
`ckey` VARCHAR(32) NOT NULL,
621629
`progress_entry` VARCHAR(32) NOT NULL,
622630
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,

‎_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
/turf/open/floor/wood,
7373
/area/ruin/smoking_room/house)
7474
"m" = (
75-
/obj/structure/barricade/wooden,
75+
/obj/structure/barricade/wooden/crude,
7676
/obj/machinery/door/airlock/wood,
7777
/obj/structure/curtain/cloth/fancy{
7878
open = 0

‎_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
/obj/structure/stone_tile/surrounding/cracked{
113113
dir = 6
114114
},
115-
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
115+
/mob/living/basic/boss/blood_drunk_miner{
116116
dir = 1
117117
},
118118
/turf/open/lava/smooth/lava_land_surface,

‎_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
/turf/open/misc/asteroid/basalt/lava_land_surface,
9898
/area/lavaland/surface/outdoors)
9999
"s" = (
100-
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/guidance{
100+
/mob/living/basic/boss/blood_drunk_miner/guidance{
101101
dir = 8
102102
},
103103
/turf/open/misc/asteroid/basalt/lava_land_surface,

‎_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
/obj/structure/stone_tile/block{
105105
dir = 4
106106
},
107-
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter,
107+
/mob/living/basic/boss/blood_drunk_miner/hunter,
108108
/turf/open/misc/asteroid/basalt/lava_land_surface,
109109
/area/lavaland/surface/outdoors)
110110
"o" = (

‎_maps/RandomRuins/SpaceRuins/DJstation/kitchen_2.dmm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
name = "Kitchen"
4848
},
4949
/obj/effect/mapping_helpers/airlock/locked,
50-
/obj/structure/barricade/wooden,
50+
/obj/structure/barricade/wooden/crude,
5151
/turf/template_noop,
5252
/area/space/nearstation)
5353
"L" = (
@@ -58,7 +58,7 @@
5858
name = "Kitchen"
5959
},
6060
/obj/effect/mapping_helpers/airlock/locked,
61-
/obj/structure/barricade/wooden,
61+
/obj/structure/barricade/wooden/crude,
6262
/turf/template_noop,
6363
/area/space/nearstation)
6464
"S" = (

‎_maps/RandomRuins/SpaceRuins/DJstation/quarters_4.dmm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
name = "Rest Room"
2828
},
2929
/obj/effect/mapping_helpers/airlock/locked,
30-
/obj/structure/barricade/wooden,
30+
/obj/structure/barricade/wooden/crude,
3131
/turf/template_noop,
3232
/area/space/nearstation)
3333
"q" = (
@@ -70,7 +70,7 @@
7070
},
7171
/obj/modular_map_connector,
7272
/obj/effect/mapping_helpers/airlock/locked,
73-
/obj/structure/barricade/wooden,
73+
/obj/structure/barricade/wooden/crude,
7474
/turf/template_noop,
7575
/area/space/nearstation)
7676
"W" = (

0 commit comments

Comments
 (0)