 BongaTheProto
|
be96b4ea72
|
updates to workflows
idk if this will fix the issue
|
2023-09-03 20:06:32 -05:00 |
|
|
BongaTheProto
|
fb1dc86226
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-03 18:06:53 -05:00 |
|
|
SandPoot
|
f53a7a1f40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-03 17:47:27 -03:00 |
|
|
Tsurupeta
|
214f0eb6ef
|
no message
|
2023-08-19 14:20:44 +03:00 |
|
|
Katherine Kiefer
|
16a490ee5c
|
update auxmos
|
2023-08-18 22:13:30 +10: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 |
|
|
Tsurupeta
|
eca4935865
|
reftracking
|
2023-08-08 14:01:16 +03: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 |
|
|
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 |
|
|
BongaTheProtoandGitHub
|
835f7c76f2
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-07-26 18:35:43 -05:00 |
|
|
SandPoot
|
ebd9cedbfb
|
this
|
2023-07-26 17:28:29 -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 |
|
|
BongaTheProto
|
650642d379
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-20 00:23:25 -05:00 |
|
|
SandPoot
|
86cc2c0b0d
|
must return
|
2023-07-19 20:57:09 -03: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
|
217e23fc7f
|
push
|
2023-07-18 15:22:24 -03:00 |
|
|
Comicao1
|
74502c25a8
|
Merge remote-tracking branch 'upstream/master' into xenoarch-new
|
2023-06-23 20:43:25 -03:00 |
|
|
Satile1
|
61ef0f337e
|
Hotel Radio channel! Mapping fixes and flavour
|
2023-05-25 17:09:21 +01:00 |
|
|
Comicao1
|
625ae9ef57
|
Merge remote-tracking branch 'upstream/master' into xenoarch-new
|
2023-05-08 02:19:40 -03:00 |
|
|
BongaTheProtoandGitHub
|
2dbd0a45e5
|
Update items.dm
|
2023-05-06 18:59:11 -05:00 |
|
|
BongaTheProto
|
c72c8c145d
|
Merge branch 'master' into pr/623
|
2023-05-06 18:45:19 -05: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 |
|
|
Comicao1
|
bf6fd2ce1f
|
Merge remote-tracking branch 'upstream/master' into xenoarch-new
|
2023-05-04 02:29:52 -03:00 |
|
|
Jerry WesterandKrissKr0ss
|
31e87bc2d7
|
Safeguard suit
|
2023-05-01 00:26:56 -05:00 |
|
|
Jerry WesterandKrissKr0ss
|
22309324dc
|
whitespace should not be syntax grrr
|
2023-05-01 00:23:09 -05:00 |
|
|
Jerry WesterandKrissKr0ss
|
8271cf9bc1
|
move rescue plating to CMO locker
|
2023-05-01 00:22:59 -05:00 |
|
|
Jerry WesterandKrissKr0ss
|
44c029176c
|
remove signals_atom_movable.dm, revert jetpack
|
2023-05-01 00:19:48 -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 |
|
|
BongaTheProtoandGitHub
|
994f14c5d5
|
Merge pull request #520 from Pin-alternative/rework
Reworks to genitals
|
2023-04-23 14:47:32 -05:00 |
|
|
BongaTheProto
|
525741658b
|
shaft beast? Like hype beast but with cocks?
|
2023-04-23 13:55:45 -05:00 |
|
|
BongaTheProtoandGitHub
|
ef6543513e
|
Merge pull request #815 from KeplerWasTaken/graffitifixing
Removing distasteful symbols
|
2023-04-18 18:44:37 -05:00 |
|
|
BongaTheProtoandGitHub
|
92bcccd779
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-04-18 11:20:14 -05:00 |
|
|
KeplerWasTaken
|
1e71db0b70
|
removed distasteful symbols
|
2023-04-17 22:27:46 +02:00 |
|
|
SandPoot
|
8a825dc762
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-04-10 18:35:06 -03:00 |
|
|
SandPoot
|
a1ab60fd07
|
push
|
2023-04-08 22:47:48 -03:00 |
|
|
Comicao1
|
f06e1e3cd4
|
aye
|
2023-04-05 17:31:20 -03:00 |
|
|
Comicao1
|
d9e21a7784
|
Fixes
|
2023-04-05 16:07:18 -03:00 |
|
|
Pin-alternative
|
8dbbd69ae0
|
Merge remote-tracking branch 'upstream/master' into rework
|
2023-04-05 20:14:10 +10:00 |
|
|
Pin-alternative
|
54bb70438f
|
Merge remote-tracking branch 'upstream/master' into rework
|
2023-04-04 08:16:14 +10:00 |
|
|
BongaTheProto
|
1f58235a4a
|
Merge remote-tracking branch 'upstream/master'
|
2023-04-03 11:52:47 -05:00 |
|
|
SandPoot
|
9d214e2f9d
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-04-03 12:53:37 -03:00 |
|
|
LinandGitHub
|
654e5dad9d
|
Merge pull request #15864 from Putnam3145/auxmos-2
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
|
2023-04-01 00:17:22 -07:00 |
|
|
KeplerWasTaken
|
3a81451a2d
|
Tweaked cryo messages for heads of staff and AI, changed greeting messages for blueshields and bridge officers
|
2023-03-28 23:22:32 +02:00 |
|