Commit Graph
6387 Commits
Author SHA1 Message Date
GhomandGitHub 5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
2019-12-27 13:27:04 +01:00
BlackMajor 4e1a9b83cf Pushing work for tonight. 2019-12-28 01:01:26 +13:00
Seris02 8ed4fe9c05 changes 2019-12-27 18:09:30 +08:00
Putnam d333a0225e Renamed "Classic" to "Random". 2019-12-26 18:08:10 -08:00
Useroth 35846c452a Applied suggestions and minor tweaks. 2019-12-26 20:03:43 +01:00
GhomandGitHub 12d0a2ee4c Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
2019-12-26 16:07:45 +01:00
GhomandGitHub 512d046f18 Merge pull request #10128 from Seris02/clownheadset
gives the clown a headset with a clown megaphone loudmode
2019-12-26 13:58:45 +01:00
Useroth cbff758d1a Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility. 2019-12-26 07:49:48 +01:00
Putnam 63112c2f49 while we're at it let's make it work for all of 'em 2019-12-25 18:30:25 -08:00
Putnam 5764ccef1b Allowed preventing dynamic storytellers if too common recently 2019-12-25 16:16:11 -08:00
Putnam 72cb63ae7e chaotic shouldn't have so many events 2019-12-25 14:23:47 -08:00
Putnam 27d8684d2d and a line break goes there 2019-12-25 00:26:24 -08:00
Putnam 95281ab590 Made ion storm not THE ONLY EVENT THAT WILL RUN ON STORY 2019-12-24 23:20:28 -08:00
Putnam c12c89e01d Added storyteller to dynamic game mode panel. 2019-12-24 23:20:18 -08:00
Putnam 5cd9edb37f also make weight adjustment round-to-round work, probs 2019-12-24 22:05:04 -08:00
Putnam f38d1ab218 better make that logging work 2019-12-24 22:04:43 -08:00
Ghommie 6a5a917944 [s] fixes a little door assembly glass dupe exploit 2019-12-25 07:00:53 +01:00
Ghommie 57cecd2499 work 2019-12-25 06:54:44 +01:00
Putnam 6058253dcf logging! 2019-12-24 20:20:27 -08:00
Ghommie 60134ea8ae [s] Fixes singularity pulls duping rods out of engine floors. 2019-12-25 03:34:42 +01:00
Putnam 124ea51c09 Revert "vote overhaul start"
This reverts commit 232811dd18.
2019-12-24 17:52:33 -08:00
Ghommie 53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Seris02 9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00
Hatterhat d1c96237a6 the very shitty idea: "muh speedloader" 2019-12-24 04:16:33 -06:00
Putnam 232811dd18 vote overhaul start 2019-12-23 22:43:54 -08:00
Putnam ea85a3e521 Storytellers do more things now 2019-12-23 22:09:29 -08:00
Ghommie d571bbd292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-24 00:07:32 +01:00
Ghommie e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
GhomandGitHub 9a022f21eb Merge pull request #10245 from r4d6/substationV2
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
2019-12-23 18:58:26 +01:00
r4d6 b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn""
This reverts commit d851beea16.
2019-12-23 10:25:37 -05:00
r4d6 d851beea16 Revert "Add the option to restrict the Engine that spawn"
This reverts commit e3e1f91635.
2019-12-23 10:23:55 -05:00
r4d6 e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
Ghommie 14c73b7d01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 14:21:08 +01:00
kevinz000andGitHub 1b9b54b33d Merge pull request #10267 from Ghommie/Ghommie-cit486
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
2019-12-23 00:44:42 -08:00
Putnam 13a8efe616 no assassination at all (!!) on calm 2019-12-23 00:43:25 -08:00
Ghommie b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Putnam dec97a26d5 renamed the storytellers and added secret to voting 2019-12-22 18:44:09 -08:00
Putnam 817787100f haha WHOOPS 2019-12-22 18:30:02 -08:00
Putnam 3ebfe67613 fixed overrefunds (again) 2019-12-22 10:28:57 -08:00
Putnam 86059aeb10 better logging for why candidates aren't working 2019-12-22 09:59:57 -08:00
Ghommie 4fbd9fdca0 Effectively removes the long unrequired roboticist encryption key. 2019-12-22 12:02:15 +01:00
Ghommie 8bc277d38d Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf. 2019-12-22 11:40:25 +01:00
TrilbySpaceClone c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Putnam 1c2fe646a4 better stats 2019-12-21 20:52:03 -08:00
Putnam d42ed1ca49 Added extended, deobfuscated, made "how many to vote" bigger 2019-12-21 12:52:35 -08:00
r4d6 383e09651f Suggestions 2019-12-21 14:55:37 -05:00
Ghommie 8c5e506a17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382 2019-12-21 18:22:58 +01:00
Ghommie 395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Putnam 32ec9d6f50 i believe they call this a "weh" 2019-12-21 08:36:00 -08:00