Commit Graph

19834 Commits

Author SHA1 Message Date
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
Persi b8137cde65 Reducing meteor warning time 2019-11-12 06:02:24 -05: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
Persi c784cab060 Corrects the descriptions of meth and ephedrine to reflect that their movespeed buffs were previously removed. 2019-11-12 05:37:30 -05:00
Ghommie 9fb70c8af9 Ghommie rants, comment syntax is at stake. 2019-11-12 06:40:30 +01:00
Ghommie 176a757f62 Fixing suit overlays compatibility with items again. 2019-11-12 06:33:06 +01:00
Ghommie fd33879b33 Fixing some reagent taste descriptions. 2019-11-12 06:20:33 +01:00
Ghommie e3cdb55a8f Makes it compile. 2019-11-12 04:45:47 +01:00
Ghommie aad2b5bcd5 Fixing Aux base camera/drone RCD actions. 2019-11-12 04:35:10 +01:00
Ghommie a18bcd05d7 makes it compile. 2019-11-12 02:38:45 +01:00
Hatterhat 8d2f833735 stamina hands 2019-11-11 19:14:12 -06:00
Hatterhat d27150331a fast hands 2019-11-11 18:59:31 -06: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
Hatterhat 8ca0029e76 fast bombs - 5 sec to 2 sec 2019-11-11 18:49:30 -06:00
Ghommie 29114de3f1 The actual waterflower, am I funny yet? 2019-11-12 00:47:36 +01:00
Ghommie 19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +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
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
Weblure 3dac695d53 Merge branch 'master' into Xenobio-Hotkeys 2019-11-10 21:55:22 -07: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 e0afed1f8e QoL dullahan ahealing. 2019-11-11 00:39:19 +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