Commit Graph

886 Commits

Author SHA1 Message Date
Putnam
304ce37d6c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 02:23:48 -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
kappa-sama
17d8998fef emergent gameplay 2019-11-13 16:58:51 -05:00
Putnam
8a02c1a0a1 Made results of vote semi-public 2019-11-13 04:30:45 -08: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
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
912ca97d29 Added a preference that auto-votes at extremely low weight. 2019-11-08 03:44:22 -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
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
kevinz000
a750721fd2 Merge pull request #9653 from Poojawa/job-ordering
Level Order listing
2019-11-03 06:24:08 -07: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
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
Poojawa
cbf74f63c8 Level Order listing 2019-10-29 00:00:48 -05:00
kevinz000
78174fcc06 Update shuttle.dm 2019-10-27 16:16:02 -07:00
deathride58
6cce995f77 Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE 2019-10-25 20:59:10 -04:00
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355)
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
2019-10-25 16:19:19 -05:00
kevinz000
5f75664350 Update shuttle.dm 2019-10-25 09:35:59 -07:00
Putnam
bb9b0ce312 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-10-24 22:38:33 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
deathride58
39794a1dd8 150 hours of testing 2019-10-23 15:21:18 -04:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Putnam
33232fba3a s 2019-10-22 00:45:30 -07:00
Putnam
d96976fc59 Added dynamic vote logging 2019-10-22 00:34:14 -07:00
Putnam
0a000f3165 Division by zero. 2019-10-21 01:05:18 -07:00
Putnam
770d95ce83 rename indifferent to balanced
also, remember ur spaces
2019-10-20 19:05:24 -07:00
Putnam
d1326398dd make extended vote majority instead of plurality 2019-10-20 19:00:22 -07:00
Putnam
933e4c5812 grammar 2019-10-20 18:57:25 -07:00
Putnam
07064298b0 Dynamic voting (draft) 2019-10-20 18:54:17 -07:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Ghommie
fce6f13471 Ports "Chat Subsystem ported from TerraGov-Marine-Corps" 2019-10-07 23:58:15 +02:00
Ghommie
31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Poojawa
0b00ffb4d0 Boosts NPC runtime priority
Doesnt' effect idle NPCs, but once they wake up. WEW
2019-10-06 00:00:27 -05:00
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00