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-09 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph

695 Commits

Author SHA1 Message Date
Mosley
3c63bdc873 Merge remote-tracking branch 'upstream/master' 2024-11-29 19:41:18 -05:00
Mosley
cd03ca1151 Merge branch 'master' into content-stuff 2024-10-24 15:21:03 -05:00
Mosley
518fea2b1a Merge remote-tracking branch 'upstream/master' 2024-10-24 01:00:56 -05:00
SandPoot
7fa5456cb1 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into pr/xTheLifex/388 2024-10-20 18:29:55 -03:00
SandPoot
e2cc28d21d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-10-20 18:05:53 -03:00
Metis
50e2d911a6 Update general.txt 2024-10-15 00:26:38 -04:00
Mosley
928b4c62b0 Merge remote-tracking branch 'venus/master' into content-stuff 2024-10-11 03:47:54 -05:00
Sim
6e57a237a9 [MIRROR] Popup Notice tgstation/tgstation#61010 
Ports the admin popup notice from tgstation.
 2024-10-07 23:27:22 -03:00
Mosley
3a8024db6d undoes removals 2024-09-20 01:13:14 -05:00
Mosley
b5c0825509 Revert "He-hell naw!" 
This reverts commit 42a48e9b54.
 2024-09-18 17:53:12 -05:00
ariaworld
42a48e9b54 He-hell naw! 2024-09-13 23:12:01 +02:00
SandPoot
a103acd509 cavalry's here 2024-09-10 02:00:55 -03:00
ariaworld
0601002cd1 Space update 2024-09-02 00:20:38 +02:00
ariaworld
27bb11eb76 yt-dlp 2024-08-18 22:46:16 +02:00
ariaworld
d2422de379 Removes N.2 unholy ERP verbs. Add: new textures for doors and floors. 2024-08-05 20:46:52 +02:00
BongaTheProto
652a380d02 Merge remote-tracking branch 'upstream/master' 2024-05-20 18:15:04 -05:00
SandPoot
de83d338fc sprint by default 2024-05-20 19:10:16 -03:00
BongaTheProto
22b61dba91 sm delam cooldown 
it seems to work I guess
 2024-04-22 20:12:41 -05:00
Ayy-Robotics
d628d84ba5 Re-hashes complex maps due to request 2024-02-03 12:55:04 -05:00
Ayy-Robotics
b6a74b5bd0 Merge branch 'SPLURT-Station:master' into AGRComplexNew 2024-01-29 19:44:43 -05:00
ariaworld
227f24fef8 Remove mob-per-tick check 2024-01-17 14:01:29 +01:00
Ayy-Robotics
a44935fc8a Removes hashes from complex maps for testing purposes 2024-01-13 13:07:44 -05:00
Ayy-Robotics
9282d02c88 Update awaymissionconfig.txt 
Fixes filepath for the map files
 2024-01-12 19:44:47 -05:00
ariaworld
13474fb720 Autocryo doesn't delete ghosts now 2024-01-09 21:41:36 +01:00
ariaworld
3c08fcf9ce Better autocryo. 2024-01-09 02:21:17 +01:00
Ayy-Robotics
fc086a17ad Adds config files for AGRComplex. 2024-01-08 17:50:27 -05:00
ariaworld
b4efab3799 Tweak autocryo. 2024-01-03 20:27:46 +01:00
BongaTheProto
129506c899 now the wiki version 
uses the space law page in our wiki
 2023-12-28 20:08:43 -05:00
BongaTheProto
e3d1286cb8 Merge remote-tracking branch 'upstream/master' 2023-11-23 17:23:16 -05:00
SandPoot
c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
DJKouta
5dc2241d6a Syndicate Skinned Box Station (#15580) 
* Syndicate Skinned Box Station

* Create syndicatestation.json

Okay tHIS FIXED IT I THINK HOLY CRAP THIS WAS AN EXPERIENCE.  HERES THE JSON!

* actually makes this work

* random runtime

we lvoe lesser-used items with runtiming actions

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 12:48:38 +01:00
BongaTheProto
604b8ea867 Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-20 22:29:47 -05:00
SandPoot
3aa3aead3d re-do the whole goddamn thing. 2023-10-20 17:48:13 -03:00
Марк
73e33a788e Choosable Laws. 2023-10-20 16:43:14 +05:00
BongaTheProto
7b5ecc7b49 Merge remote-tracking branch 'upstream/master' 2023-10-07 23:28:42 -05:00
SandPoot
910263d2d9 Merge branch 'update-config' of https://github.com/SandPoot/Citadel-Station-13 2023-10-05 22:01:18 -03:00
SandPoot
a105852042 the stuff 
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
 2023-10-05 21:15:11 -03:00
BongaTheProto
c0d743caa9 Merge pull request #953 from SPLURT-Station/oooo-spooky-ghosts 
Makes the autocryo subsystem check for diconnected ghosts too
 2023-09-23 18:47:43 -05:00
BongaTheProto
27df3d0753 Merge pull request #840 from Comicao1/Races-port 
Teshari [TESTING]
 2023-09-10 23:59:28 -05:00
BongaTheProto
4be533e20e ghost orgy at cryo??? ZAMN!!! 
*mygod
 2023-09-09 00:23:43 -05:00
Comicao1
3cbf9ed3f0 Go on 2023-09-07 04:42:07 +03:00
BongaTheProto
9b8ce2457d Merge pull request #938 from SPLURT-Station/tram-surname-station 
Ports modular ruins
 2023-08-25 00:32:33 -05:00
BongaTheProto
b89ae145f8 oop 
idk what these are for but
 2023-08-18 20:04:20 -05:00
BongaTheProto
3d421a7f12 Merge branch 'master' into pr/840 2023-08-13 14:43:09 -05:00
Vhariik
34273b7084 40>50 2023-08-01 10:22:08 -03:00
Vhariik
12353bda57 layenia minplayers to 40 
changed 25 > 40 since it's a bigger station
 2023-08-01 10:19:08 -03:00
BongaTheProto
ab92764fe8 Merge pull request #903 from SPLURT-Station/jukebox-2 
(Almost) Any song in the jukebox, take two
 2023-07-30 22:52:16 -05:00
BongaTheProto
7405dab0c7 better than youtube downloads I suppose 
I mean, they'll still download their songs from youtube most likely but at least we'll make sure it won't crash the server lol
 2023-07-15 14:09:59 -05:00
Vhariik
b534744451 Let's fucking go 2023-06-26 00:38:10 -03:00
Comicao1
9d5dc157e6 go on 2023-06-09 04:35:04 -03:00