Commit Graph

21114 Commits

Author SHA1 Message Date
Timothy Teakettle
aabcfb580b discounts rerolling is bad 2020-04-06 19:49:06 +01:00
Timothy Teakettle
864f9b3244 except this times its in the right order 2020-04-06 18:59:48 +01:00
Timothy Teakettle
e8002ee449 imagine if it compiled and was less bad 2020-04-06 17:45:19 +01:00
Timothy Teakettle
3b322b9f7c population locked uplink items use current population
yay?
2020-04-06 17:34:34 +01:00
Trilbyspaceclone
faf199fc35 Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking (#11747)
* Update security.dm

* Update civilian_service.dm

* why is their so many more lines of the same code here?

* Update rnd.dm

* clears up sec file so that they all use a base

* Update curator.dm
2020-04-06 17:53:43 +02:00
Ghom
33fc3ce1e0 Update spell.dm 2020-04-06 07:05:33 +02:00
Putnam3145
5108bf1fc3 Stuff about power (#11664)
* Overhauled how APCs work, I guess

* Makes cells drain like before
2020-04-06 04:26:14 +02:00
kevinz000
956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666
Ports the VV Refactor by Kevinz.
2020-04-04 19:19:25 -07:00
nik707
09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers
as of yet unfinished, being added in the background for ease of further development
2020-04-04 13:18:07 -05:00
kevinz000
ed52038dda Merge pull request #11703 from Kraseo/public-tyranny
Removes public mining from the game
2020-04-04 07:39:13 -07:00
Kraseo
70859170c7 basically i fucking hate map merge conflicts 2020-04-04 16:32:45 +02:00
kevinz000
09a5e234d3 Merge pull request #11716 from kiwedespars/lightpink-nerf
stabilized lightpink nerf - stabilized purple buff
2020-04-04 07:22:47 -07:00
kevinz000
adad236997 Merge pull request #11728 from Citadel-Station-13/Ghommie-patch-1
What was I hoping for again?
2020-04-04 07:16:20 -07:00
kevinz000
2a2234483f Merge pull request #11727 from Putnam3145/vore-pacifist-fix
Makes pacifists able to vore properly
2020-04-04 07:15:54 -07:00
kevinz000
5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again
Buffs skateboards
2020-04-04 07:15:29 -07:00
kevinz000
886f0d7500 Merge pull request #11726 from Ghommie/Ghommie-cit665
Dwarfy message spam QoL.
2020-04-04 07:11:02 -07:00
kevinz000
9a0f0cab65 Merge pull request #11724 from Ghommie/Ghommie-cit664
Stops one of the many monkey tricks with mob holders.
2020-04-04 07:10:24 -07:00
necromanceranne
cefd212a50 I hecc'd (#11739) 2020-04-04 14:59:10 +02:00
kevinz000
1987cc56a2 Merge pull request #11712 from Ghommie/Ghommie-cit661
Porting the mutation conflict system, and resizing quantum realm fix.
2020-04-03 21:58:58 -07:00
kevinz000
010ddb2bfb Merge pull request #11706 from Ghommie/Ghommie-cit660
Minesweeper armageddon improvements
2020-04-03 21:55:16 -07: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
kevinz000
12d78dd7d8 Merge pull request #11329 from Ghommie/Ghommie-cit601
Made laser carbines and magrifles bulkier.
2020-04-03 16:30:47 -07:00
kevinz000
57fe91fafb Merge pull request #11596 from Feasel/patch-4
[Balance Pass] - Stunbaton (Because no one wants to do a single line …
2020-04-03 16:30:30 -07:00
Ghommie
9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +02:00
Arturlang
598179553e Changes making cablecuffs to using cable in your hand, instead of a menu. (#11702)
* There we go

* Ghommie suggestions
2020-04-03 18:34:26 +02:00
Ghom
a9ea7be699 Update dwarves.dm 2020-04-03 18:21:38 +02:00
Ghom
1b8b3f28c3 Update reagent_dispenser.dm 2020-04-03 18:18:12 +02:00
Ghom
150c0769ad Update reagent_dispenser.dm 2020-04-03 15:54:48 +02:00
Ghom
50ec842752 Update reagent_dispenser.dm 2020-04-03 15:53:09 +02:00
Timothy Teakettle
0919737c21 fixes shadow emission (#11713) 2020-04-03 14:23:24 +02: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
necromanceranne
c5b55826b5 Punches land with the same consistency across races, punches cheaper, king hits are nastier (#11707)
* I think everyone should be landing punches now.

* brawling just got mathematical?

* pawnch harder get tired less this is a balance change now I guess

* nearly added instastun king hits, now stun punches are more rng

* I'm tired okay
2020-04-03 14:19:40 +02:00
Putnam
3365466db7 Couplea fixes to the previous tweak 2020-04-03 02:25:16 -07:00
Putnam
d398c5276c Also made all these "else ifs" into a "switch" 2020-04-03 01:59:48 -07:00
Putnam
492546c05c Pacifist digestion checks are elsewhere anyway 2020-04-03 01:53:35 -07:00
Ghom
37b6aa9897 Update dwarves.dm 2020-04-03 05:31:37 +02:00
Ghommie
4ef42ba6b1 Dwarfy message spam QoL. 2020-04-03 05:16:17 +02:00
Ghommie
1c81c8676b Stops alopecia. 2020-04-03 00:33:38 +02:00
Ghommie
5a63eba57a Stops a monky trick with mob holders. 2020-04-03 00:23:58 +02:00
Ghommie
58bc10bd31 Fixing three runtime errors. 2020-04-02 23:33:40 +02:00
Putnam3145
ede3379a87 Merge pull request #11719 from Ghommie/Ghommie-cit662
Intellectual property infringment is not cool.
2020-04-02 06:18:41 -07:00
Ghommie
e50fe8b061 Removing a trademark from the game. 2020-04-02 14:48:43 +02:00
kiwedespars
9b6cd54abf there's an extra space and it bugged me im sorry 2020-04-02 00:35:38 -07:00
kiwedespars
eeccea989c purple nerf - light pink gets epi back 2020-04-02 00:34:44 -07:00
kiwedespars
d9e8db8a6c Update _status_effects.dm 2020-04-01 23:31:51 -07:00
Putnam3145
736ef2cb7c Merge pull request #11705 from Ghommie/Ghommie-cit659
It's past midnight, time for your runtime errors fixing.
2020-04-01 23:16:29 -07:00
Putnam3145
a9bfe00302 Merge pull request #11701 from Ghommie/Ghommie-cit657
Massive megafauna buff.
2020-04-01 20:54:32 -07:00
Ghommie
519ebd5ed8 Porting the mutation conflict system, and resizing quantum realm fix. 2020-04-01 15:29:35 +02:00
Artur
65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00