necromanceranne
b494aa3370
Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now
2020-04-07 17:51:25 +10:00
necromanceranne
60c8aab520
the damage_roll proc needs to always be before check_streak
2020-04-06 16:51:26 +10:00
necromanceranne
ff4847b441
Adds the damage roll into a proc checked on each of the harm, disarm and grab acts and before a combo is complete, and also checks for whether we are in combat mode, lying down or if the target is in combat mode
2020-04-06 15:01:59 +10:00
necromanceranne
35f96a1c24
Merge branch 'pawnch_2_the_pawnchening' of https://github.com/necromanceranne/Citadel-Station-13 into pawnch_2_the_pawnchening
2020-04-06 13:42:40 +10:00
necromanceranne
1c50192c12
further fixing stuff
2020-04-06 13:42:23 +10:00
necromanceranne
d1e77ab087
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:31:16 +10:00
necromanceranne
33a056b373
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:29:14 +10:00
necromanceranne
a6bd6d23fe
Some cleanup with help from rohesie, hopefully I figured it out
2020-04-06 12:28:14 +10: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
necromanceranne
38586c9d92
I feel like this is more fitting
2020-04-04 20:09:09 +11:00
necromanceranne
333a3f7c0c
This was also not the right way to do this so these values may be slightly stronger overall but will mean hitting with that second punch is all the more critical.
2020-04-04 19:49:22 +11:00
necromanceranne
4c051f70e8
fixes this too
2020-04-04 19:16:59 +11:00
necromanceranne
bd5446e906
NYOOPS
2020-04-04 18:21:18 +11:00
necromanceranne
fcb816675b
not only am I blind I am also dumb
2020-04-04 18:20:17 +11:00
necromanceranne
856eca772d
this is all still super broken
2020-04-04 18:05:02 +11:00
necromanceranne
7935eb8364
pretty sure this was brekaing stuff
2020-04-04 17:24:44 +11:00
necromanceranne
c6e82382a3
I feel like messing with this is basically unnecessary
2020-04-04 16:51:32 +11:00
necromanceranne
8af29a178c
Hooks up the chaplain null rod gloves to the choice of gloves
2020-04-04 16:42:37 +11: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
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
necromanceranne
923486eb43
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-04 13:40:34 +11: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
necromanceranne
0c46c151f9
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
2020-04-03 19:42:25 +11:00
