silicons
55608737fa
more..
2021-06-28 14:51:55 -07:00
silicons
711e250e26
AAAA
2021-06-28 14:18:56 -07:00
silicons
805b931fb8
config reorganize start
2021-06-28 13:35:52 -07:00
Fabian
63d910c79c
Merge branch 'master' into the-fuck-am-i-doing
2021-05-05 17:26:41 +02:00
silicons
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
SandPoot
1a7d33b801
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-27 11:41:32 -03:00
Putnam
899b94f0f3
Made threat a subsystem instead of dynamic-attached.
2021-03-24 23:44:37 -07:00
SandPoot
d789df5aa9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-20 18:15:07 -03:00
silicons
5b2a42f254
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-20 14:13:23 -07:00
GrayRachnid
5201cf6ac5
stops racism
2021-03-17 21:58:41 -04:00
silicons
5d51025ad6
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-15 14:39:16 -07:00
Fabian
91fc66e98d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into the-fuck-am-i-doing
2021-03-15 14:32:50 +01:00
Fabian
7e50d878ca
Merge branch 'master' into the-fuck-am-i-doing
2021-03-15 14:09:30 +01:00
SandPoot
86fdf94fa8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-12 15:03:06 -03:00
Putnam
25b021a343
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mode-chaos
2021-03-10 00:06:40 -08:00
Putnam
40dfd40bcd
Made it not weight almost entirely based on chaos.
2021-03-10 00:04:35 -08:00
SandPoot
ada4b94b14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-09 16:56:09 -03:00
silicons
9110ebcac1
Merge pull request #14375 from Putnam3145/repeated-mode-adjust-buff
...
Allows repeated mode adjust to be >100 total
2021-03-09 00:20:29 -07:00
SandPoot
20509121b8
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 ; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-08 14:07:57 -03:00
Putnam
5f6d478509
Added a "desired mode chaos" system
2021-03-07 20:14:11 -08:00
Putnam
a651b629c9
Allows repeated mode adjust to be >100 total
2021-03-07 19:28:50 -08:00
Fabian
8178b7073a
It's done, atleast the code is
2021-03-05 21:50:29 +01:00
Fabian
2f1aba4f80
Revert "i can't believe kevin made me code"
...
This reverts commit 7f38564838
2021-03-05 21:19:59 +01:00
Fabian
7f38564838
i can't believe kevin made me code
...
im taking severe offense to this
2021-03-05 19:55:53 +01:00
SandPoot
af6a8bdd5c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-03 12:05:27 -03:00
Letter N
754c24748e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-03 17:09:01 +08:00
silicons
519c694252
removes combat mode effects
2021-02-28 00:44:56 -07:00
silicons
70b8d833c0
changes
2021-02-28 00:00:14 -07:00
Letter N
7d39949a2f
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-19 12:38:32 +08:00
Letter N
3f40e353aa
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-16 19:41:53 +08:00
SandPoot
9d3f515120
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-02-15 11:20:49 -03:00
Lin
142be853dc
Merge pull request #14245 from silicons/sprint_staging
...
adds config entry for sprint removal that works prettier than just setting sprint speed to 0
2021-02-14 22:52:44 -06:00
SandPoot
e1e3ec8e9f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-02-14 19:08:22 -03:00
silicons
43174501de
final tweaks
2021-02-13 20:47:38 -07:00
silicons
d6a3c2d003
update
2021-02-13 20:30:44 -07:00
silicons
2ef33c5c88
sprint updates
2021-02-13 20:24:26 -07:00
Lin
b42ca71b00
Merge branch 'master' into virus_logging
2021-02-13 21:20:09 -06:00
silicons
61ab2a5a53
logging fixes
2021-02-13 19:47:17 -07:00
silicons
3b441bfd28
kay
2021-02-13 19:03:27 -07:00
Letter N
a2419f760a
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-12 13:18:09 +08:00
Letter N
3167dd8e22
atmos cc, cpl
2021-02-12 11:50:39 +08:00
Letter N
8a0c932d55
oops! All Refactors!
2021-02-12 11:07:58 +08:00
SandPoot
159f883e52
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-02-11 11:35:58 -03:00
Putnam
7a6ed7f500
Added a config to disallow unreadied players from voting on modes/storytellers
2021-02-08 22:59:49 -08:00
Letter N
125cd17cee
Merge remote-tracking branch 'origin/master' into rustsql
2021-01-20 15:40:41 +08:00
Drathek
2aea4bd969
Fix dangling parentheses breaking regex in hypnotic stupor ( #131 )
...
Added optional limits to how often a hypnotic stupor can apply a trance
(Cherry pick from [6f496bb] fixing config conflict with dogborg sleepers)
2021-01-12 07:56:41 -03:00
SandPoot
c79e8434cd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-08 11:31:10 -03:00
Drathek
dcd518d1a8
Borg belly tg UI ( #125 )
...
* Added TGUI for Dogborg sleepers again
Added resist chance and help intent struggle messages (to suggest maybe a different intent is required for escape)
Doubled dogborg sleepers cleaning cycle time
Tweaked dogborg sleepers messages and sounds
* Rebuild of TGUI (Discard if this conflicts and just rebuild TGUI)
* Added game_options config ENABLE_DOGBORG_SLEEPERS to determine whether recreational sleepers or normal sleepers should be added to dogborgs
* Moved ENABLE_DOGBORG_SLEEPERS flag to sandstorm config
2021-01-05 18:23:49 -03:00
Letter N
cd5d558fad
safety? what's that?
...
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
silicons
753c1389cc
fix
2020-12-26 22:04:05 -08:00
