 Ghommie
|
b92da66f04
|
Fixing spellcasting and edge cases.
|
2020-04-06 17:32:51 +02:00 |
|
|
necromanceranne
|
eece94caf3
|
puts a pop cap on the various martial arts.
|
2020-04-07 00:28:09 +10:00 |
|
|
Trilbyspaceclone
|
cb1e6b518d
|
forgot to save last commit that fixes this
|
2020-04-06 08:50:37 -04:00 |
|
|
TrilbySpaceClone
|
2cd59a6fb0
|
that was easy
|
2020-04-06 08:40:34 -04:00 |
|
|
TrilbySpaceClone
|
bfa83591df
|
what if we made upgrading them more usfull
|
2020-04-06 07:35:36 -04:00 |
|
|
Artur
|
c402c6dc30
|
Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/
|
2020-04-06 13:24:52 +03:00 |
|
|
necromanceranne
|
60c8aab520
|
the damage_roll proc needs to always be before check_streak
|
2020-04-06 16:51:26 +10:00 |
|
|
Putnam
|
5f71efe07a
|
Adds a message to the AI to reconnect, since this is a common bug
|
2020-04-05 22:41:50 -07:00 |
|
|
Ghom
|
33fc3ce1e0
|
Update spell.dm
|
2020-04-06 07:05:33 +02: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 |
|
|
Trilbyspaceclone
|
2ba342aa1a
|
Update kitchen.dm
|
2020-04-05 23:11:25 -04: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 |
|
|
KathrinBailey
|
adeb61180c
|
big floof
|
2020-04-06 01:09:25 +01:00 |
|
|
Artur
|
f26f0c2555
|
Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix
|
2020-04-05 18:21:50 +03:00 |
|
|
Putnam
|
443af96126
|
Changed how scanners show organ damage.
|
2020-04-05 03:25:04 -07:00 |
|
|
Putnam
|
31f4269515
|
Makes miasma generate correctly, reverts previous pluox change.
|
2020-04-05 03:23:58 -07:00 |
|
|
Trilbyspaceclone
|
7ed168da7f
|
Update hivelord.dm
|
2020-04-05 03:05:41 -04:00 |
|
|
Putnam
|
1bf37dfb1b
|
Doubles pluoxium specific heat
|
2020-04-04 22:04:37 -07: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 |
|
|
TrilbySpaceClone
|
15d9c9f0ae
|
Revert "Revert "effort""
This reverts commit c3aaf27aa2.
|
2020-04-04 11:01:21 -04: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 |
|
|
Trilbyspaceclone
|
32b98cce44
|
rip funny commit
//We care about you Skyrats!
|
2020-04-04 10:38:11 -04:00 |
|
|
Trilbyspaceclone
|
99bf1da408
|
your to you
|
2020-04-04 10:37:37 -04:00 |
|
|
Kraseo
|
70859170c7
|
basically i fucking hate map merge conflicts
|
2020-04-04 16:32:45 +02:00 |
|
|
TrilbySpaceClone
|
c3aaf27aa2
|
Revert "effort"
This reverts commit 10ca01cc95.
|
2020-04-04 10:23:14 -04: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 |
|
|
TrilbySpaceClone
|
62509ab4a9
|
the mapping side
|
2020-04-04 10:16:43 -04: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 |
|
|
TrilbySpaceClone
|
10ca01cc95
|
effort
|
2020-04-04 09:30:24 -04:00 |
|
|
necromanceranne
|
cefd212a50
|
I hecc'd (#11739)
|
2020-04-04 14:59:10 +02:00 |
|
|
Ghom
|
e2d2f5a4ad
|
Update minesweeper.dm
|
2020-04-04 14:04:47 +02:00 |
|
|
Ghom
|
dc6eb8b6c7
|
Badcode Mini Nukes Fix.
|
2020-04-04 13:58:48 +02:00 |
|
|
Ghom
|
3c9a9136b5
|
Update minesweeper.dm
|
2020-04-04 13:46:21 +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 |
|
|
Trilbyspaceclone
|
31c7d70eb1
|
words are hard
|
2020-04-04 04:32:59 -04: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 |
|