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 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,289 Commits 55 Branches 0 Tags
acf06abed5cc10f8ab3ad173fbd4fc355ad64553
Commit Graph

1744 Commits

Author SHA1 Message Date
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
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
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
Lin
04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs 
Tweaks some Synth damage stuff
 2021-01-13 18:40:03 +00:00
Artur
d5e99e9cef TESTING 2021-01-13 05:56:10 +02:00
kappa-sama
c751f114aa finally 2021-01-12 01:42:55 -05:00
silicons
cd62c45902 Update nuclearbomb.dm 2021-01-10 03:52:16 -07:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky 
Good Night Disky
 2021-01-09 15:39:06 -07:00
DeltaFire
125ea9dad2 vitality sigil drain 2021-01-09 20:44:51 +01:00
DeltaFire
05f7991981 snap 2021-01-09 20:37:24 +01:00
DeltaFire
9cfd3c073e smol fix 2021-01-09 00:33:20 +01:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Putnam3145
5cde6e0157 Merge pull request #13871 from silicons/debris 
Merry Christmas - GIVING JANITORS A JOB
 2021-01-08 00:26:52 -08:00
silicons
dc02c8cf74 Merge pull request #13967 from keronshb/blobtweaks 
Small blob tweaks + fix
 2021-01-08 01:20:23 -07:00
MrJWhit
784fca8bd4 Hehe fixies 2021-01-07 20:59:37 -05:00
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
keronshb
af3c8edf01 Small blob tweaks + fix 
Fixes the permanent consumption of a factory blob w/ blobbernaut failure.  Also changes resource blob pointgen from 1 to 2 and allows factory blobs to be placed across 5 tiles instead of 7.
 2021-01-04 12:32:41 -05:00
Xantholne
fe4f184792 good night disky 2021-01-04 03:50:43 -07:00
silicons
1b9a399bbd Merge pull request #13905 from zeroisthebiggay/help 
gives codex cicatrix inhands
 2020-12-30 14:46:26 -07:00
DeltaFire
3dbf4830f0 Merge pull request #13892 from Citadel-Station-13/silicons-patch-50 
rebalances changeling combat mutations
 2020-12-30 18:17:30 +01:00
Letter N
3996f50a00 who is nanotransen 2020-12-29 14:00:58 +08:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
zerothebigboy
6f38ec403f help 2020-12-28 15:34:35 -05:00
silicons
0c87c3b0e0 fiX 2020-12-28 12:15:55 -08:00
DeltaFire
01f1844781 there 2020-12-28 19:15:59 +01:00
DeltaFire
b1be0159e2 Merge pull request #13877 from Citadel-Station-13/silicons-patch-43 
heretics uses killonce objectives
 2020-12-28 17:56:58 +01:00
Letter N
ce5ab2f3a4 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-28 09:35:58 +08:00