Commit Graph

18409 Commits

Author SHA1 Message Date
kiwedespars 96c2cf2676 fixes marks
- marks are no longer set by the blade and detonated by the hand, outside of flesh
- fixed it so sickles can no longer be used by nonheretics, again, needs testing for heretic minions (ghouls)
2021-03-13 19:04:09 -08:00
kiwedespars 8f1715704d Merge branch 'master' into void-but-for-real 2021-03-12 23:58:49 -08:00
kiwedespars 69d927e756 Merge branch 'master' into void-but-for-real 2021-03-12 23:10:19 -08:00
silicons 5a9fc99aba Merge pull request #14310 from Hatterhat/robo-surgery
[READY] robo-limb surgery tiers
2021-03-12 19:40:02 -07:00
silicons 9d48fba839 Merge pull request #14410 from Adelphon/hair
new hair/sprite fix
2021-03-12 19:35:47 -07:00
Lin 9a16375e0b Merge pull request #14403 from Hatterhat/brped-desc
fixes the BRPED desc that has been quirky! for years
2021-03-12 14:30:02 -06:00
kiwedespars 307bff2833 better sound 2021-03-12 03:28:50 -08:00
kiwedespars 56b0a49902 brain is like monkey, it forgets the newlines 2021-03-11 21:32:11 -08:00
kiwedespars e145bdafe8 adds domain expansion
- adds domain expansion, final spell for void heretics
- makes clap1 into an emote
- makes cleave a little more enticing with two guaranteed critical wounds and brute damage
- buffs void mark
2021-03-11 21:26:58 -08:00
Hatterhat 48de811919 fucking finally holy shit 2021-03-11 19:10:23 -06:00
silicons 753d79be69 Update boss.dm 2021-03-11 05:54:36 -07:00
kiwedespars e14741d248 i accidentally overwrote this, fixes logging. 2021-03-10 21:44:21 -08:00
kiwedespars e80bda7b5a makes void blade a little easier to get 2021-03-10 21:39:04 -08:00
kiwedespars 5ce42584b2 void tp effect, sound changes 2021-03-10 21:16:08 -08:00
kiwedespars 6dbeafeb9e goodbye eldritch blade 2021-03-10 17:04:10 -08:00
Adelphon 56cccc2ca3 new hair 2021-03-10 18:14:07 -05:00
kiwedespars 4e9cb47f68 more influences 2021-03-10 14:22:20 -08:00
silicons 3292e3a725 Merge pull request #14393 from Auris456852/master
Corrects Hexacamphor
2021-03-10 14:02:35 -07:00
Hatterhat 6a7d4e32d7 i'm gonna fight blackmajor over this 2021-03-10 13:55:00 -06:00
silicons 939a493334 Merge pull request #14306 from Putnam3145/supernova
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
silicons 03fbb256e4 Merge pull request #14371 from Sneakyrat6/matContainer
Material container fixes
2021-03-10 01:31:51 -07:00
silicons 0db0612e56 Merge pull request #14383 from Literallynotpickles/no-more-triple-paramedic
Removes one paramedic slot
2021-03-09 23:26:53 -07:00
Lin 1216a6edc5 Merge pull request #14381 from LetterN/patch-5
fixes drone inventory deleting stuff
2021-03-09 22:45:02 -06:00
silicons 41b75c8eb9 Merge pull request #14379 from necromanceranne/too_many_limbs
Fixes being able to go over the defined limit of roundstart prosthetics
2021-03-09 21:39:41 -07:00
Auris456852 8334e8c2c0 Corrects Hexacamphor 2021-03-10 00:35:00 +02:00
kiwedespars 01b026f889 trailing newlines 2021-03-09 12:53:53 -08:00
kiwedespars b868f5fc32 whoops forgot sac targets list 2021-03-09 12:49:02 -08:00
kiwedespars 3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars 0d696de7cd exist
- fixes things.
- user check readded (whoops)
- knwoledge added
- nerfs madness mask
2021-03-09 12:12:44 -08:00
kiwedespars 3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Sneakyrat6 d5b0251cb5 Merge branch 'master' into matContainer 2021-03-09 05:42:47 -05:00
silicons 3693eb1f16 Merge pull request #14374 from SandPoot/don't-litter-please
Makes it so you don't drop cans upon crushing them
2021-03-09 00:20:43 -07:00
silicons 34c4887b69 Merge pull request #14351 from Putnam3145/teg-uncap
Uncaps TEG output
2021-03-09 00:17:47 -07:00
Suicidalpickles 6496b418d4 Update paramedic.dm 2021-03-08 18:31:34 -08:00
Letter N 3fa43b7f61 oops forgot this reg 2021-03-09 10:09:02 +08:00
necromanceranne bdcd2904e6 Fixes going over the defined limit of roundstart prosthetics 2021-03-09 03:56:51 +11:00
Letter N de6f1401bb final fix 2021-03-08 13:24:28 +08:00
SandPoot 80cb870311 upload drinks.dm 2021-03-07 21:39:10 -03:00
Sneakyrat6 703567e591 other fixes 2021-03-07 04:09:36 -05:00
Letter N 8c3c259850 pepegasort 2021-03-07 14:11:09 +08:00
Letter N 22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
silicons 87c7487344 Merge pull request #14361 from Putnam3145/hyper-nob-easier
Makes hyper-nob, nitryl easier to make
2021-03-06 17:00:24 -07:00
silicons 06f6a7eb46 Merge pull request #14360 from Hatterhat/pipegun
pipe shotgun reskins
2021-03-06 17:00:15 -07:00
silicons 4fdaf10049 Merge pull request #14359 from Hatterhat/traumannounce
funny trauma announce
2021-03-06 17:00:10 -07:00
silicons 21905f45f3 Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket
MWS-01 Changes
2021-03-06 16:59:46 -07:00
Letter N 4482453067 dihydrogen 2021-03-06 19:56:19 +08:00
Letter N 4463fd9513 paperwork mini update, also ASS_BLAST_USA 2021-03-06 19:28:29 +08:00
Letter N 709aaa5006 NEW() moment 2021-03-06 13:28:57 +08:00
Letter N e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
Letter N a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00