Commit Graph

16248 Commits

Author SHA1 Message Date
Putnam
e88a6f2571 why is this HERE 2019-11-13 19:12:06 -08:00
Putnam
5e51cc63f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-13 16:58:44 -08:00
Putnam
8a02c1a0a1 Made results of vote semi-public 2019-11-13 04:30:45 -08:00
Putnam
0c3a7d4015 holy shit 2019-11-13 03:49:22 -08:00
Putnam
bbcf91f88c blacklisted blob from clock cult, latejoin revs now higher req threat 2019-11-12 23:02:59 -08:00
kevinz000
4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
2019-11-12 23:59:31 -07:00
kevinz000
18993c735a Merge pull request #9771 from Ghommie/Ghommie-cit338
Porting Robustin's Syndicate Infiltrator PR from tee-gee
2019-11-12 23:58:46 -07:00
kevinz000
e142ed03dd Merge pull request #9773 from Ghommie/Ghommie-cit339
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
2019-11-12 23:58:15 -07:00
kevinz000
8920930679 Merge pull request #9765 from dapnee/let's-fix-lockers
Ports Closet & Crate Initialization Fixes
2019-11-12 23:57:39 -07:00
kevinz000
a16219d97a Merge pull request #9772 from DeltaFire15/weh
Adds eight new plushies to the game while integrating kevs' plush PR
2019-11-12 23:56:01 -07:00
Putnam
89c560c891 this is why static typing is good and should be used more 2019-11-12 17:36:12 -08:00
Putnam
7ea3b5e221 Increased event cooldown 2019-11-12 17:01:25 -08:00
Putnam
6a7453dede whoops forgot initialize cooldown 2019-11-12 16:48:46 -08:00
Putnam
7a7c410265 lowered admin spam 2019-11-12 16:48:37 -08:00
Ghommie
2b8b8882fb You are actually rifght, that's bad. 2019-11-12 15:49:20 +01:00
DeltaFire
4d4d495765 Hmm I wonder if anyone would notice if I smuggled another plush into this PR
What it says on the tin, got asked via dms to add another plush to my PR so here we go.
Char is Minty.
2019-11-12 15:32:06 +01:00
Putnam
d381be7f07 more logging. 2019-11-12 05:30:08 -08:00
Putnam
82a17d8144 updated an error to actually be right 2019-11-12 03:02:32 -08:00
Putnam
42d94e6cae Rethink events (see desc)
Made events their own ruletype, made the duplicated-with-different-threats events are now one event with shared values that can scale theirselves up.

Also fixed **MIDROUND ANTAGS NOT WORKING AT ALL BECAUSE THEY WERE LOOKING FOR ENEMIES ONLY AMONG PLAYERS ELIGIBLE FOR THE ANTAG WTF**
2019-11-12 02:57:31 -08:00
Ghommie
a18bcd05d7 makes it compile. 2019-11-12 02:38:45 +01:00
Ghommie
0b7437359a Dynamic. 2019-11-12 01:57:33 +01:00
Ghommie
388a7579b9 A few minor clock cult improvements. 2019-11-12 01:49:36 +01:00
Ghommie
d06b6fd83e Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP) 2019-11-11 21:34:47 +01:00
DeltaFire
421be859fb Ok nice typo gang 2019-11-11 21:08:32 +01:00
Ghommie
42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
DeltaFire
51aacedb9f Little fix 2019-11-11 18:17:07 +01:00
DeltaFire
3d2986fd06 Fixes the sin plush sprite + MORE PLUSHIES
What it says on the label, fixes the sin plushie sprite as the size was wrong previously and adds two more lizzers

Also fixes a typo weh
2019-11-11 17:32:06 +01:00
Putnam
0c50d39ddc the "latejoiners count too" commit 2019-11-11 05:12:36 -08:00
Putnam
5f683b0eff Let's make those roundstarts more likely. 2019-11-11 00:05:35 -08:00
Putnam
d13301312d made forced midround antags increase weight by their cost
This is to make sure that threat is really, really used throughout a round, or at least to encourage it to be--people are rightfully annoyed at 70 threat level rounds just not using the vast majority of it.
2019-11-11 00:04:51 -08:00
Putnam
c7ac41f880 added weights, repeatable weight decreases 2019-11-10 23:35:20 -08:00
Putnam
5466ebc1ce elligible more like illegible 2019-11-10 23:26:04 -08:00
Putnam
23a2c24bad ok from_ghosts
the worst part is that putting this boilerplate as a base part of the proc probably isn't even advisable. I hate it.
2019-11-10 23:25:25 -08:00
Putnam
7535ef8505 balancing (hopefully more roundstart antags) 2019-11-10 23:09:37 -08:00
Putnam
baf22899d0 Removed a comment I only kept around for copy+pasting. 2019-11-10 22:59:49 -08:00
Putnam
9618050b17 Editing stuff to let it compile (see description)
Malf AI is no longer available as a roundstart ruleset because antag assignment happens before job assignment. On secret, this is not a problem, but on dynamic, there is no way to make malfunctioning AI limited to certain threat levels except by making it a delayed ruleset. Unfortunately, with the upstream changes, delayed rulesets were removed--all roundstart rulesets are delayed, and if it were to roll malf AI, it would simply error, make a runtime stack trace and, in general, shit the bed. There would be no roundstart antag that round, which is *kind of* a problem I'm desperate to fix. So, no more roundstart malf--it's either that or some rounds having no roundstart antags at all.
2019-11-10 22:58:16 -08:00
Putnam
b5d8b30ae3 Further logging fixes 2019-11-10 21:34:10 -08:00
Putnam
6307d44198 Fixing some logging 2019-11-10 21:30:34 -08:00
Putnam
18dc177a65 um. 2019-11-10 19:00:55 -08:00
Putnam
40dd37a858 all roundstarts are delayed now 2019-11-10 19:00:24 -08:00
Putnam
2120526525 Merged upstream dynamic fixes ported by Ghommie. 2019-11-10 18:48:59 -08:00
DeltaFire
1c6c188033 Exo plush
Adds a AI plushie for exo since this PR is slowly getting filled with plushies
guaranteered non-malf!
2019-11-11 01:05:16 +01:00
DeltaFire
56720ea99c Merging kevinz's plush PR into mine
Adds the kara plushie, the new skylar sprite and the trillby fix into the code, all without any missing syntax elements! Yay!
2019-11-10 22:27:06 +01:00
Dap
041c35202b Ports Closet & Crate Initialization Fixes
Ports a similarly named pull request (thank you cool cat).
2019-11-10 14:17:34 -07:00
kevinz000
c4849ead74 Merge pull request #9727 from BlackMajor/Yeehaw
Fixes ED209 Assemblies sometimes advancing to an invalid build stage.
2019-11-10 11:46:03 -07:00
kevinz000
39e55edcb3 Merge pull request #9734 from Ghommie/Ghommie-cit324
Ports CEV-eris delivery packages sprites, also dunking old syndie cybernetics box sprite.
2019-11-10 11:45:47 -07:00
kevinz000
07447917de Merge pull request #9744 from Seris02/meteorhallucinations
makes meteor hallucinations have an ETA now
2019-11-10 11:44:41 -07:00
kevinz000
76e31a2799 Merge pull request #9745 from Ghommie/Ghommie-cit327
rad flags fixes.
2019-11-10 11:44:17 -07:00
kevinz000
95b98a5133 Merge pull request #9746 from Ghommie/Ghommie-cit328
Ports "Cleans up the new alt clicking functionality" from /tg/
2019-11-10 11:43:41 -07:00
kevinz000
48fb3a0f08 Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
2019-11-10 11:40:41 -07:00