 ariaworld
|
8efbd2dd26
|
Quirk removal admin log + allow hermit to load custom character
|
2024-05-02 16:37:45 +02:00 |
|
|
BongaTheProto
|
e0d2191e7d
|
Update overlays.dm
comments out the icons test because upstream hasn't bothered to fix the runtimes it finds yet
|
2024-04-19 18:17:01 -05:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
|
deathride58andGitHub
|
dd8c641520
|
Merge pull request #15486 from SandPoot/kills-cache
Solves issues with overlays by updating the whole subsystem
|
2024-04-12 23:31:54 -04:00 |
|
|
SandPoot
|
e40960a3a2
|
sadly necessary
|
2024-04-12 22:18:43 -03:00 |
|
|
SandPoot
|
002a4c31c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 22:06:15 -03:00 |
|
|
SandPoot
|
91045350e5
|
overlay stuff
|
2024-04-12 22:01:03 -03:00 |
|
|
SandPoot
|
dfe90dfb61
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486
|
2024-04-12 20:48:41 -03:00 |
|
|
SandPoot
|
ea41329544
|
some random math, if it's too low, or too high, change later
|
2024-04-10 23:01:39 -03:00 |
|
|
SandPoot
|
ca8ce67cd6
|
mail
|
2024-04-10 20:54:04 -03:00 |
|
|
BongaTheProtoandGitHub
|
78d4eaeaaa
|
Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix
Fix harddel issues with 515 upgrade PR
|
2024-04-07 03:16:55 -05:00 |
|
|
Elizabeth Lavenza
|
04958dd0f5
|
Fix globals controller harddeling
|
2024-04-06 20:37:43 -04:00 |
|
|
BongaTheProto
|
dc057a41ad
|
Merge branch 'master' into upstream-merge
|
2024-04-06 18:51:51 -05:00 |
|
|
SandPoot
|
c2df4281b9
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-05 23:31:50 -03:00 |
|
|
SandPoot
|
68fa21d602
|
content
|
2024-04-05 17:57:54 -03:00 |
|
|
Elizabeth Lavenza
|
d72fb0fe5e
|
Fix runtime in overflow bureaucracy station trait
|
2024-04-01 13:26:32 -04:00 |
|
|
Elizabeth Lavenza
|
affb6c435e
|
Fix runtime from missing jobs in jobs.txt
|
2024-04-01 11:33:30 -04:00 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05:00 |
|
|
SandPoot
|
80666ec1dd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-30 16:47:39 -03:00 |
|
|
Elizabeth Lavenza
|
b6f848127a
|
Fix runtimes from ashwalker eggs gibbing during CI
|
2024-03-29 17:22:50 -04:00 |
|
|
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
|
7feb673279
|
sorted the wrong thing
|
2024-03-12 15:38:49 +11:00 |
|
|
Katherine Kiefer
|
461f90a0ea
|
hmmmph
|
2024-03-12 15:29:22 +11:00 |
|
|
Katherine Kiefer
|
4a062ab083
|
shitty debug print
|
2024-03-12 15:20:19 +11:00 |
|
|
Katherine Kiefer
|
7fa6bb022e
|
shit
|
2024-03-12 15:07:19 +11: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 |
|
|
SandPoot
|
fcd036dab5
|
final stuff, i think?
|
2024-03-07 20:31:53 -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 |
|