SandPoot
3aa3aead3d
re-do the whole goddamn thing.
2023-10-20 17:48:13 -03:00
SandPoot
910263d2d9
Merge branch 'update-config' of https://github.com/SandPoot/Citadel-Station-13
2023-10-05 22:01:18 -03:00
SandPoot
d16a39505f
oopsies
2023-10-05 21:39:55 -03:00
SandPoot
6cd2cfcd01
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-config
2023-10-05 21:25:29 -03:00
SandPoot
ddf9827afb
lowercasing possible
2023-10-05 21:24:13 -03:00
SandPoot
a105852042
the stuff
...
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com >
2023-10-05 21:15:11 -03:00
SandPoot
bb1886ddb3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-10-03 21:00:13 -03:00
SandPoot
962c3e7b76
fix
2023-10-03 14:31:45 -03:00
SandPoot
13da11c4bc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-31 15:36:19 -03:00
SandPoot
bfe07112ff
i hate keyed_list, i'm not keeping it in
2023-07-28 13:53:09 -03:00
SandPoot
6896a2e481
what was it again?
2023-07-27 21:09:41 -03:00
SandPoot
d1c44afdae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-01 19:21:46 -03:00
Lin
becb035529
Merge pull request #15632 from deathride58/botrefresh
...
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
2022-06-01 21:18:10 +00:00
deathride58
113981b5a8
Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more!
2022-05-21 00:21:58 -04:00
deathride58
ccc5ea1758
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
2022-05-19 15:19:21 -04:00
SandPoot
5c5bb3c5c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-12 18:09:56 -03:00
deathride58
40730237f2
Hub refresh - Cleans up update_status(), adds more hub-related config options, and more!
2022-05-05 14:52:53 -04:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
silicons
73d39db3c1
Merge pull request #15343 from SandPoot/deadmin-prefs
...
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot
282941ca5b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-31 00:21:11 -03:00
BlueWildrose
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
SandPoot
e9637bb688
Merge branch 'master' into deadmin-prefs
2022-03-22 15:35:46 -03:00
SandPoot
04231b54f3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-17 22:46:31 -03:00
SandPoot
96e38e965b
Merge branch 'master' into mechs-are-vehicles
2022-03-17 22:23:48 -03:00
SandPoot
37fef7fbba
Upload files
2022-03-16 15:33:31 -03:00
SandPoot
fdb6413d23
You guys want some logs?
2022-03-16 15:22:04 -03:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
Lin
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
keronshb
0f4a3efcb5
Fixes weird flipped line
2022-02-22 17:26:19 -05:00
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
Putnam3145
3b1304f432
Weekly dynamic days
2022-02-02 17:38:19 -08:00
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
SandPoot
9694d84e14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-02 20:56:15 -03:00
DeltaFire
2940d141cf
please-dont-smite-us-lummox
2022-01-01 07:10:35 +01:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
SandPoot
80dce37eb4
Upload files
2021-11-06 15:38:13 -03:00
LetterN
49940c373e
tgui backend
2021-10-28 12:51:31 +08:00
SandPoot
a797436f45
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-15 15:03:21 -03:00
SandPoot
5153dba0f2
Upload files
2021-10-13 15:11:25 -03:00
SandPoot
5f72ad8d61
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-11 20:33:04 -03:00
Putnam3145
3209917830
Merge pull request #15173 from silicons/vpn_block
...
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
2021-10-11 15:51:52 -07:00
SandPoot
d55d628efe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-08 21:34:03 -03:00
keronshb
a6bfff92cc
Fixes pirates, re adds extended, re adds voting
2021-09-24 19:40:56 -04:00
SandPoot
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
keronshb
cd00d1589e
fucking hell
2021-09-19 18:06:24 -04:00
silicons
ae513d3114
feautre
2021-09-17 21:58:26 -07:00
keronshb
408517fb1d
SHOULD? FIX?
2021-09-16 20:53:46 -04:00
