Commit Graph

1142 Commits

Author SHA1 Message Date
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
877b7f699e Update syndicate_contract.dm 2020-03-29 23:40:52 -07:00
kevinz000
0cee7c9675 Merge pull request #11660 from deathride58/fuckcontractors
Quick and dirty PR to make contractor targets actually show up in the traitor panel
2020-03-29 20:42:43 -07:00
deathride58
d1d090ae6f adds a length check for if the assigned targets list spontaneously deletes itself 2020-03-29 11:54:49 -04: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
deathride58
354ca22c9a Makes contractor targets actually show up in the traitor panel 2020-03-28 00:28:44 -04:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Artur
75c4e8b19a What the fuck travis 2020-03-27 10:17:42 +02:00
Lin
76e4d0e0db Merge pull request #11622 from Ghommie/Ghommie-cit643
Antags such as wizard and nuke ops are now flavorless. Also closet megafauna fix.
2020-03-26 18:06:50 -05:00
Artur
9db779ddc6 Else if chain ahoy 2020-03-26 23:38:25 +02:00
kevinz000
b32e6c3b5b Merge pull request #11607 from Ghommie/Ghommie-cit642
Adds privates visibility preferences. Also underwear now fulfills its purpose.
2020-03-26 13:24:26 -07:00
Ghommie
36d5d5e141 Antagonists such as wizard and nuke ops are now more anonymous. 2020-03-25 23:33:50 +01:00
kevinz000
f41e5655d8 Merge pull request #11592 from Ghommie/Ghommie-cit639
Fixing an inconsistency with nuclear bombs exploding on station level space.
2020-03-25 12:19:15 -07:00
Artur
4c4b1b340b might as well fix the regen core name and a few tweaks. 2020-03-25 20:24:54 +02:00
Artur
2546de3ee2 This is not neccesary 2020-03-25 19:45:40 +02:00
Artur
7d22cb00d0 Mixes and fixes 2020-03-25 19:32:46 +02:00
Putnam3145
3d8084709b A dynamic rework: target threat levels (#11515)
* 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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 17:40:37 +01:00
Artur
fdc6a02eea Hm 2020-03-25 12:46:42 +02:00
Ghommie
c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
Artur
9bb7529a49 Progress 2020-03-24 16:55:46 +02:00
Artur
c6a8515297 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-24 12:36:21 +02:00
Ghommie
97ad47f3fd Fixing an inconsistency with nuclear bombs exploding on station level space. 2020-03-23 22:40:02 +01:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
kevinz000
ddd00b1981 Merge pull request #11572 from DeltaFire15/clockies-vanguardstam
Clockie Vanguard Spell - rebalance for stamcombat
2020-03-23 10:37:42 -07:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549)
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
2020-03-22 13:02:23 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
DeltaFire
513c499dec Vanguard: 30 stamregen / second, 50% stamlossfeedback
Modifies vanguard to actually fit into a combat system with stamina, since it didn't have any real thing for stamregen despite explicitly stating it caused increased stamregen. Incredible.
2020-03-22 00:44:59 +01:00
Putnam3145
9523954c4d Rewrote waffle traitor flavor text (#11539)
* Rewrote waffle flavor text

* and not in custody
2020-03-20 15:47:46 +01:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628
More bug reports yee'd their last haw.
2020-03-19 18:56:32 -07:00
Artur
e439c2231d fIXE 2020-03-19 17:47:21 +02:00
Seris02
ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520)
* yeet gone

* pfft oof

* oof
2020-03-19 13:40:11 +01:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
Artur
ba972cf0eb Argh 2020-03-18 22:41:21 +02:00
kevinz000
2139bfdb5f Merge pull request #11290 from Putnam3145/traitor-types
Traitor classes: a new paradigm.
2020-03-15 01:35:30 -07:00
Kraseo
d34d46f00d i think you're a thief cause you stole my heart, stole my heart, trapped my soul like azura's star (#11461) 2020-03-15 04:03:50 +01:00
kevinz000
a21458bba6 Merge pull request #11437 from keronshb/BlobBuffPort
Ports Blob Buffs
2020-03-14 09:10:54 -07:00
Putnam3145
d9dc91db1a More dynamic fixes (#11451)
* Fixed wizard, malf AI

* changed memes typename to story

* Fixed a bunch of really weird execute/ready confusion

* Added dynamic requirement to wands.
2020-03-14 02:49:25 +01:00
Putnam
b1a94f7667 Made hijack, martyr more common 2020-03-12 15:05:53 -07:00
Putnam
ae94083dbe Added more explanation to hijack. 2020-03-12 14:59:04 -07:00
Ghom
9e3a3dddfd Merge pull request #11429 from Putnam3145/dynamic-tweaks
Dynamic tweaks/fixes
2020-03-12 14:20:28 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
keronshb
148e935c41 Fixes jump to node
ports this fix too
2020-03-11 17:39:08 -04:00
keronshb
f5d2a04833 Ports Blob Buffs
Ports blob buffs from TG
2020-03-11 17:33:27 -04:00
Putnam
8db3a3ced4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-tweaks 2020-03-11 02:17:16 -07:00
Putnam
621ea62d64 Added swarmers, portal storm, wormholes to dynamic. 2020-03-10 23:21:47 -07:00
kevinz000
0791f22b62 Merge pull request #10702 from Ghommie/Ghommie-cit528
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
2020-03-10 17:24:48 -07:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00