Commit Graph

1253 Commits

Author SHA1 Message Date
Putnam
8a02c1a0a1 Made results of vote semi-public 2019-11-13 04:30:45 -08:00
Ghommie
c5a7c28a1b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-12 16:04:05 +01:00
Lin
df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00: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
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
d47f1f0518 Merge pull request #9756 from Ghommie/Ghommie-cit332
turns on the chat subsystem (#47653)
2019-11-10 11:03:53 -07:00
Putnam
139e9a9da8 reobfuscates dynamic vote 2019-11-09 16:03:40 -08:00
tralezab
354a257641 turns on the chat subsystem (#47653) 2019-11-10 00:05:59 +01:00
Putnam
392e628f3f lowered maximum curve width a good deal 2019-11-09 14:58:38 -08:00
Putnam
6de835f5e3 Assassination is less likely at lower threats. 2019-11-09 04:39:14 -08:00
Putnam
d10a317b42 Made vote consensus way stronger 2019-11-08 21:09:24 -08:00
Putnam
be464a38b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-08 20:37:29 -08:00
Putnam
e143771703 Made antag injection happen more often, initial injection later. 2019-11-08 04:25:52 -08:00
Putnam
912ca97d29 Added a preference that auto-votes at extremely low weight. 2019-11-08 03:44:22 -08:00
Putnam
d795df1150 made warops part of the dynamic system, in dynamic 2019-11-07 23:39:17 -08:00
Putnam
8e00f633b8 Made curve width formula be less stupid, less admin spam 2019-11-07 23:38:51 -08:00
Putnam
518eb1419c wrong paren placement wowee 2019-11-07 22:53:47 -08:00
BlackMajor
a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
2019-11-08 14:17:17 +13:00
Putnam
1df51d29f1 make it calm vs chaotic again. 2019-11-07 16:41:51 -08:00
Putnam
9a8fb3e0d2 4-'ing twice 2019-11-07 03:50:49 -08:00
Putnam
b25b2cdf29 tweaked the numbers and choices a little. 2019-11-07 01:48:03 -08:00
Putnam
c94c6295ab let's try making the votes SWING 2019-11-06 22:37:16 -08:00
Putnam
85fd53d615 actually let's add the extended voting back in, see how that does 2019-11-06 22:19:57 -08:00
Ghommie
2f76c9a8fc weird. 2019-11-07 06:51:55 +01:00
Ghommie
25eaf0f684 WARNING doesn't output infos on travis runs, damnit. 2019-11-07 05:52:56 +01:00
Ghommie
b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
Putnam
eb9c8c9aca made glorious death spend threat 2019-11-06 18:07:39 -08:00
Putnam
44ad4662eb fewer double roundstart antags 2019-11-06 18:07:26 -08:00
Putnam
33f7663008 this is probably required for compile 2019-11-06 17:20:56 -08:00
Putnam
a83901a8b0 and finished the wizard change merge 2019-11-06 16:30:07 -08:00
Putnam
1c4256f28f actually fuck this config's its own file now 2019-11-06 16:28:28 -08:00
Putnam
f3afc5de1b Merge branch 'malf-dynamic' into super-special-awesome-dynamic 2019-11-06 16:03:04 -08:00
Putnam
b9359de02f Made the curve make more sense with dichotomic voting. 2019-11-06 05:01:00 -08:00
Putnam
b240956c4c Okay, just peace vs chaos. 2019-11-06 00:21:47 -08:00
Putnam
c354b17afe Also deobfuscates dynamic vote 2019-11-06 00:13:39 -08:00
Putnam
401bbbd8ab Reduced vote to just extended vs calm vs chaos. 2019-11-06 00:07:52 -08:00
Ghommie
4ab3512dda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-04 23:15:12 +01:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
kevinz000
a750721fd2 Merge pull request #9653 from Poojawa/job-ordering
Level Order listing
2019-11-03 06:24:08 -07:00
kevinz000
3365522bdf Merge pull request #9654 from Putnam3145/dynamic-config-2
Adds dynamic antag injection to config
2019-11-03 06:21:24 -07:00
Ghommie
100a87d57b Unmodularize configuration, _globalvars and subsystems. 2019-11-02 20:42:01 +01:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
Linzolle
266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
kevinz000
5ba86d2fc3 Merge pull request #9423 from Poojawa/NPC-Run-levels
Boosts NPC runtime priority
2019-10-29 21:35:17 -07:00
kevinz000
b172c5f691 Merge pull request #9501 from deathride58/stronksecborgs
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
2019-10-29 21:29:12 -07:00
kevinz000
d64d1752b4 Merge pull request #9616 from deathride58/post512jukeboxes
Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE (and other small fixes/tweaks)
2019-10-29 21:25:12 -07:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00