Commit Graph

6085 Commits

Author SHA1 Message Date
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
Ghommie 63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
Putnam 0c50d39ddc the "latejoiners count too" commit 2019-11-11 05:12:36 -08:00
TrilbySpaceClone 6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05: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
BlackMajor 4cd741310b Borg changes and module compression 2019-11-11 16:35:20 +13: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
Ghommie 4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +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
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01: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 92455b5b8c Merge pull request #9695 from Ghommie/Ghommie-cit311
Unmodularize and update pAI/Intellicards very slighty.
2019-11-10 11:40:14 -07:00
kevinz000 e8219dd9f7 Merge pull request #9697 from Poojawa/patch-1
Better Health Analyzer formatting
2019-11-10 11:35:07 -07:00
kevinz000 e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets
Port Welding Hard Hats from /tg/
2019-11-10 11:30:54 -07:00
kevinz000 487e1806e7 Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
2019-11-10 11:30:33 -07:00
kevinz000 23cd6b7604 Merge pull request #9714 from Ghommie/Ghommie-cit315
Fixing a few throw_at calls and modular computer processors Init.
2019-11-10 11:28:26 -07:00
kevinz000 501dfbb43a Merge pull request #9715 from Ghommie/Ghommie-cit316
Ports CEV-Eris resprited matchbox, also respriting cigar boxes myself.
2019-11-10 11:27:36 -07:00
kevinz000 1493863533 Merge pull request #9716 from Ghommie/Ghommie-cit317
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
2019-11-10 11:27:04 -07:00
kevinz000 c46b425402 Merge pull request #9719 from Ghommie/Ghommie-cit318
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
2019-11-10 11:26:06 -07:00
Ghommie c6e44a7fed That's it: #46027, (a little bit of) #46132, #47100, #47341, #47351, #47395, #47457, #47491. 2019-11-10 17:59:40 +01:00
DeltaFire 7ab4d2f013 Viva la wehvolution
Adding the plushies code after syncing with ros's changes
2019-11-10 17:39:43 +01:00
Ghommie 03da6d6960 fixeronis. 2019-11-10 06:41:42 +01:00
Ghommie 3ddbee8878 Initial stuff. 2019-11-10 06:30:47 +01:00
Putnam 57fbad5d41 forces antag if all antags are dead 2019-11-09 21:29:09 -08:00
Putnam d78bc94b49 Better logging of why-no-roundstart 2019-11-09 17:34:01 -08:00
Putnam b5c58ec1d8 Weighted antags higher, made zero-antag midround injection chance higher 2019-11-09 16:56:31 -08:00
Putnam 3c39fc4df9 i overtuned it. time to go back down 2019-11-09 14:52:47 -08:00
Ghommie 279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
Ghommie 9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Putnam 48761a9889 aaa config 2019-11-09 04:19:49 -08:00
Putnam f1801b9531 also pirates 2019-11-09 04:07:48 -08:00
Putnam a7302dfbc4 less terrible admin spam 2019-11-09 03:13:37 -08:00
Putnam 428ea5e5e1 Nuke disk being still now generates threat 2019-11-09 03:12:36 -08:00