Commit Graph

1835 Commits

Author SHA1 Message Date
Lin
b7f8deaf38 Merge pull request #14484 from zeroisthebiggay/cumbranch
biodegrade works on legcuffs
2021-03-23 16:22:26 -05:00
zerothebigboy
969f64af1a f u c k 2021-03-20 19:23:55 -04:00
silicons
1b622af5e7 Merge pull request #14465 from The-Sun-In-Splendour/fix-post-absorb-revive
Fixes post absorb revive
2021-03-20 01:30:37 -06: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
Ludox
828cfaf58a Cellular Emporium is gone 🦀
Prevents you from seeing cellular emporium despite not being able to use it (Post-absorb)
2021-03-18 04:32:33 +01:00
Ludox
fca5ede923 Shitcode has arrived 2021-03-18 02:32:54 +01:00
kiwedespars
158008b80f maybe too big a buff 2021-03-16 11:05:49 -07:00
kiwedespars
1886bef04e changes
- void blade requires colder temps
- boogie woogie fueltank swap
- sicklebreak buff
- big domain expansion buff
- grasping carving nerf
- clamps silence maybe
2021-03-16 03:23:18 -07: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
Heretical Lizard
fb9ecc50d5 Update code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-03-16 02:32:56 -04:00
Dan-Neposh
57bfec61b9 sound fixes for Ratvar's ending sequence 2021-03-15 18:08:02 -04:00
Dan-Neposh
076955ac41 fixes the transformation rites 2021-03-15 15:12:16 -04:00
kiwedespars
ae61039a30 nerf sickle break 2021-03-14 16:27:33 -07:00
kiwedespars
baab4217e0 readded succumb button and also removes halo. 2021-03-13 19:41:02 -08:00
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
69d927e756 Merge branch 'master' into void-but-for-real 2021-03-12 23:10:19 -08: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
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
kiwedespars
4e9cb47f68 more influences 2021-03-10 14:22:20 -08: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
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
Dan-Neposh
e29606e5f3 addresses code suggestions from Deltafire 2021-03-07 20:47:07 -05:00
Heretical Lizard
60b4aa58cd Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-03-07 02:15:19 -05:00
Heretical Lizard
55e337a9a4 Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-03-07 02:15:06 -05:00
Heretical Lizard
263c7a9854 Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-03-07 02:06:57 -05:00
Dan-Neposh
d9d3468ce0 Fixes Ratvars linters 2021-03-04 08:05:44 -05:00
Dan-Neposh
b2f80555bb hopefully fixes run linters, as well as rewords some announcements 2021-03-04 01:58:36 -05:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Putnam
291fc2add6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into supernova 2021-03-02 01:33:22 -08:00
Lin
4cd12649d2 Merge pull request #14325 from dzahlus/slime-fix
Fixes toxin healing for slimes in heretic related stuff
2021-02-27 14:41:33 -06:00
silicons
6c3be09e97 Merge pull request #14300 from keronshb/sentientbuff
Allows Sentient Disease to purchase most abilities from the start.
2021-02-26 13:36:27 -07:00
dzahlus
51595705e4 simpin for slimes 2021-02-26 20:59:28 +01:00
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
keronshb
04764600bb Unlocks Sentient disease abilities
Let's the Sentient Disease start with stuff to unlock.
2021-02-23 16:25:18 -05:00
DeltaFire
cc8c75539e sigh 2021-02-23 12:50:33 +01:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Lin
d2f9237ecd Merge pull request #14237 from Citadel-Station-13/silicons-patch-11
adds sanity checks to heretic blade shatters
2021-02-18 23:51:23 -06:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
Letter N
501d33cddd agony 2021-02-19 10:32:24 +08:00