Commit Graph

2776 Commits

Author SHA1 Message Date
silicons
633591b81e Merge pull request #14688 from SandPoot/good-tooltips
Makes tooltips good and creates a base for adding more.
2021-05-07 18:41:22 -06:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
Timothy Teakettle
ac504d679b digi humans 2021-04-30 14:07:44 +01:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons
f0c2188c5f Merge pull request #14443 from necromanceranne/baton_change_pr
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
2021-04-20 05:52:59 -06:00
silicons
74280ed082 Merge pull request #14582 from BlueWildrose/slimeorgans
Slimeperson organs are now unique with a unique name, therefore confusing people
2021-04-18 19:02:53 -06:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons
f998efa7bc Merge pull request #14551 from BlueWildrose/ThePuddler2
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00
silicons
bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies
Fixes some lizards
2021-04-08 03:22:46 -06:00
Blue Wildrose
cd81345e9f Polishing up the new slimeperson organs also WHY IS THE SLIMEBRAIN SPRITE GONE 2021-04-07 15:00:09 -07:00
Blue Wildrose
3cf25a8cc7 Slimeperson organs are now more confusing 2021-04-06 23:10:23 -07:00
Blue Wildrose
1dac10b1ec Might as well have it show halo stuff while puddling too 2021-04-01 04:43:18 -07:00
Blue Wildrose
b363cdd5ca fixes puddles, cultism checks, spellchecks 2021-04-01 04:29:35 -07:00
SandPoot
df4779dced upload files 2021-03-29 22:26:34 -03:00
necromanceranne
45340ef1ac Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed. 2021-03-25 09:27:33 +11:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
Lin
79beaa97eb Merge pull request #14481 from BlueWildrose/ewwghostpuddles
Nightmares' light eater can now destroy messes that emit light
2021-03-23 16:33:59 -05:00
Hatterhat
722b50088a message tweak
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-03-21 19:26:34 -05:00
Hatterhat
a8e4466476 sigh 2021-03-21 18:16:22 -05:00
silicons
295255e46e Merge pull request #14405 from Arturlang/vampire_death
Makes vampries dust when they can't pay the blood cost, not before
2021-03-20 14:31:14 -06:00
silicons
af540ba4ef Merge pull request #14469 from timothyteakettle/puddles-2-electric-boogaloo
fixes puddles breaking
2021-03-20 14:30:10 -06:00
Blue Wildrose
c02f35a7e5 Glowing goo be gone 2021-03-20 11:29:15 -07:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
Timothy Teakettle
71d5528959 fix 2021-03-18 21:50:03 +00:00
silicons
e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
Artur
fe218150f0 Literally just adds targets to give because i forgot to do that 2021-03-16 11:48:21 +02:00
DeltaFire
79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
Artur
6f6eedb92c tweaks vampires not to die from bloodloss 2021-03-16 06:47:39 +02:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Artur
afee437890 Fixes statpanel spans too 2021-03-10 23:18:45 +02:00
Artur
0f9754840c wrong way, whoops 2021-03-10 23:04:16 +02:00
Artur
d646b7535c Makes vampries dust when they can't pay the blood cost, not before 2021-03-10 22:31:53 +02:00
kiwedespars
01b026f889 trailing newlines 2021-03-09 12:53:53 -08:00
kiwedespars
3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars
3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Dan-Neposh
e29606e5f3 addresses code suggestions from Deltafire 2021-03-07 20:47:07 -05:00
Letter N
4463fd9513 paperwork mini update, also ASS_BLAST_USA 2021-03-06 19:28:29 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
c23db5daee Merge pull request #14327 from qweq12yt/pacifist-zombo-fix
fixes pacifist zombies
2021-03-01 18:26:16 -07:00
qweq12yt
d89bc85ae7 oops forgot a "/"
it could happen to anyone
2021-02-27 19:26:29 -03:00
qweq12yt
6d5afe146c restores any removed quirks when unchanging 2021-02-27 19:17:12 -03:00
qweq12yt
d8d2a5d4c4 using quirk susbsysten instead of trats 2021-02-27 15:56:44 -03:00
qweq12yt
04d478bb20 turning removes pacifism 2021-02-27 01:49:56 -03:00
silicons
9e6fb3a310 Merge pull request #14281 from kiwedespars/undo-what-has-been-done
parrying nerf/pugilism buff
2021-02-26 13:36:09 -07:00
silicons
0939e31982 Merge pull request #14283 from Hatterhat/patch-1
buhhh lingfist nerf 3am webedit
2021-02-26 13:36:01 -07:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd
More arousal logging; adds back aphro/nympho
2021-02-21 14:50:32 -07:00
Hatterhat
1eb2d3dd93 buhhh lingfist nerf 2021-02-21 02:58:19 -06:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00