 Mosley
|
0d9eebd20c
|
Merge remote-tracking branch 'upstream/master'
|
2025-04-24 17:03:15 -05:00 |
|
|
SandPoot
|
2d87780147
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-02-13 18:06:56 -03:00 |
|
|
SandPoot
|
56d972eb0b
|
all sorts of fixes and updates, may break stuff
|
2025-02-09 02:09:28 -03:00 |
|
|
Mosley
|
a44046076a
|
Merge remote-tracking branch 'upstream/master'
|
2024-11-21 22:44:41 -05:00 |
|
|
SandPoot
|
1d6008397a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-11-19 23:22:26 -03:00 |
|
|
Metis
|
f6af059a06
|
job titles
|
2024-11-02 03:16:16 -04:00 |
|
|
Mosley
|
928b4c62b0
|
Merge remote-tracking branch 'venus/master' into content-stuff
|
2024-10-11 03:47:54 -05:00 |
|
|
Sim
|
3e4f8da97c
|
[Port] The Ocky Icky Phobia from tgstation/tgstation#57450 & tgstation/tgstation#80247
|
2024-10-08 15:06:28 -03:00 |
|
|
Mosley
|
5f2ef6327a
|
Revert "Vote result"
This reverts commit 09bce1bc0d.
|
2024-09-20 12:11:39 -05:00 |
|
|
Mosley
|
8c06e5984c
|
how about another joke murray?
|
2024-09-20 02:49:07 -05:00 |
|
|
Mosley
|
f8c0405d06
|
Merge remote-tracking branch 'venus/master' into content-stuff
Gallifrey stands!
|
2024-09-20 01:37:56 -05:00 |
|
|
Mosley
|
3a8024db6d
|
undoes removals
|
2024-09-20 01:13:14 -05:00 |
|
|
ariaworld
|
3964cc1101
|
Some useful things (I hope title.dm will work, praying)
|
2024-09-19 01:44:56 +02:00 |
|
|
Mosley
|
9f8b2ca870
|
Revert "Let's get rid of this"
This reverts commit f01dc9293d.
|
2024-09-18 18:14:33 -05:00 |
|
|
ariaworld
|
66ecccc919
|
BEE RD CONSOLE
|
2024-09-16 01:24:51 +02:00 |
|
|
ariaworld
|
e0083a5fb4
|
TGS doesn't need this
|
2024-09-12 21:29:25 +02:00 |
|
|
ariaworld
|
f01dc9293d
|
Let's get rid of this
|
2024-09-12 15:21:51 +02:00 |
|
|
Tiviandariaworld
|
a4e67ccf36
|
Those messages shouldn't be important for admin chat.
|
2024-09-11 23:29:17 +02:00 |
|
|
ariaworld
|
5176ca425e
|
Fix: tries to fix lobby + forced song
|
2024-09-11 13:56:16 +02:00 |
|
|
ariaworld
|
aef9e98b9c
|
Grahh
|
2024-09-09 15:36:26 +02:00 |
|
|
ariaworld
|
fef887eb77
|
Exclude songs in {} from random pick (for specialized picking)
|
2024-09-06 19:11:52 +02:00 |
|
|
ariaworld
|
c971cfaead
|
Linking specific titles + sounds, perhaps?
|
2024-09-06 18:39:37 +02:00 |
|
|
ariaworld
|
09bce1bc0d
|
Vote result
|
2024-09-02 22:44:23 +02:00 |
|
|
ariaworld
|
d42c7a4f2a
|
Merge remote-tracking branch
|
2024-08-29 14:42:55 +02:00 |
|
|
SandPoot
|
a1905591f7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-24 23:49:10 -03:00 |
|
|
SandPoot
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
|
ariaworld
|
d2422de379
|
Removes N.2 unholy ERP verbs. Add: new textures for doors and floors.
|
2024-08-05 20:46:52 +02:00 |
|
|
BongaTheProto
|
3a44ff3fda
|
Merge remote-tracking branch 'upstream/master'
|
2024-05-20 16:55:07 -05:00 |
|
|
SandPoot
|
6083aeb1e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-05-17 21:49:16 -03:00 |
|
|
|
0a074ecb63
|
Purpose found
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
|
2024-05-17 21:38:45 -03:00 |
|
|
SandPoot
|
8d4b317800
|
poosh
|
2024-05-17 15:12:55 -03:00 |
|
|
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 |
|
|
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 |
|