Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 6d8c4c5

Browse files
cowbot92cowbot92
committed
Merge remote-tracking branch 'upstream/master' into PortsPsionics
2 parents f218afc + 8b7dbd4 commit 6d8c4c5

File tree

533 files changed

+19468
-12164
lines changed

Some content is hidden

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

533 files changed

+19468
-12164
lines changed

‎SQL/database_changelog.md‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
11
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
22

3-
The latest database version is 5.13; The query to update the schema revision table is:
3+
The latest database version is 5.14; The query to update the schema revision table is:
44

5-
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 13);
5+
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 14);
66
or
7-
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 13);
7+
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 14);
88

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

11+
Version 5.14 2024-07-01, molti Adds mentor help tracking
12+
```sql
13+
DROP TABLE IF EXISTS `mentor_interactions`;
14+
CREATE TABLE IF NOT EXISTS `mentor_interactions` (
15+
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
16+
`round_id` int(10) unsigned NOT NULL DEFAULT 0,
17+
`when` datetime NOT NULL DEFAULT current_timestamp(),
18+
`ckey` varchar(32) NOT NULL,
19+
`target_ckey` varchar(32) DEFAULT NULL,
20+
`ckey_mentor` tinyint(3) unsigned NOT NULL DEFAULT 0,
21+
`target_mentor` tinyint(3) unsigned NOT NULL DEFAULT 0,
22+
`message` text,
23+
PRIMARY KEY (`id`),
24+
KEY `idx_round` (`round_id`)
25+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
26+
```
27+
1128
version 5.13 2023-05-10
1229
Adds allow_vpn to bound credentials flags
1330

‎SQL/tgstation_schema.sql‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,19 @@ CREATE TABLE IF NOT EXISTS `mentor` (
296296
PRIMARY KEY (`id`)
297297
) ENGINE=InnoDB AUTO_INCREMENT=130 DEFAULT CHARSET=utf8;
298298

299+
DROP TABLE IF EXISTS `mentor_interactions`;
300+
CREATE TABLE IF NOT EXISTS `mentor_interactions` (
301+
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
302+
`round_id` int(10) unsigned NOT NULL DEFAULT 0,
303+
`when` datetime NOT NULL DEFAULT current_timestamp(),
304+
`ckey` varchar(32) NOT NULL,
305+
`target_ckey` varchar(32) DEFAULT NULL,
306+
`ckey_mentor` tinyint(3) unsigned NOT NULL DEFAULT 0,
307+
`target_mentor` tinyint(3) unsigned NOT NULL DEFAULT 0,
308+
`message` text,
309+
PRIMARY KEY (`id`),
310+
KEY `idx_round` (`round_id`)
311+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
299312

300313
DROP TABLE IF EXISTS `mentor_memo`;
301314
CREATE TABLE IF NOT EXISTS `mentor_memo` (

‎_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@
102102
/area/ruin/powered/inn)
103103
"bi" = (
104104
/obj/machinery/door/airlock/grunge{
105-
name = "Backroom";
106-
req_access_txt = "25"
105+
name = "Backroom"
107106
},
108107
/obj/machinery/door/firedoor/border_only,
109108
/obj/machinery/door/firedoor/border_only{
110109
dir = 1
111110
},
112111
/obj/structure/disposalpipe/segment,
112+
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
113113
/turf/open/floor/plasteel,
114114
/area/ruin/powered/inn)
115115
"bx" = (
@@ -223,7 +223,8 @@
223223
id = "inndoor";
224224
name = "Inn Front door Shutter";
225225
pixel_x = 6;
226-
pixel_y = -24
226+
pixel_y = -24;
227+
req_access = list("bar")
227228
},
228229
/turf/open/floor/wood/broken/two,
229230
/area/ruin/powered/inn)
@@ -292,16 +293,15 @@
292293
/turf/open/floor/wood,
293294
/area/ruin/powered/inn)
294295
"ka" = (
295-
/obj/machinery/door/airlock/external{
296-
req_access_txt = "25"
297-
},
296+
/obj/machinery/door/airlock/external,
298297
/obj/machinery/door/firedoor/border_only{
299298
dir = 4
300299
},
301300
/obj/machinery/door/firedoor/border_only{
302301
dir = 8
303302
},
304303
/obj/structure/fans/tiny,
304+
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
305305
/turf/open/floor/plasteel,
306306
/area/ruin/powered/inn)
307307
"kf" = (
@@ -374,13 +374,12 @@
374374
/turf/open/floor/wood/broken/five,
375375
/area/ruin/powered/inn)
376376
"mW" = (
377-
/obj/machinery/door/window/southright{
378-
req_access_txt = "25"
379-
},
377+
/obj/machinery/door/window/southright,
380378
/obj/machinery/light/small{
381379
dir = 4
382380
},
383381
/obj/machinery/door/firedoor/border_only,
382+
/obj/effect/mapping_helpers/windoor/access/all/service/bar,
384383
/turf/open/floor/wood,
385384
/area/ruin/powered/inn)
386385
"nd" = (
@@ -476,15 +475,14 @@
476475
/turf/open/floor/wood,
477476
/area/ruin/powered/inn)
478477
"qm" = (
479-
/obj/machinery/door/airlock/wood/glass{
480-
req_access_txt = "25"
481-
},
478+
/obj/machinery/door/airlock/wood/glass,
482479
/obj/machinery/door/firedoor/border_only{
483480
dir = 8
484481
},
485482
/obj/machinery/door/firedoor/border_only{
486483
dir = 4
487484
},
485+
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
488486
/turf/open/floor/plasteel/cafeteria,
489487
/area/ruin/powered/inn)
490488
"qq" = (
@@ -499,7 +497,7 @@
499497
/area/ruin/powered/inn)
500498
"qT" = (
501499
/obj/structure/closet/secure_closet/personal/cabinet{
502-
req_access = list(25)
500+
req_access = list("bar")
503501
},
504502
/obj/item/clothing/suit/hooded/wintercoat,
505503
/obj/item/tank/internals/emergency_oxygen,
@@ -782,7 +780,7 @@
782780
/obj/item/bedsheet/adjusted/brown,
783781
/obj/structure/bed,
784782
/obj/effect/mob_spawn/human/innkeeper{
785-
dir = 8
783+
dir = 4
786784
},
787785
/turf/open/floor/carpet/red,
788786
/area/ruin/powered/inn)
@@ -861,7 +859,9 @@
861859
/turf/open/floor/plasteel/white,
862860
/area/ruin/powered/inn)
863861
"Lb" = (
864-
/obj/structure/closet/secure_closet/freezer/meat,
862+
/obj/structure/closet/secure_closet/freezer/meat{
863+
req_access = list("bar")
864+
},
865865
/turf/open/floor/plasteel/cafeteria,
866866
/area/ruin/powered/inn)
867867
"Ld" = (
@@ -879,19 +879,21 @@
879879
/area/ruin/powered/inn/shed)
880880
"LE" = (
881881
/obj/machinery/door/airlock/wood{
882-
name = "Personal Quarters";
883-
req_access_txt = "25"
882+
name = "Personal Quarters"
884883
},
885884
/obj/machinery/door/firedoor/border_only{
886885
dir = 4
887886
},
888887
/obj/machinery/door/firedoor/border_only{
889888
dir = 8
890889
},
890+
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
891891
/turf/open/floor/carpet/red,
892892
/area/ruin/powered/inn)
893893
"LU" = (
894-
/obj/structure/closet/secure_closet/freezer/kitchen,
894+
/obj/structure/closet/secure_closet/freezer/kitchen{
895+
req_access = list("bar")
896+
},
895897
/obj/machinery/light{
896898
dir = 8
897899
},
@@ -1090,9 +1092,7 @@
10901092
/turf/open/floor/plating,
10911093
/area/icemoon/underground/explored)
10921094
"Xs" = (
1093-
/obj/machinery/door/airlock/wood{
1094-
req_access_txt = "25"
1095-
},
1095+
/obj/machinery/door/airlock/wood,
10961096
/obj/machinery/door/firedoor/border_only{
10971097
dir = 4
10981098
},
@@ -1102,6 +1102,7 @@
11021102
/obj/structure/disposalpipe/segment{
11031103
dir = 8
11041104
},
1105+
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
11051106
/turf/open/floor/wood,
11061107
/area/ruin/powered/inn)
11071108
"XK" = (
@@ -1129,7 +1130,9 @@
11291130
/turf/open/floor/wood,
11301131
/area/ruin/powered/inn)
11311132
"YJ" = (
1132-
/obj/structure/closet/secure_closet/freezer/fridge,
1133+
/obj/structure/closet/secure_closet/freezer/fridge{
1134+
req_access = list("bar")
1135+
},
11331136
/turf/open/floor/plasteel/cafeteria,
11341137
/area/ruin/powered/inn)
11351138
"YV" = (

0 commit comments

Comments
 (0)