Commit Graph

6298 Commits

Author SHA1 Message Date
Putnam
fa35c5128c Rebalancing bloodsuckers a tad 2019-12-29 18:09:23 -08:00
Trilbyspaceclone
4a5715e5ac Update belt.dm 2019-12-29 19:13:32 -05:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Putnam
68c9a371d9 Made story *purely* story, no extended-weighting 2019-12-29 10:56:48 -08:00
Seris02
b96bcf6eec tiny fix 2019-12-29 23:47:30 +08:00
Seris02
9b3654e4ff telescopic IVs 2019-12-29 23:26:53 +08:00
Seris02
a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00
Putnam
0ac0558417 balancing is good 2019-12-28 20:16:14 -08:00
Putnam
00c7d5a41d WOW THAT'S A BIG NUMBER 2019-12-28 19:40:31 -08:00
Ghom
f68d7fa1a3 Merge pull request #10328 from Putnam3145/dynamic-ghost-tweaks
Makes ghost cafe mobs actually a ghost role
2019-12-29 00:08:38 +01:00
Putnam
a0374f82e2 Made a line use the dang macro 2019-12-28 13:55:54 -08:00
Seris02
1ff7709765 all of the weh. 2019-12-29 00:12:25 +08:00
Seris02
7bde63dcc4 weh 2019-12-28 23:58:28 +08:00
Seris02
cd9966cd7a fixes the thing 2019-12-28 17:08:34 +08:00
Seris02
69d82338bc excludes certain ghost roles from being affected by health events 2019-12-28 16:46:50 +08:00
Seris02
4a2b7c2438 cocooooonuuuuuuts 2019-12-28 16:02:53 +08:00
Putnam
5174cb08a6 Made war ops always allowed on teamwork, chaotic 2019-12-27 22:45:06 -08:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
Lin
80daaacc86 Merge pull request #10268 from Ghommie/Ghommie-cit487
Effectively removes the old unused roboticist encryption key and headset.
2019-12-28 00:08:24 +00:00
Lin
be57c26acc Merge pull request #10289 from Ghommie/Ghommie-cit493
[s] fixes a little door assembly glass dupe exploit
2019-12-28 00:06:25 +00:00
Putnam
78f60df907 Brought the weight up on extended/chaotic 2019-12-27 15:58:17 -08:00
Ghom
13fc20c7c3 Merge pull request #10296 from Useroth/ghostcafe
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
2019-12-27 16:30:13 +01:00
Useroth
a3776fb966 Small touch-up. 2019-12-27 16:05:07 +01:00
Useroth
c3298d525f Good idea, tbh. 2019-12-27 15:57:49 +01:00
Ghom
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
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
Ghom
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
Ghom
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
Putnam
6058253dcf logging! 2019-12-24 20:20:27 -08:00
Putnam
124ea51c09 Revert "vote overhaul start"
This reverts commit 232811dd18.
2019-12-24 17:52:33 -08: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
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
Ghom
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