Commit Graph

1164 Commits

Author SHA1 Message Date
Ghom
1babc75a69 Merge pull request #11818 from spookydonut/patch-1
Update spacemandmm to 1.4
2020-04-11 23:59:31 +02:00
Ghom
11fa208838 Merge pull request #11800 from Akrilla/changling-readapt
Fixes up changling readapting
2020-04-11 18:30:49 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Putnam3145
b939359e35 Made my choice thing actually... do something (#11787) 2020-04-10 18:16:19 +02:00
Arturlang
b40fb55539 Fixes mesmerzie and makes it work better (#11785)
* Weh

* Mesmerize works a lot nicer now
2020-04-10 15:41:35 +02:00
Akrilla
ec5db05bdc fixes up readapting 2020-04-10 03:18:13 +01:00
kevinz000
956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
Putnam3145
536934d1e2 Merge pull request #11770 from Kraseo/i-hate-slimes
The contractor pod now gives regen jelly instead of omnizine
2020-04-07 02:43:33 -07:00
Kraseo
f88d36addf quirky ass slime roundstart races 2020-04-07 01:12:21 +02:00
necromanceranne
33a056b373 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:29:14 +10:00
Ghom
dc6eb8b6c7 Badcode Mini Nukes Fix. 2020-04-04 13:58:48 +02:00
necromanceranne
71e19aead2 ports over my krav changes from tg and also hooked in pugilist gloves to summon equipment for cultists and gave all that shit a sprite ye 2020-04-04 16:29:29 +11:00
Lin
e8c33c411f Merge pull request #11723 from Ghommie/Ghommie-cit663
Fixing three runtime errors.
2020-04-04 02:53:18 +00:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616
Spellcasting element
2020-04-03 16:31:10 -07:00
Ghommie
58bc10bd31 Fixing three runtime errors. 2020-04-02 23:33:40 +02: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
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
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
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
Ghommie
c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
kevinz000
bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07: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
kevinz000
a6ca854e5c Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-22 15:07:41 -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
Ghommie
2045fb86f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-21 21:41:34 +01:00
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07: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
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
kevinz000
9bd275e430 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-16 13:47:53 -07:00
kevinz000
ceb3d39266 k 2020-03-16 12:51:30 -07:00
kevinz000
7a25e04324 bet 2020-03-16 11:15:11 -07:00
kevinz000
d3724d5fbd f 2020-03-16 10:59:34 -07:00
kevinz000
26ee02ef39 dab 2020-03-16 10:52:23 -07:00