cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,672 Commits 55 Branches 0 Tags
6c6ebb300243f5eb411f52f9d68cae48cf74cad7
Commit Graph

1770 Commits

Author SHA1 Message Date
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
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
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing 
Tool behavior replacing
 2021-02-21 14:48:50 -07: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
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
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
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
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
DeltaFire
b0ff405a13 cool 2021-02-12 03:06:53 +01:00
DeltaFire
fb4641b348 e 2021-02-12 02:42:59 +01:00
SandPoot
a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
DeltaFire
7fbb41eee0 screaming 2021-02-11 04:12:42 +01:00
Timothy Teakettle
4b51174717 Update disease_disease.dm 2021-02-05 16:43:18 +00:00
silicons
efc3ecef32 Merge pull request #14118 from DeltaFire15/slabs-and-silicons 
About ratvarian borgs and spells sometimes not working (+ a few other small things)
 2021-01-25 23:17:41 -07:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00
silicons
0c6e67ac81 Merge pull request #14127 from Hatterhat/tg-56348 
tgstation#56348 - contractor TC buff
 2021-01-25 23:04:01 -07:00
silicons
7b35c80a4d Merge pull request #14117 from timothyteakettle/blob-emote 
lets blobs use the 'me' verb
 2021-01-25 22:59:24 -07:00
silicons
6094293b4b Merge pull request #14105 from DeltaFire15/heretic-target-fix 
Heretic sacrifice target logging + a fix
 2021-01-25 22:58:54 -07:00
Artur
b569d59271 Did the suggestion 2021-01-25 22:07:04 +02:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Hatterhat
09d91643ef tg 56348 2021-01-22 18:39:46 -06:00
DeltaFire
920be8cffc stuffs 2021-01-22 01:43:35 +01:00
Timothy Teakettle
ca9292f6fd Update overmind.dm 2021-01-21 22:45:46 +00:00
Timothy Teakettle
897f8a744f Update overmind.dm 2021-01-21 22:39:38 +00:00
Artur
87c9201707 No gunning sadly 2021-01-20 19:51:11 +02:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
DeltaFire
7136f5cffb boop 2021-01-20 06:09:20 +01:00
DeltaFire
4578f30001 brrt 2021-01-20 05:54:38 +01:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
Hatterhat
a468f400e3 see branch name 2021-01-14 20:55:06 -06:00
silicons
8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
silicons
c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat 
two toggled self-buffing spells that have no relation to any anime or video game in particular
 2021-01-13 16:50:50 -07:00