 BongaTheProto
|
ed4ab9e8ab
|
Merge branch 'auxmos-515' of https://github.com/jupyterkat/Citadel-Station-13 into upstream-merge
|
2024-03-28 18:27:30 -05:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
|
BongaTheProto
|
8bbb0fda41
|
Merge branch 'master' into upstream-merge
|
2024-03-24 16:41:07 -05:00 |
|
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
|
Katherine Kiefer
|
fd29f9c902
|
initial
|
2024-03-09 21:16:02 +11:00 |
|
|
SandPoot
|
a65f323734
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
|
2024-03-08 19:10:22 -03:00 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
ariaworld
|
d442c44564
|
Add: RUNLEVEL_POSTGAME to shuttles to let shuttles move after round is over.
|
2024-03-01 22:55:47 +01:00 |
|
|
SandPoot
|
17362e5881
|
push em
|
2024-02-25 13:41:28 -03:00 |
|
|
CSDSP
|
a7ae549f38
|
Allow custom shuttles to get to centcom
|
2024-02-17 02:00:49 -08:00 |
|
|
BongaTheProtoandGitHub
|
83373ddbd9
|
Merge pull request #1054 from ariaworld/infinidorms-hotel-update
[SEMI-MODULAR] Infini-Dorms update (Choose Room Type) + Sauna Ovens
|
2024-02-16 16:35:40 -05:00 |
|
|
BongaTheProtoandGitHub
|
e5a6921d6f
|
Merge pull request #1041 from ariaworld/tweak-undead
[SEMI-MODULAR] Undead Quirk Rebalance + Sleep Healing + Quirk tweaks and additions
|
2024-02-16 16:32:32 -05:00 |
|
|
ariaworld
|
3d8bc8c9b4
|
Remove unused lavaland files, rename to lavaland.dmm and update xenoarcheology.
|
2024-01-29 21:27:34 +01:00 |
|
|
ariaworld
|
000be77388
|
Fix: Name of Material Floor Tile
|
2024-01-25 00:59:39 +01:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
ariaworld
|
95b0c5eee5
|
Better names.
|
2024-01-07 05:09:18 +01:00 |
|
|
ariaworld
|
4863b89009
|
Infinidorms update!
|
2024-01-07 04:57:04 +01:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
7eaef36e11
|
d k daunkey kaung
|
2024-01-03 22:42:03 -03:00 |
|
|
BongaTheProto
|
a9715638ad
|
Merge remote-tracking branch 'upstream/master'
|
2024-01-02 01:00:59 -05:00 |
|
|
SandPoot
|
4e9ff44ee7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-29 15:49:14 -03:00 |
|
|
deathride58andGitHub
|
ce1d757159
|
Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
|
2023-12-28 22:44:59 -05:00 |
|
|
BongaTheProto
|
13cd269788
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-25 14:28:51 -05:00 |
|
|
SandPoot
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -03:00 |
|
|
SandPoot
|
b9a422ee2d
|
throw at mobs laying down
|
2023-12-18 14:07:25 -03:00 |
|
|
SandPoot
|
27bdd4b732
|
aiModule > ai_module
|
2023-12-17 23:20:43 -03:00 |
|
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -03:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
d7942e1365
|
button
|
2023-12-10 00:50:10 -03:00 |
|
|
SandPoot
|
a558377206
|
more stuff i can't guarantee works by itself yet
|
2023-11-29 23:37:15 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
BongaTheProto
|
37bbecefb4
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-05 18:01:32 -05:00 |
|
|
SandPoot
|
fd124b03e4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-11-03 21:27:30 -03:00 |
|
|
SandPoot
|
55e0e5de06
|
real quick
|
2023-10-28 17:54:31 -03:00 |
|
|
SandPoot
|
0b6d743e22
|
go
|
2023-10-28 17:51:02 -03:00 |
|
|
SandPoot
|
6df09381bd
|
Update overlays.dm
|
2023-10-13 16:40:43 -03:00 |
|
|
BongaTheProto
|
3230992305
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-12 13:28:32 -05:00 |
|
|
SandPoot
|
ee163aae68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-12 02:40:12 -03:00 |
|
|
BongaTheProto
|
dca4dab806
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-10 21:58:50 -05:00 |
|
|
SandPoot
|
41671a5f22
|
quick dmapi stuff update
|
2023-10-10 18:30:48 -03: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 |
|
|
Katherine Kiefer
|
117690b5a3
|
use the config
|
2023-08-18 22:38:21 +10:00 |
|
|
Katherine Kiefer
|
0870fa9734
|
disable eq
|
2023-08-18 22:36:39 +10: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 |
|
|
BongaTheProto
|
cdd5bb87d8
|
Merge remote-tracking branch 'upstream/master'
|
2023-08-08 01:42:46 -05:00 |
|
|
SandPoot
|
9a902b6348
|
branch name goes hard
|
2023-08-04 12:29:29 -03:00 |
|
|
BongaTheProto
|
7405dab0c7
|
better than youtube downloads I suppose
I mean, they'll still download their songs from youtube most likely but at least we'll make sure it won't crash the server lol
|
2023-07-15 14:09:59 -05:00 |
|