 BongaTheProto
|
2d1d665e41
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
|
2023-12-16 10:48:35 -05:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
8cdb82a23f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-12 22:06:13 -03:00 |
|
|
SandPoot
|
e457f40328
|
maptext
|
2023-12-11 17:43:24 -03:00 |
|
|
ariaworld
|
7bc56f700b
|
Add: New lines for linters.
|
2023-11-18 18:29:50 +01:00 |
|
|
ariaworld
|
23f141965e
|
First draft.
|
2023-10-31 14:03:34 +01:00 |
|
|
BlueWildroseandGitHub
|
def4b38a46
|
Revert "[DNM] Updates firemanning, throwing stuff"
|
2023-10-11 13:52:03 -06:00 |
|
|
SandPoot
|
5a90dabd3c
|
stuff
|
2023-10-03 23:22:57 -03:00 |
|
|
BongaTheProto
|
085bb06e94
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-16 14:32:38 -05:00 |
|
|
SandPoot
|
0b04af4b76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 22:32:47 -03:00 |
|
|
SandPoot
|
3c7e79d384
|
do after update
|
2023-09-09 15:39:49 -03: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 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
e87e828638
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-25 22:47:02 -05:00 |
|
|
SandPoot
|
ef186347ca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-23 18:56:20 -03:00 |
|
|
SandPoot
|
19ee7f8bd2
|
some hints
|
2023-07-19 20:51:25 -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
|
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 |
|
|
WoolyAypa
|
8ebd985f4b
|
fixar
|
2023-02-07 22:21:21 -03:00 |
|
|
WoolyAypa
|
524525c5f5
|
dull han
|
2023-02-07 12:03:17 -03:00 |
|
|
BongaTheProto
|
ab9d691f1a
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-09 16:59:38 -05:00 |
|
|
SandPoot
|
d743096f8a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-09 17:50:19 -03:00 |
|
|
Jerry WesterandGitHub
|
ae347f3399
|
Revert "MODsuits"
|
2023-01-08 17:30:26 -07:00 |
|
|
SandPoot
|
82eff346c7
|
Merge Upstream
|
2023-01-07 22:52:22 -03:00 |
|
|
siliconsandGitHub
|
23327fa268
|
Merge pull request #15894 from JerryWester/modsuits
MODsuits
|
2023-01-07 14:07:28 -08:00 |
|
|
SandPoot
|
ad479f738e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-07 16:45:16 -03:00 |
|
|
SandPoot
|
42d4abc164
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-07 16:44:44 -03:00 |
|
|
SandPoot
|
183eaf8a68
|
come on, the signal positions!
|
2023-01-07 16:34:23 -03:00 |
|
|
SandPootandGitHub
|
c3d6816780
|
Merge pull request #15577 from Putnam3145/bring-beauty-back
Adds beauty back
|
2023-01-07 15:58:46 -03:00 |
|
|
BongaTheProto
|
8034d9fb22
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-31 14:31:12 -05:00 |
|
|
SandPoot
|
d337852c68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-28 16:56:04 -03:00 |
|
|
HatterhatandGitHub
|
f0a154106e
|
no more titanium req
|
2022-12-19 08:33:59 -06:00 |
|
|
BongaTheProto
|
a04476b38d
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-16 20:39:53 -05:00 |
|
|
SandPoot
|
011dd2e817
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-16 16:47:19 -03:00 |
|
|
LinandGitHub
|
7d0c3df2ad
|
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
|
2022-12-14 19:07:59 -07:00 |
|
|
Jerry Wester
|
19428e2579
|
revert bag dumping changes
|
2022-12-13 19:15:07 -07:00 |
|
|
Jerry Wester
|
f7ac3c7624
|
beeg commit
|
2022-12-11 20:32:35 -07:00 |
|
|
PeriodicChaosandJerry Wester
|
183b554ed3
|
modsuits part 1
|
2022-12-11 20:30:41 -07:00 |
|
|
Timothy Teakettle
|
b7673e234f
|
add no hunger no breath
|
2022-12-09 13:30:10 +00:00 |
|
|
BongaTheProto
|
79fa770ab3
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-13 11:21:32 -05:00 |
|
|
SandPoot
|
5384cb9d4b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-12 22:25:25 -03:00 |
|
|
siliconsandGitHub
|
f7937e54e0
|
Merge pull request #15860 from shellspeed1/public-bounties
Port of public bounties and the sales tagger from tg.
|
2022-10-12 03:27:37 -07:00 |
|
|
BongaTheProto
|
e1cb9c8346
|
Merge remote-tracking branch 'upstream/master'
|
2022-09-27 23:19:10 -05:00 |
|
|
SandPoot
|
f039efca97
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-09-27 01:19:55 -03:00 |
|
|
shellspeed1
|
a55b2c4ff3
|
ports https://github.com/tgstation/tgstation/pull/56375. Credit to cacogen.
|
2022-09-20 20:05:59 -07:00 |
|
|
shellspeed1
|
b4f886d999
|
port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic
|
2022-09-18 20:55:22 -07:00 |
|
|
shellspeed1
|
91c095989a
|
stuff
|
2022-09-16 17:55:10 -07:00 |
|