Commit Graph
4501 Commits
Author SHA1 Message Date
san7890andBongaTheProto ee62d2102d Bumps rust-g to 3.0.0 (#76663)
You can read more about what's introduced in the last four versions
here:

https://github.com/tgstation/rust-g/releases

The immediate effects for us are as follows:
Closes #76549
Closes #76514
Closes #76502
Closes #76490
Closes #76398
Closes #76798
Closes #76921
Closes #76934
Closes #76950

the updates to install rust_g.sh were to cut down on the copypasta code
and prevent desyncs.

🆑
code: The currently operating rust-g version on a live server is posted
to places like the runtime.log, in the same place where the revision
information and any applicable test merges already were.
/🆑
2023-09-03 19:03:51 -05:00
BongaTheProtoandGitHub 99ca458750 Merge branch 'Sandstorm-Station:master' into master 2023-08-26 23:28:09 -05:00
SandPoot 3b5e2e5091 stop being annoying 2023-08-26 20:47:16 -03:00
BongaTheProto b6dc33fb2e modular map loader
yep
2023-08-18 20:04:20 -05:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Tsurupeta d4f3793f8f QDEL_IN improvements 2023-08-08 14:01:16 +03:00
BongaTheProtoandTsurupeta dfdbd259da unit test
this is the easy part, believe it or not
2023-08-08 14:01:13 +03:00
BongaTheProto 5382130370 Squashed commit of the following:
commit 0081f9fa79
Author: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com>
Date:   Mon Jul 31 18:40:02 2023 +0000

    Automatic changelog compile [ci skip]

commit 94be79788c
Merge: 13da11c4bc ee540149d8
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:38:17 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit ee540149d8
Merge: c317c8b8fc 410d80987e
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Mon Jul 31 11:37:20 2023 -0700

    Merge pull request #15994 from SandPoot/quick-fix-1

    Fixes changeling's stings

commit 13da11c4bc
Merge: 8b56f314e6 c317c8b8fc
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:36:19 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit 410d80987e
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:04:52 2023 -0300

    nope, who OWNS it

commit 860f75d464
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:02:51 2023 -0300

    go

commit c317c8b8fc
Merge: 19dee4e0f6 bfe07112ff
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Sun Jul 30 10:49:51 2023 -0700

    Merge pull request #15993 from SandPoot/station-name

    New Station Trait: Randomizing Station Name

commit bfe07112ff
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Fri Jul 28 13:53:09 2023 -0300

    i hate keyed_list, i'm not keeping it in

commit 6896a2e481
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Thu Jul 27 21:09:41 2023 -0300

    what was it again?
2023-08-01 00:22:39 -05:00
SandPoot 13da11c4bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-31 15:36:19 -03:00
siliconsandGitHub c317c8b8fc Merge pull request #15993 from SandPoot/station-name
New Station Trait: Randomizing Station Name
2023-07-30 10:49:51 -07:00
BongaTheProto ea324c5bc1 Merge remote-tracking branch 'upstream/master' 2023-07-28 20:43:43 -05:00
SandPoot 789534ac63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-28 18:36:03 -03:00
SandPoot bfe07112ff i hate keyed_list, i'm not keeping it in 2023-07-28 13:53:09 -03:00
SandPoot 6896a2e481 what was it again? 2023-07-27 21:09:41 -03:00
SandPootandGitHub 9421423ed5 Merge branch 'master' into changeling-update 2023-07-26 22:22:14 -03:00
SandPoot 11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
BongaTheProto 21d13aae28 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:48:49 -05:00
BongaTheProto e87e828638 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:47:02 -05:00
SandPoot 07f5e85c2c override 2023-07-25 13:37:43 -03:00
SandPoot 7e51ef0b98 fix merge 2023-07-23 19:06:55 -03:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
BongaTheProto 650642d379 Merge remote-tracking branch 'upstream/master' 2023-07-20 00:23:25 -05:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
SandPoot 1ec6b97ea3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-19 18:01:35 -03:00
LinandGitHub 3c3f609541 Merge pull request #15989 from SandPoot/screentip-update
Update screentips
2023-07-19 15:53:38 -05:00
SandPoot e062316915 sync-ish 2023-07-19 13:48:07 -03:00
BongaTheProto f4e7294296 Merge remote-tracking branch 'upstream/master' 2023-07-13 19:57:48 -05:00
SandPoot 737c2f200d content 2023-07-12 13:04:01 -03:00
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
Jerry WesterandKrissKr0ss 93efbde5a9 point of locking your modsuit i mean really why 2023-05-01 00:21:39 -05:00
Jerry WesterandKrissKr0ss 7deb853f48 mod wires can be learned, same exp as robot 2023-05-01 00:20:48 -05:00
Jerry WesterandKrissKr0ss d170da0bba GPS now working :) 2023-05-01 00:20:36 -05:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
BongaTheProto 57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot 46df70dd73 not a quick fix. 2023-03-05 18:32:12 -03:00
SandPoot d63c2ebdd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-05 12:35:35 -03:00
siliconsandGitHub 6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
2023-03-04 23:36:36 -08:00
BongaTheProto acf6b87535 Merge remote-tracking branch 'upstream/master' 2023-02-24 01:39:26 -05:00
SandPoot f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -03:00
SandPoot d287fc25ca poosh 2023-02-21 01:55:49 -03:00
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot 28f0e55962 sure 2023-02-15 23:38:42 -03:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
BongaTheProto d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
BongaTheProtoandGitHub bb3bdf047f Merge pull request #738 from WoolyAypa/dullahan
dull han fixxe
2023-02-12 01:09:24 -05:00
SandPoot c1e8039c11 source 2023-02-09 03:00:56 -03:00
SandPoot 78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -03:00
SandPoot d29ce2328c some extra touches 2023-02-09 02:25:34 -03:00
SandPoot 4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00