shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

1605 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Poojawa
cbf74f63c8 Level Order listing 2019-10-29 00:00:48 -05:00
Ghommie
a2f9aaf899 Porting "Adjacent Atmos subsystem revival" 2019-10-28 17:04:31 +01:00
Ghommie
f54449bc7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-28 16:41:50 +01:00
kevinz000
78174fcc06 Update shuttle.dm 2019-10-27 16:16:02 -07:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01: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
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Linzolle
9250b1c103 big uppdate season 2019-10-23 21:08:47 -05:00