Commit Graph

465 Commits

Author SHA1 Message Date
deathride58 578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04: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
deathride58 8838fcc2f3 Moves server_taglines.txt to config dir to avoid requiring manual updates of the strings folder with TGS 2022-05-12 17:22:52 -04: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
silicons 73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07: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
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 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
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
LetterN 18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
DeltaFire 2940d141cf please-dont-smite-us-lummox 2022-01-01 07:10:35 +01:00
LetterN fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
LetterN 8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
keronshb af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -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
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
keronshb 6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
keronshb 1427157df3 Fixes space cops and adds config for dynamic 2021-10-15 00:12:46 -04:00
SandPoot f03b83e89b Update server.txt 2021-10-13 15:12:52 -03:00
SandPoot 5153dba0f2 Upload files 2021-10-13 15:11:25 -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
Putnam3145 3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
keronshb af2777a604 Citadel weight adjustments and config 2021-09-25 17:56:15 -04:00
zeroisthebiggay 5366a09c8b Update spaceRuinBlacklist.txt 2021-09-24 18:38:58 -04:00
keronshb c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb 13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
silicons ae513d3114 feautre 2021-09-17 21:58:26 -07:00
keronshb a0e1d9f977 Family replacing clock cult 2021-09-18 00:04:34 -04:00
keronshb 408517fb1d SHOULD? FIX? 2021-09-16 20:53:46 -04:00
keronshb 372725c1f4 Fixes everything???? 2021-09-16 15:40:21 -04:00
keronshb 792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
keronshb 7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
Putnam3145 9a8698230b Added a config entry for monstermos 2021-09-14 14:18:14 -07:00
Putnam3145 1c24f65e59 fixed a typo 2021-09-14 14:17:56 -07:00
zerothebigboy 68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
LetterN 6739e349a0 heretics LOVES this - Also ian's birthday! 2021-09-08 09:50:07 +08:00
LetterN c25dc84da0 what the cat doing with the yarn dependencies?? 2021-09-08 09:25:38 +08:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
silicons d9b70b1f1c woo 2021-07-18 15:04:30 -07:00
silicons 0df58c878e more 2021-07-18 14:01:43 -07:00
silicons bdad78147c changes 2021-06-28 18:20:44 -07:00
silicons 55608737fa more.. 2021-06-28 14:51:55 -07:00
silicons 711e250e26 AAAA 2021-06-28 14:18:56 -07:00
silicons 805b931fb8 config reorganize start 2021-06-28 13:35:52 -07:00