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
a651b629c9
Allows repeated mode adjust to be >100 total
2021-03-07 19:28:50 -08: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
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
silicons
a6ae0fe5c2
ok
2020-12-26 20:56:48 -08:00
silicons
bfb3d087c3
ok
2020-12-26 20:50:28 -08:00
silicons
dafc6bf89f
fix
2020-12-26 20:41:21 -08:00
silicons
5e66e4509f
wew
2020-12-25 16:07:17 -08:00
SandPoot
766493cc16
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-12-22 18:03:33 -03:00
DeltaFire
d3f30d21cf
Merge pull request #13772 from silicons/respawn_system_2
...
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons
7da6979b54
ok
2020-12-21 00:28:03 -07:00
silicons
ce10278c5a
changes
2020-12-20 19:25:49 -07:00
Putnam
4e6abdec74
i wish we both die
2020-12-19 20:51:58 -08:00
Putnam
c47761fa58
Added a DYNAMIC_THREAT_BASELINE config option.
...
why didn't i do this sooner
2020-12-19 19:30:16 -08:00
Putnam
f209fec1ee
oh, that's why extended is there
2020-12-18 22:19:40 -08:00
Putnam
5e8f76792e
Readjusted weight; added min/max config options
2020-12-18 20:24:30 -08:00
silicons
e87cc27803
modifications
2020-12-15 07:21:06 -07:00
silicons
45a7c68da1
wow
2020-12-11 15:05:00 -07:00
SandPoot
e21c089e20
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-11-27 18:43:19 -03:00
Putnam
cdcba275d7
Makes dynamic no longer show none in the vote.
2020-11-24 01:13:41 -08:00
SandPoot
01dc62502a
Roundstart pings ( #106 )
2020-11-21 16:17:17 -03:00
SandPoot
529cea6698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-11-08 18:10:47 -03:00
LetterJay
10c90e06c1
Merge pull request #13661 from timothyteakettle/age-verification
...
adds in-game age verification as an alternative to access requests
2020-11-08 11:07:05 -06:00
SandPoot
b77a18d6c5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-11-07 13:03:03 -03:00
silicons
77a1bdba0c
Merge pull request #13630 from timothyteakettle/short-tall-quirks
...
character size scaling
2020-11-07 00:19:29 -07:00
Timothy Teakettle
e2ca7164b9
age verification
2020-11-06 21:00:14 +00:00
