Commit Graph

9531 Commits

Author SHA1 Message Date
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
Lin df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00: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 09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +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
Seris02 8dfbc652cb ADDS THE NEW MARTIAL ART - RISING BASS!! 2019-11-09 21:11:36 +08: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
Putnam d0d469a45a Better roundend logging 2019-11-09 01:00:35 -08:00
Putnam 80448c0abb wow, totally the wrong proc, very cool 2019-11-09 00:40:54 -08:00
Putnam e21d34de78 MORE! MORE! MORE! 2019-11-08 23:19:16 -08:00
Putnam b23b5c02f4 Improved roundstart report flavor 2019-11-08 21:09:37 -08:00
Putnam a912c6729f okay none of that i guess 2019-11-08 20:42:58 -08:00
Trilbyspaceclone 96a8302dac Fine you can boh bomb again 2019-11-08 21:11:44 -05:00
Trilbyspaceclone 5e1ab01733 What do you mean I cant hold the armory on my back?
But mmmmmuuuummmm I want to have 12 duffle bags in my bag of holding!!!
2019-11-08 21:05:30 -05:00
Putnam ac677be4f1 Made the roundstart flavor make a bit more sense. 2019-11-08 16:47:51 -08:00
Putnam b95184ce65 might be better if events actually run 2019-11-08 16:42:01 -08:00
Putnam 0077e163e4 Made roundstart traitors always possible at >=60 threat 2019-11-08 16:26:55 -08:00