This website requires JavaScript.
d43e8052ad
More threat swinging
2020-04-06 08:49:19 -07:00
b92da66f04
Fixing spellcasting and edge cases.
2020-04-06 17:32:51 +02:00
eece94caf3
puts a pop cap on the various martial arts.
2020-04-07 00:28:09 +10:00
df277721d7
public mining is gone crab crab crab
2020-04-06 16:21:06 +02:00
cb1e6b518d
forgot to save last commit that fixes this
2020-04-06 08:50:37 -04:00
2cd59a6fb0
that was easy
2020-04-06 08:40:34 -04:00
bfa83591df
what if we made upgrading them more usfull
2020-04-06 07:35:36 -04:00
c402c6dc30
Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/
2020-04-06 13:24:52 +03:00
60c8aab520
the damage_roll proc needs to always be before check_streak
2020-04-06 16:51:26 +10:00
b7b752303b
Merge pull request #11757 from Citadel-Station-13/Ghommie-patch-1
2020-04-05 22:53:59 -07:00
5f71efe07a
Adds a message to the AI to reconnect, since this is a common bug
2020-04-05 22:41:50 -07:00
33fc3ce1e0
Update spell.dm
2020-04-06 07:05:33 +02:00
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
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
1c50192c12
further fixing stuff
2020-04-06 13:42:23 +10:00
2ba342aa1a
Update kitchen.dm
2020-04-05 23:11:25 -04:00
d1e77ab087
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:31:16 +10:00
33a056b373
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:29:14 +10:00
a6bd6d23fe
Some cleanup with help from rohesie, hopefully I figured it out
2020-04-06 12:28:14 +10:00
5108bf1fc3
Stuff about power (#11664 )
2020-04-05 19:26:14 -07:00
adeb61180c
big floof
2020-04-06 01:09:25 +01:00
8b46cb2866
Create job_changes.dm
2020-04-05 09:13:10 -07:00
f26f0c2555
Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix
2020-04-05 18:21:50 +03:00
443af96126
Changed how scanners show organ damage.
2020-04-05 03:25:04 -07:00
31f4269515
Makes miasma generate correctly, reverts previous pluox change.
2020-04-05 03:23:58 -07:00
7ed168da7f
Update hivelord.dm
2020-04-05 03:05:41 -04:00
1bf37dfb1b
Doubles pluoxium specific heat
2020-04-04 22:04:37 -07:00
956c2a57bf
Merge pull request #11729 from Ghommie/Ghommie-cit666
2020-04-04 19:19:25 -07:00
09c8bd40ec
Merge pull request #11575 from EmeraldSundisk/coggers
2020-04-04 13:18:07 -05:00
15d9c9f0ae
Revert "Revert "effort""
2020-04-04 11:01:21 -04:00
ed52038dda
Merge pull request #11703 from Kraseo/public-tyranny
2020-04-04 07:39:13 -07:00
32b98cce44
rip funny commit
2020-04-04 10:38:11 -04:00
99bf1da408
your to you
2020-04-04 10:37:37 -04:00
70859170c7
basically i fucking hate map merge conflicts
2020-04-04 16:32:45 +02:00
c3aaf27aa2
Revert "effort"
2020-04-04 10:23:14 -04:00
09a5e234d3
Merge pull request #11716 from kiwedespars/lightpink-nerf
2020-04-04 07:22:47 -07:00
62509ab4a9
the mapping side
2020-04-04 10:16:43 -04:00
4baaed1900
Merge pull request #11733 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimist-1.2.3
2020-04-04 07:16:39 -07:00
adad236997
Merge pull request #11728 from Citadel-Station-13/Ghommie-patch-1
2020-04-04 07:16:20 -07:00
2a2234483f
Merge pull request #11727 from Putnam3145/vore-pacifist-fix
2020-04-04 07:15:54 -07:00
5e961e5e43
Merge pull request #11711 from Arturlang/skateboards_cool_again
2020-04-04 07:15:29 -07:00
886f0d7500
Merge pull request #11726 from Ghommie/Ghommie-cit665
2020-04-04 07:11:02 -07:00
9a0f0cab65
Merge pull request #11724 from Ghommie/Ghommie-cit664
2020-04-04 07:10:24 -07:00
10ca01cc95
effort
2020-04-04 09:30:24 -04:00
cefd212a50
I hecc'd (#11739 )
2020-04-04 23:59:10 +11:00
e2d2f5a4ad
Update minesweeper.dm
2020-04-04 14:04:47 +02:00
dc6eb8b6c7
Badcode Mini Nukes Fix.
2020-04-04 13:58:48 +02:00
3c9a9136b5
Update minesweeper.dm
2020-04-04 13:46:21 +02:00
38586c9d92
I feel like this is more fitting
2020-04-04 20:09:09 +11:00
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
31c7d70eb1
words are hard
2020-04-04 04:32:59 -04:00
4c051f70e8
fixes this too
2020-04-04 19:16:59 +11:00
70cd562b36
Merge pull request #11720 from Trilbyspaceclone/patch-328
2020-04-04 01:02:32 -07:00
bd5446e906
NYOOPS
2020-04-04 18:21:18 +11:00
fcb816675b
not only am I blind I am also dumb
2020-04-04 18:20:17 +11:00
856eca772d
this is all still super broken
2020-04-04 18:05:02 +11:00
7935eb8364
pretty sure this was brekaing stuff
2020-04-04 17:24:44 +11:00
c6e82382a3
I feel like messing with this is basically unnecessary
2020-04-04 16:51:32 +11:00
8af29a178c
Hooks up the chaplain null rod gloves to the choice of gloves
2020-04-04 16:42:37 +11:00
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
1987cc56a2
Merge pull request #11712 from Ghommie/Ghommie-cit661
2020-04-03 21:58:58 -07:00
010ddb2bfb
Merge pull request #11706 from Ghommie/Ghommie-cit660
2020-04-03 21:55:16 -07:00
48f458cddb
Update uplink_devices.dm
2020-04-04 00:09:02 -04:00
45892cef79
Update science.dm
2020-04-03 23:33:15 -04:00
e8c33c411f
Merge pull request #11723 from Ghommie/Ghommie-cit663
2020-04-04 02:53:18 +00:00
09e50d70e4
Bump minimist from 1.2.2 to 1.2.3 in /tgui
2020-04-04 02:49:27 +00:00
923486eb43
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-04 13:40:34 +11:00
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
2020-04-03 16:31:10 -07:00
12d78dd7d8
Merge pull request #11329 from Ghommie/Ghommie-cit601
2020-04-03 16:30:47 -07:00
57fe91fafb
Merge pull request #11596 from Feasel/patch-4
2020-04-03 16:30:30 -07:00
f735a2319a
it (#11721 )
2020-04-03 18:47:18 -04:00
56669f9296
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-04 00:22:18 +02:00
baa320d16f
Add files via upload
2020-04-03 12:38:26 -07:00
9d97f1acda
Ports the VV Refactor by Kevinz.
2020-04-03 19:16:43 +02:00
598179553e
Changes making cablecuffs to using cable in your hand, instead of a menu. (#11702 )
2020-04-03 19:34:26 +03:00
a9ea7be699
Update dwarves.dm
2020-04-03 18:21:38 +02:00
1b8b3f28c3
Update reagent_dispenser.dm
2020-04-03 18:18:12 +02:00
150c0769ad
Update reagent_dispenser.dm
2020-04-03 15:54:48 +02:00
50ec842752
Update reagent_dispenser.dm
2020-04-03 15:53:09 +02:00
0919737c21
fixes shadow emission (#11713 )
2020-04-03 13:23:24 +01:00
93feb0277a
Further dynamic tweaks: "you can instamerge this time" edition (#11715 )
2020-04-03 05:23:08 -07:00
c5b55826b5
Punches land with the same consistency across races, punches cheaper, king hits are nastier (#11707 )
2020-04-03 23:19:40 +11:00
3365466db7
Couplea fixes to the previous tweak
2020-04-03 02:25:16 -07:00
d398c5276c
Also made all these "else ifs" into a "switch"
2020-04-03 01:59:48 -07:00
492546c05c
Pacifist digestion checks are elsewhere anyway
2020-04-03 01:53:35 -07:00
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
7da4ad5694
Damned title doesnt want to show up
2020-04-03 10:29:07 +03:00
37b6aa9897
Update dwarves.dm
2020-04-03 05:31:37 +02:00
4ef42ba6b1
Dwarfy message spam QoL.
2020-04-03 05:16:17 +02:00
b37dc1e322
Merge branch 'punch' into pawnch_2_the_pawnchening
2020-04-03 14:02:42 +11:00
e1a013bcb2
I'm tired okay
2020-04-03 11:30:00 +11:00
c481db2bfd
nearly added instastun king hits, now stun punches are more rng
2020-04-03 11:25:29 +11:00
d74f5dcec5
Merge pull request #11717 from PersianXerxes/oopsPHManBad
2020-04-02 16:55:45 -07:00
f26a9b948c
pawnch harder get tired less this is a balance change now I guess
2020-04-03 10:50:26 +11:00
991f73893f
Fuck me im tired
2020-04-03 02:00:41 +03:00
67f4319177
fixes burn regen and some tweaks
2020-04-03 01:52:08 +03:00
1c81c8676b
Stops alopecia.
2020-04-03 00:33:38 +02:00
5a63eba57a
Stops a monky trick with mob holders.
2020-04-03 00:23:58 +02:00
58bc10bd31
Fixing three runtime errors.
2020-04-02 23:33:40 +02:00
6b3de998c0
remove noreact from being used in plants
2020-04-02 21:18:27 +01:00
Putnam