Commit Graph

2513 Commits

Author SHA1 Message Date
silicons
939a493334 Merge pull request #14306 from Putnam3145/supernova
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
Letter N
23c04cac12 wait it's still free 2021-03-04 16:46:00 +08:00
Letter N
7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Letter N
a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
Putnam
291fc2add6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into supernova 2021-03-02 01:33:22 -08:00
silicons
6f91da89d7 Merge pull request #14322 from Putnam3145/pai-policy
Adds a pAI policy config
2021-03-01 18:26:57 -07:00
Letter N
573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
Lin
d645785fc9 Merge pull request #14315 from Citadel-Station-13/silicons-patch-21
fixes instrument min sustain being too low for exponential dropoff to work
2021-02-27 17:12:09 -06:00
Putnam
50c1a83c6a Adds a pAI policy config 2021-02-26 00:34:13 -08:00
silicons
c816fcb672 Update instruments.dm 2021-02-25 05:11:47 -07:00
R3dtail
aca2f89687 Update say.dm
Deleted the comment on line 90 since max_message_len and max_flavor_len  are now equal as it was a requested change
2021-02-24 17:20:21 -06:00
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
R3dtail
8400a664e8 Enables Novel Posting 2021-02-23 22:00:49 -06:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
8856c1501a spellchange 2021-02-19 11:07:16 +08:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
silicons
3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Lin
1d00bc51cb Merge pull request #14238 from Citadel-Station-13/silicons-patch-13
fixes linter errors with COMPILE_OVERLAYS (wow this is stupid)
2021-02-14 13:34:25 -06:00
Lin
98736a7a37 Merge pull request #14207 from TyrianTyrell/master
Multilingual fix? (Has since been tested.)
2021-02-13 16:41:10 -06:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
silicons
66570144b9 Update subsystems.dm 2021-02-12 23:15:36 -07:00
silicons
110b4981dd Update subsystems.dm 2021-02-12 23:13:33 -07:00
silicons
f6cb489e73 Update subsystems.dm 2021-02-12 23:03:08 -07:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N
3167dd8e22 atmos cc, cpl 2021-02-12 11:50:39 +08:00
TyrianTyrell
b7b8be6f39 Update language.dm 2021-02-08 07:27:47 -05:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07:00
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
TyrianTyrell
992b7909ba Update traits.dm 2021-02-01 05:35:49 -05:00
silicons
1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout
loadout part 3: custom names and descriptions
2021-01-27 19:09:41 -07:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
2021-01-25 23:17:09 -07:00
silicons
6094293b4b Merge pull request #14105 from DeltaFire15/heretic-target-fix
Heretic sacrifice target logging + a fix
2021-01-25 22:58:54 -07:00
raspy-on-osu
59f59178f4 does this work 2021-01-24 19:24:50 -05:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
DeltaFire
4578f30001 brrt 2021-01-20 05:54:38 +01:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
f0a9a7a179 fix 2021-01-19 04:21:21 -07:00
Timothy Teakettle
b956df2226 name description implement 2021-01-18 21:59:00 +00:00
silicons
8d023b26b4 Merge pull request #14030 from Putnam3145/usual-judgment
Replaces majority judgment with usual judgement
2021-01-17 20:41:29 -07:00
silicons
8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
silicons
c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat
two toggled self-buffing spells that have no relation to any anime or video game in particular
2021-01-13 16:50:50 -07:00
silicons
310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00