Commit Graph

1522 Commits

Author SHA1 Message Date
kevinz000 d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
2020-04-25 17:05:38 -07:00
kevinz000 da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
Putnam 17f6099013 new clamp 2020-04-24 16:18:34 -07:00
Putnam 95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Putnam 54820f0ecb Made midround/latejoin come faster if no roundstarts 2020-04-21 21:54:28 -07:00
Putnam 1bd3d4ceab Some storyteller tweaks. 2020-04-21 21:50:51 -07:00
Putnam e70eb60d95 Nono, it's the MOB that voluntary ghosts. 2020-04-21 21:33:19 -07:00
Putnam 2ac9c70763 Makes storyteller changing actually work. 2020-04-21 21:33:03 -07:00
Putnam 44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghom 5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
kevinz000 791c3029a8 Merge pull request #11897 from DeltaFire15/gang-decon-message
Snitches now get stitches
2020-04-20 11:43:37 -07:00
Ghom 86d531890f Merge pull request #11882 from Putnam3145/fix-deleting-objectives
Makes objectives clean theirselves up properly
2020-04-18 01:20:02 +02:00
Artur eafc69aa65 Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
2020-04-17 16:22:15 +03:00
DeltaFire dcd112c379 Hm yes maybe no ratting out would be nice
What it says on the tin.
2020-04-17 13:34:34 +02:00
Putnam 87dd2681ca The locate isn't necessary 2020-04-16 08:30:55 -07:00
Putnam 368d801940 Makes objectives clean theirselves up properly. 2020-04-16 08:17:48 -07:00
Artur 2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Artur f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Ghom d0af60a2d3 Merge pull request #11817 from Putnam3145/dynamic-lings-2
More dynamic tweaks + dynamic latejoin changelings
2020-04-13 01:48:12 +02:00
kevinz000 d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
Ghom b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs
Eldritch Affairs
2020-04-12 20:47:19 +02:00
Putnam d65bda97c4 Fixing average threat weight calc 2020-04-10 20:14:54 -07:00
Putnam 093d2fdeb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-lings-2 2020-04-10 20:12:35 -07:00
Putnam f6e3a20f85 More tweaks 2020-04-10 20:12:15 -07:00
Putnam 7d043289e8 Tweaks 2020-04-10 17:13:41 -07:00
Artur fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Putnam3145 5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +02:00
Putnam 28f77af42e wow that's important 2020-04-07 05:50:00 -07:00
Putnam 43169aa9d4 Made teamwork also use recent weight. 2020-04-06 23:53:59 -07:00
Putnam bf8b4134b7 Added latejoin changelings. 2020-04-06 23:01:19 -07:00
Putnam d43e8052ad More threat swinging 2020-04-06 08:49:19 -07:00
Putnam3145 93feb0277a Further dynamic tweaks: "you can instamerge this time" edition (#11715)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

* Make roundstarts ignore current threat

It's not even calculated yet, so this is probably better.

* Minimum pop for chaotic/teamwork.

* More conveyance issues, removed superfluous threat costs

* More conveyance and tweaks

* Makes storyteller min players use all players instead of ready

* Lowered chaos weight with chaotic

* Blob now has correct cost

* Makes phylactery count for threat

* Makes random storyteller  have random threat level

* Made starting rulesets scale up with threat LEVEL

* Made "minor rulesets" never have lower weight

* Makes chaotic not forced.

* Made story about 25% less chaotic

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-04-03 14:23:08 +02:00
Artur 67f4319177 fixes burn regen and some tweaks 2020-04-03 01:52:08 +03:00
Ghommie 45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00
kevinz000 6bbc2c0db8 Merge pull request #11682 from Putnam3145/fix-sabotage
Sabotage objective tweaks
2020-03-31 18:02:24 -07:00
Putnam3145 658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676)
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
Artur a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
Putnam3145 e63dc08e66 More dynamic fixes, AKA if Ghommie keeps merging without telling me I will maybe get irate (#11688)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

* Make roundstarts ignore current threat

It's not even calculated yet, so this is probably better.

* Minimum pop for chaotic/teamwork.

* More conveyance issues, removed superfluous threat costs

* More conveyance and tweaks

* Makes storyteller min players use all players instead of ready

* Lowered chaos weight with chaotic

* Blob now has correct cost

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-31 13:10:59 +02:00
kevinz000 03d87f6bdc Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-29 20:44:49 -07:00
Ghommie c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Putnam 32b8af693d Makes AI-hacked-law sabotage only run if there's AI 2020-03-29 06:52:44 -07:00
Putnam 569d7aac6f Removes integrity sabotage 2020-03-29 06:52:21 -07:00
kevinz000 6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-28 16:00:48 -07:00
Putnam3145 8a620b0ebc More dynamic rework: help I wasn't done (#11642)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-28 14:46:37 +01:00
kevinz000 c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -07:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00