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
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
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
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
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
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
keronshb
a6bfff92cc
Fixes pirates, re adds extended, re adds voting
2021-09-24 19:40:56 -04: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
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
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
silicons
d9b70b1f1c
woo
2021-07-18 15:04:30 -07:00
silicons
0df58c878e
more
2021-07-18 14:01:43 -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
Fabian
63d910c79c
Merge branch 'master' into the-fuck-am-i-doing
2021-05-05 17:26:41 +02:00
silicons
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
Putnam
899b94f0f3
Made threat a subsystem instead of dynamic-attached.
2021-03-24 23:44:37 -07:00
silicons
5b2a42f254
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-20 14:13:23 -07:00
GrayRachnid
5201cf6ac5
stops racism
2021-03-17 21:58:41 -04:00
silicons
5d51025ad6
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-15 14:39:16 -07:00
Fabian
91fc66e98d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into the-fuck-am-i-doing
2021-03-15 14:32:50 +01:00
Fabian
7e50d878ca
Merge branch 'master' into the-fuck-am-i-doing
2021-03-15 14:09:30 +01:00
Putnam
25b021a343
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mode-chaos
2021-03-10 00:06:40 -08:00
Putnam
40dfd40bcd
Made it not weight almost entirely based on chaos.
2021-03-10 00:04:35 -08:00
silicons
9110ebcac1
Merge pull request #14375 from Putnam3145/repeated-mode-adjust-buff
...
Allows repeated mode adjust to be >100 total
2021-03-09 00:20:29 -07:00
Putnam
5f6d478509
Added a "desired mode chaos" system
2021-03-07 20:14:11 -08:00
Putnam
a651b629c9
Allows repeated mode adjust to be >100 total
2021-03-07 19:28:50 -08:00
Fabian
8178b7073a
It's done, atleast the code is
2021-03-05 21:50:29 +01:00
