Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tg parity nov 1 #218

Merged
merged 83 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
e6253c7
Adds a score for all species of fish that you've caught. (#86049)
Ghommie Nov 4, 2024
6c8d9a8
Automatic changelog for PR #86049 [ci skip]
tgstation-ci[bot] Nov 4, 2024
43428a1
Automatic changelog compile [ci skip]
tgstation-ci[bot] Nov 5, 2024
8e8591c
Removes S (#87687)
Contrabang Nov 5, 2024
1920e51
Automatic changelog for PR #87687 [ci skip]
tgstation-ci[bot] Nov 5, 2024
7933806
Ah yes, the taste of datum/reagent/copper (#87699)
optimumtact Nov 5, 2024
8a409eb
Alien operating tables now have a 20% surgery speed bonus (#87665)
Absolucy Nov 5, 2024
e34058b
Automatic changelog for PR #87665 [ci skip]
tgstation-ci[bot] Nov 5, 2024
0033dce
Moves MSO's owned files out to be shared between him/Scriptis and him…
LemonInTheDark Nov 5, 2024
c4f1d7b
Fix broken spin dismount (#87642)
thegrb93 Nov 5, 2024
1c2daf4
Automatic changelog for PR #87642 [ci skip]
tgstation-ci[bot] Nov 5, 2024
4617daf
Changes remark logging to reflect whether an applied remark is secret…
Shadow-Quill Nov 5, 2024
126bcf8
Automatic changelog for PR #87522 [ci skip]
tgstation-ci[bot] Nov 5, 2024
4e54abc
Fixes MODsuit deactivation not disabling modules (#87649)
SmArtKar Nov 5, 2024
62000f8
Automatic changelog for PR #87649 [ci skip]
tgstation-ci[bot] Nov 5, 2024
8522aea
[tgui] Bumps node & yarn versions (#87700)
jlsnow301 Nov 5, 2024
58b1555
Automatic changelog compile [ci skip]
tgstation-ci[bot] Nov 6, 2024
76f007a
the mod skin applier actually works now + honkeratives waddle (#87704)
mc-oofert Nov 6, 2024
d66779b
Automatic changelog for PR #87704 [ci skip]
tgstation-ci[bot] Nov 6, 2024
bce377b
restores corrupt audio files [no gbp] (#87711)
Sadboysuss Nov 6, 2024
1de2acc
Automatic changelog for PR #87711 [ci skip]
tgstation-ci[bot] Nov 6, 2024
e34c687
[NO GBP] Post-Material rods fixes and tweaks (#87696)
Ghommie Nov 6, 2024
892a460
Automatic changelog for PR #87696 [ci skip]
tgstation-ci[bot] Nov 6, 2024
56d037b
Adds new station map Nebulastation (#84826)
KikoWen0 Nov 6, 2024
02c2e0e
Automatic changelog for PR #84826 [ci skip]
tgstation-ci[bot] Nov 6, 2024
a0b0ea2
Realignes changelog header (#87695)
LemonInTheDark Nov 6, 2024
7f3f522
Add's support for population limits on keep_me_secure component (Lone…
optimumtact Nov 6, 2024
f25c189
Automatic changelog for PR #87657 [ci skip]
tgstation-ci[bot] Nov 6, 2024
3490f8a
Automatic changelog compile [ci skip]
tgstation-ci[bot] Nov 7, 2024
da54aba
Fixed sect nullrod bonus component (#87692)
carlarctg Nov 7, 2024
1c21aa8
Automatic changelog for PR #87692 [ci skip]
tgstation-ci[bot] Nov 7, 2024
7315fdf
Moves destructive analyser attack chain to base item interact level (…
SyncIt21 Nov 7, 2024
d1d1337
Automatic changelog for PR #87690 [ci skip]
tgstation-ci[bot] Nov 7, 2024
7a0c707
You can succumb quietly by right-clicking the UI (#87683)
tontyGH Nov 7, 2024
890bd83
Automatic changelog for PR #87683 [ci skip]
tgstation-ci[bot] Nov 7, 2024
ebda3cf
You can repair clothing that has storage with cloth again (#87691)
SyncIt21 Nov 7, 2024
d9d2a59
Automatic changelog for PR #87691 [ci skip]
tgstation-ci[bot] Nov 7, 2024
c093237
Renames characters in dark matter singulo description (#87673)
DaCoolBoss Nov 7, 2024
2487456
Automatic changelog for PR #87673 [ci skip]
tgstation-ci[bot] Nov 7, 2024
7afed12
Fixes RHD storage interaction (#87679)
SyncIt21 Nov 7, 2024
9d97bde
Automatic changelog for PR #87679 [ci skip]
tgstation-ci[bot] Nov 7, 2024
9dbdbf7
Prevent vape from being emptied if the cap isn't open (#87652)
zoomachina Nov 7, 2024
8066edb
Automatic changelog for PR #87652 [ci skip]
tgstation-ci[bot] Nov 7, 2024
d85fc25
RD modsuit advanced reagent scanner fix (#87710)
Archimus12 Nov 7, 2024
0bfead0
Automatic changelog for PR #87710 [ci skip]
tgstation-ci[bot] Nov 7, 2024
ab3cac7
Herculean/Atlas implants get a few additional BOULDER/Equipment relat…
necromanceranne Nov 7, 2024
2e3fff6
[no gbp] fixes supposedly really bad sorter exploit (#87728)
mc-oofert Nov 7, 2024
0848ae5
Automatic changelog for PR #87728 [ci skip]
tgstation-ci[bot] Nov 7, 2024
feb89c3
Fixes level 1 singularity eating containment field and being able to …
RengaN02 Nov 7, 2024
9618c51
Automatic changelog for PR #87717 [ci skip]
tgstation-ci[bot] Nov 7, 2024
2391a63
Chef groceries more clearly say who they are for. (#87732)
optimumtact Nov 7, 2024
d4a7d2a
Automatic changelog for PR #87732 [ci skip]
tgstation-ci[bot] Nov 7, 2024
0107198
Fixes for borg attack chain interactions (#87705)
SyncIt21 Nov 7, 2024
d74815d
Automatic changelog for PR #87705 [ci skip]
tgstation-ci[bot] Nov 7, 2024
504fa76
Automatic changelog compile [ci skip]
tgstation-ci[bot] Nov 8, 2024
b34043d
[NO GBP] You can perform fish scanning experiments again (plus other …
Ghommie Nov 8, 2024
3fa1ba4
Automatic changelog for PR #87721 [ci skip]
tgstation-ci[bot] Nov 8, 2024
322e426
Increase gas mask filter effectiveness. (#87712)
NoselessCanine Nov 8, 2024
10224c4
Automatic changelog for PR #87712 [ci skip]
tgstation-ci[bot] Nov 8, 2024
a8e15af
Remove `cyborg_tool` & improves omnitool tests (#87709)
SyncIt21 Nov 8, 2024
a4c988a
Scared of the Spooky Circus Man? Wear a tinfoil hat! Mental resistanc…
necromanceranne Nov 8, 2024
52554cd
Automatic changelog for PR #87702 [ci skip]
tgstation-ci[bot] Nov 8, 2024
e581491
[tools] Fixes tgui build warning (#87724)
jlsnow301 Nov 8, 2024
b75a3a2
putting [tm only] in your title will now apply the label automaticall…
Sadboysuss Nov 8, 2024
ef9cdee
Removes glass from status & newscaster frame's custom materials (#87689)
SyncIt21 Nov 8, 2024
8075711
Automatic changelog for PR #87689 [ci skip]
tgstation-ci[bot] Nov 8, 2024
1365e60
Fix NTNRC duplicate message jank and new message header, makes progra…
00-Steven Nov 8, 2024
dd91ace
Automatic changelog for PR #87610 [ci skip]
tgstation-ci[bot] Nov 8, 2024
cfdc8b3
Goliath Tendril Hammer is now resistant to acid and fire (#87697)
Rhials Nov 8, 2024
6b8e4c4
Automatic changelog for PR #87697 [ci skip]
tgstation-ci[bot] Nov 8, 2024
94ff0ad
Moves material container attack to item interaction level (#87676)
SyncIt21 Nov 8, 2024
20ccb20
Automatic changelog for PR #87676 [ci skip]
tgstation-ci[bot] Nov 8, 2024
4371451
Makes #87029 Opt-Out (#87714)
unit0016 Nov 8, 2024
b1ea3ab
Automatic changelog for PR #87714 [ci skip]
tgstation-ci[bot] Nov 8, 2024
d131084
[tgui] Dependency updates (#87723)
jlsnow301 Nov 8, 2024
438b16b
fixes borgs linking to ais in mechs cards and modsuits (#87737)
Fikou Nov 8, 2024
7c9da8c
Automatic changelog for PR #87737 [ci skip]
tgstation-ci[bot] Nov 8, 2024
4664b63
Living Flesh limbs won't try to grab underfloor objects (#87736)
Jacquerel Nov 8, 2024
f2efb68
Automatic changelog for PR #87736 [ci skip]
tgstation-ci[bot] Nov 8, 2024
35e53f5
Fix oil slime making vegetable oil instead of corn oil (#87730)
thegrb93 Nov 8, 2024
5157211
Automatic changelog for PR #87730 [ci skip]
tgstation-ci[bot] Nov 8, 2024
e76ab8d
Moved the big slapping parts from the misc section to weapons (#87637)
Ghommie Nov 8, 2024
845949b
Merge remote-tracking branch 'TG-Main/master' into TG-parity-nov-1
carpotoxin Nov 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions SQL/database_changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,30 @@ Any time you make a change to the schema files, remember to increment the databa

Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`.

The latest database version is 5.27; The query to update the schema revision table is:
The latest database version is 5.28; The query to update the schema revision table is:

```sql
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 27);
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 28);
```
or

```sql
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 27);
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 28);
```

In any query remember to add a prefix to the table names if you use one.
-----------------------------------------------------
Version 5.28, 1 November 2024, by Ghommie
Added `fish_progress` as the first 'progress' subtype of 'datum/award/scores'

```sql
CREATE TABLE `fish_progress` (
`ckey` VARCHAR(32) NOT NULL,
`progress_entry` VARCHAR(32) NOT NULL,
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`ckey`,`progress_entry`)
) ENGINE=InnoDB;
```
-----------------------------------------------------
Version 5.27, 26 April 2024, by zephyrtfa
Add the ip intel whitelist table
```sql
Expand Down
10 changes: 10 additions & 0 deletions SQL/tgstation_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,16 @@ CREATE TABLE `achievement_metadata` (
PRIMARY KEY (`achievement_key`)
) ENGINE=InnoDB;

-- Table structure for table 'x_progress'

DROP TABLE IF EXISTS `fish_progress`;
CREATE TABLE `fish_progress` (
`ckey` VARCHAR(32) NOT NULL,
`progress_entry` VARCHAR(32) NOT NULL,
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`ckey`,`progress_entry`)
) ENGINE=InnoDB;

--
-- Table structure for table `ticket`
--
Expand Down
10 changes: 10 additions & 0 deletions SQL/tgstation_schema_prefixed.sql
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,16 @@ CREATE TABLE `SS13_achievement_metadata` (
PRIMARY KEY (`achievement_key`)
) ENGINE=InnoDB;

-- Table structure for table 'SS13_x_progress'

DROP TABLE IF EXISTS `SS13_fish_progress`;
CREATE TABLE `fish_progress` (
`ckey` VARCHAR(32) NOT NULL,
`progress_entry` VARCHAR(32) NOT NULL,
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`ckey`,`progress_entry`)
) ENGINE=InnoDB;

--
-- Table structure for table `SS13_ticket`
--
Expand Down
1 change: 1 addition & 0 deletions _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\NorthStar\north_star.dmm"
#include "map_files\tramstation\tramstation.dmm"
#include "map_files\NebulaStation\NebulaStation.dmm"
#include "map_files\wawastation\wawastation.dmm"

#ifdef CIBUILDING
Expand Down
Loading
Loading