Commit Graph

585 Commits

Author SHA1 Message Date
Cognition
b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -07:00
shellspeed1
4bade2b1c6 merge conflict fix 2022-09-18 23:10:00 -07:00
shellspeed1
4ddd0e76cc Update flavor_misc.dm 2022-09-17 19:57:26 -07:00
shellspeed1
cf45a23bb4 adds bellows, mumbles, and crackles as speech verbs 2022-09-17 00:59:27 -07:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
SandPoot
b1f10e164e bitfields 2022-07-31 04:49:25 -03:00
deathride58
f30c9406cc randomization! 2022-06-09 15:29:48 -04:00
deathride58
2a720ce054 vocal barks - Fully customizable noises for talking! 2022-06-09 03:59:17 -04:00
deathride58
113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07: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
Timothy Teakettle
e689d16589 i swear im testing it right now and this is not a web edit 2022-04-27 15:26:17 +01:00
Timothy Teakettle
ac4a41243a add salt quirk 2022-04-27 14:58:54 +01:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
Putnam3145
6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
Solaris-Shade
d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot
96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
SandPoot
4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot
11522b7761 global var 2022-03-16 18:21:37 -03:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot
45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
Timothy Teakettle
56547a2556 generalizes recipe searching, adds chemistry functionality 2022-02-23 11:38:04 +00:00
Timothy Teakettle
fd997e1615 initial test changes 2022-02-22 21:59:28 +00:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
SandPoot
7e970fe5f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-04 13:06:20 -03:00
SandPoot
29be8573ea Upload files 2022-02-02 02:01:04 -03:00
DeltaFire
e71e86cf23 adapted 2022-01-29 16:43:03 +01:00
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
DeltaFire
0faac6dce6 hoo boy 2021-12-14 23:06:42 +01:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
DeltaFire
5d6978bb2f oh god oh fuck 2021-11-04 21:06:42 +01:00
LetterN
99019166e4 i think it works
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +08:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
keronshb
fce4eb0476 Merge branch 'dynamicport' 2021-10-09 00:28:30 -04: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
4e91dde6b0 Timer fix and dead list removal 2021-09-30 14:50:04 -04:00
keronshb
13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
silicons
147903f654 sigh 2021-09-19 10:57:58 -07:00
keronshb
408517fb1d SHOULD? FIX? 2021-09-16 20:53:46 -04:00
keronshb
7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04: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
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
silicons
d427c43b7b Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
2021-08-26 21:41:25 -07:00
keronshb
47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
zeroisthebiggay
2bc55dad4f Update maintenance_loot.dm 2021-08-26 01:48:10 -04:00