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
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
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
SandPoot
b28fce9ebb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-10-28 13:36:59 -03:00
Timothy Teakettle
0fa83322a1
re-add slow stride but it defaults to disabled
2020-10-26 20:40:11 +00:00
Timothy Teakettle
4e6146898c
fixes/config edits
2020-10-26 20:27:58 +00:00
Timothy Teakettle
2b00f2bb2f
config values
2020-10-26 20:27:02 +00:00
Putnam
558d11bc73
Stringified the vote #defines for easier config stuff
2020-10-18 14:49:43 -07:00
SandPoot
cdbf96c70d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-15 13:47:29 -03:00
silicons
c3cdeb0507
fixes movespeed configurations ( #13555 )
...
* Update config_entry.dm
* Update game_options.dm
* Update config_entry.dm
* Update code/controllers/configuration/config_entry.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-10-15 13:53:21 +02:00
SandPoot
8aad78b784
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-11 02:44:06 -03:00
silicons
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
SandPoot
273ad286d5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-10 14:43:38 -03:00
silicons
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
silicons
1b1efce556
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-06 17:11:21 -07:00
Enric Gabriel
7df07d2859
Merge branch 'master' of upstream into master
2020-10-01 12:49:01 -03:00
silicons
b7650f3dea
Merge pull request #13398 from timothyteakettle/wound-config
...
wound config values, wound bonus for how damaged a limb is
2020-10-01 03:02:35 -07:00
silicons
822f1c9bf3
fix
2020-09-27 03:07:51 -07:00
silicons
2dddb2253e
tweak
2020-09-21 21:03:28 -07:00
silicons
4ab064a50d
fix
2020-09-21 20:58:33 -07:00
silicons
31791df2bd
fixes
2020-09-21 20:38:43 -07:00
silicons
2c4dc4d1a9
ok
2020-09-21 19:08:21 -07:00
silicons
ddc7f10de7
fixes
2020-09-21 18:35:42 -07:00
silicons
7249fe058f
config based
2020-09-21 17:36:30 -07:00
Enric Gabriel
4de9baf690
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-21 14:10:28 -03:00
