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 2026-08-24 13:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
256 Commits
Author SHA1 Message Date
BongaTheProto 7b5ecc7b49 Merge remote-tracking branch 'upstream/master' 2023-10-07 23:28:42 -05:00
SandPootandМарк a105852042 the stuff 
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
 2023-10-05 21:15:11 -03:00
BongaTheProto 5382130370 Squashed commit of the following: 
commit 0081f9fa79
Author: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com>
Date:   Mon Jul 31 18:40:02 2023 +0000

    Automatic changelog compile [ci skip]

commit 94be79788c
Merge: 13da11c4bc ee540149d8
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:38:17 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit ee540149d8
Merge: c317c8b8fc 410d80987e
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Mon Jul 31 11:37:20 2023 -0700

    Merge pull request #15994 from SandPoot/quick-fix-1

    Fixes changeling's stings

commit 13da11c4bc
Merge: 8b56f314e6 c317c8b8fc
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:36:19 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit 410d80987e
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:04:52 2023 -0300

    nope, who OWNS it

commit 860f75d464
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:02:51 2023 -0300

    go

commit c317c8b8fc
Merge: 19dee4e0f6 bfe07112ff
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Sun Jul 30 10:49:51 2023 -0700

    Merge pull request #15993 from SandPoot/station-name

    New Station Trait: Randomizing Station Name

commit bfe07112ff
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Fri Jul 28 13:53:09 2023 -0300

    i hate keyed_list, i'm not keeping it in

commit 6896a2e481
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Thu Jul 27 21:09:41 2023 -0300

    what was it again?
 2023-08-01 00:22:39 -05:00
SandPoot bfe07112ff i hate keyed_list, i'm not keeping it in 2023-07-28 13:53:09 -03:00
BongaTheProto 811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00
deathride58 578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
BongaTheProto 0a97a66551 Merge remote-tracking branch 'upstream/master' 2022-05-13 01:20:04 -05:00
BongaTheProto f4b9585c12 Merge remote-tracking branch 'upstream/master' 2022-05-12 20:47:56 -05:00
deathride58 8838fcc2f3 Moves server_taglines.txt to config dir to avoid requiring manual updates of the strings folder with TGS 2022-05-12 17:22:52 -04:00
deathride58 40730237f2 Hub refresh - Cleans up update_status(), adds more hub-related config options, and more! 2022-05-05 14:52:53 -04:00
Iosyf cff8d8c7bd Qareen stuff 
New lewd revenant alternative. (Part 1)
 2022-04-23 23:20:03 +03:00
BongaTheProto bdcbb08719 Psycho 
https://github.com/quotefox/Hyper-Station-13/pull/1046
https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11180 (mostly used this one to guide myself on adding it, idk why it was removed from the commit in first place)
 2022-03-19 12:27:04 -05:00
BongaTheProto 3c67078182 Better token generation (now it actually works) 2022-01-05 13:47:40 -05:00
BongaTheProto 35a8291a35 Moved our modular folder under sandstorm's 
now we can modularize stuff better and have less errors I guess
 2021-12-10 14:31:15 -05:00
BongaTheProto c7bd65b1a6 Merge remote-tracking branch 'upstream/master' 2021-12-08 15:01:52 -05:00
DeltaFire 4dd6a547b8 mayhaps? 2021-12-08 05:28:13 +01:00
BongaTheProto a8ff9ab96b By the time the lady entered the backstage as the voice told her to, missing husband wasn't there. Instead, she found a rabbit 
Rose broken, will fix you
you will beautiful
you will beautiful
you will beautif
 2021-12-05 02:22:15 -05:00
siliconsandGitHub 2c8d362dd5 Merge pull request #15133 from zeroisthebiggay/patch-21 
the timeframely tips update
 2021-09-19 11:10:28 -07:00
zeroisthebiggayandGitHub 86c8129935 Update sillytips.txt 2021-09-19 14:08:32 -04:00
zeroisthebiggayandGitHub 932b0a5770 Update traumas.json 2021-09-13 08:23:48 -04:00
zeroisthebiggayandGitHub 49be91467d Update traumas.json 2021-09-13 00:39:36 -04:00
zeroisthebiggayandGitHub a33093ceb3 Update traumas.json 2021-09-13 00:38:57 -04:00
zeroisthebiggayandGitHub 8999bc7c34 Update traumas.json 2021-09-13 00:36:46 -04:00
zeroisthebiggayandGitHub 1616c496f6 Update sillytips.txt 2021-09-13 00:05:33 -04:00
zeroisthebiggayandGitHub ce6a2c05f0 Update sillytips.txt 2021-09-13 00:03:13 -04:00
zeroisthebiggayandGitHub c395068006 Update sillytips.txt 2021-09-13 00:01:32 -04:00
zeroisthebiggayandGitHub 3e2bd8f256 Update tips.txt 2021-09-13 00:00:52 -04:00
zeroisthebiggayandGitHub 333340fa02 Update sillytips.txt 2021-09-13 00:00:22 -04:00
zeroisthebiggayandGitHub 5b0af1c5d1 Update tips.txt 2021-09-12 23:47:32 -04:00
zeroisthebiggayandGitHub 0fd3ca1e3e Update tips.txt 2021-09-04 01:42:12 -04:00
Timothy Teakettle 1303f4b9ae Update tips.txt 2021-06-12 15:34:58 +01:00
LetterN 74c00d17f8 let's be [redacted], its really in t his year 2021-03-31 09:43:15 +08:00
Blue Wildrose 3a37cc6325 Some sensory detail 2021-03-20 06:37:37 -07:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
MrJWhit 1811aeaeba Update tips.txt 2021-01-13 18:43:14 -05:00
DeltaFireandGitHub 9636901707 Merge pull request #13841 from Citadel-Station-13/silicons-patch-34 
deletes an unused file
 2020-12-22 17:57:13 +01:00
DeltaFireandGitHub bd50d65218 Merge pull request #13839 from Citadel-Station-13/silicons-patch-32-1 
small tip of the round update
 2020-12-22 17:44:57 +01:00
siliconsandGitHub c341c2448c Delete admin_nicknames.txt 2020-12-21 21:50:57 -07:00
siliconsandGitHub d5ea33a224 Update sillytips.txt 2020-12-21 21:48:53 -07:00
siliconsandGitHub 9ad59c00c2 Update tips.txt 2020-12-21 21:46:59 -07:00
silicons ea21151462 LF 2020-12-20 18:55:45 -07:00
Tupinambis f1bc1ccafb Merge branch 'master' into spooder 
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
 2020-10-01 17:10:42 -05:00
siliconsandGitHub 1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort 
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
 2020-10-01 12:15:49 -07:00
The0bserver 7c695409d0 Okay, we went back in time. Maybe this will work? 2020-10-01 06:40:09 -04:00
Tupinambis 905633148b names 2020-09-30 19:06:09 -05:00
MrJWhit 3df117cd22 Update traumas.json 
Haha whoops
 2020-09-12 02:35:08 -04:00
MrJWhit 9a89fa498b Update traumas.json 2020-09-12 02:32:17 -04:00
lolman360 931e48a994 this is funnier 2020-08-25 10:12:53 +10:00
lolman360 8a499e6ba7 kek 2020-08-25 10:10:53 +10:00
Letter NandGitHub 8de7717b52 wounds moment 2020-08-19 11:01:38 +08:00