shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,017 Commits 5 Branches 0 Tags
28205f9dce7337fc58caa7bbf89fe054ab02ffc7
Commit Graph

1813 Commits

Author SHA1 Message Date
Artur
28205f9dce More fixes to make it work 2021-05-05 17:41:37 +03:00
Artur
d9f6e51bc8 making it actually work properly 2021-05-05 15:26:20 +03:00
Artur
92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03: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
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
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
silicons
14c9fe655c Update eldritch_items.dm 2021-02-18 17:00:28 -07:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Lin
b0c4fa5755 Merge pull request #14259 from timothyteakettle/log-pierced-reality-examine 
staring into pierced realities is now logged
 2021-02-18 00:01:32 -06:00
Dan-Neposh
2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
Dan-Neposh
ace2512812 solves run linter errors 2021-02-17 10:24:37 -05:00
Putnam3145
74e6f9198b Merge pull request #14236 from dzahlus/toxic-objective-removal 
Removes prevent from leaving alive, maroon objective
 2021-02-17 05:35:27 -08:00
Timothy Teakettle
e50073e636 Update eldritch_effects.dm 2021-02-16 20:54:37 +00:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
SandPoot
4e18044450 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui 2021-02-14 20:10:41 -03:00
silicons
0aea43afcc Merge pull request #14224 from DeltaFire15/no-more-YELLING 
Makes clockies yell less
 2021-02-13 19:06:57 -07:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
silicons
acf06abed5 Update eldritch_items.dm 2021-02-12 22:50:09 -07:00
silicons
b465225bc2 Update eldritch_items.dm 2021-02-12 18:53:38 -07:00
dzahlus
c40427da05 i hate changelings 
i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings
 2021-02-12 19:23:59 +01:00
dzahlus
eacf1ef40b dynamic still has permakill obj but i aint touching dynamic code 2021-02-12 19:20:22 +01:00
dzahlus
806d96076e i dont actually know how to code btw 2021-02-12 18:41:58 +01:00
dzahlus
70303319f4 hrnngh CTRL+S doesnt save everything 2021-02-12 18:26:52 +01:00
dzahlus
503c276f9f uh second try 2021-02-12 18:25:03 +01:00
Dan-Neposh
7f0af72e8f splits the announcement message in half so that the subtitles line up 2021-02-12 03:53:31 -05:00