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

3784 Commits

Author SHA1 Message Date
Mosley
0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot
054716857f push 2025-03-10 16:11:56 -03:00
SandPoot
f6405100b5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-25 21:46:53 -03:00
SandPoot
3425760ced push 2025-02-25 17:48:02 -03:00
Mosley
f700fd616b Merge remote-tracking branch 'upstream/master' 2025-01-15 17:11:43 -05:00
SandPoot
ce801b39b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-12-24 19:31:23 -03:00
SpaceCat404
8e7205e5a2 Merge branch 'master' into Lucky's-Misc-Fixes-1 2024-12-12 13:44:58 -06:00
Mosley
bf596ff476 Merge pull request #1228 from SpaceCat404/carbonated-cum 
Carbonated Cum Update
 2024-12-12 14:39:10 -05:00
SpaceCat404
eb8afd9578 Final (Hopefully) Fix 2024-12-10 18:37:16 -06:00
SpaceCat404
2e4deac693 Added unused cc uniform sprites. 2024-12-10 12:58:20 -06:00
SpaceCat404
68b44b7e12 CarbonatedCumUpdateFix1 2024-12-09 20:52:48 -06:00
SpaceCat404
63586dadac LuckyPR1Fixes&Edits 2024-12-09 17:52:35 -06:00
SpaceCat404
8fe6721f4a Adds Carbonated Cum 2024-12-09 07:47:58 -06:00
SpaceCat404
e2cd9661f2 Added lines to end of files, modularized previous additions, added user input to close batch file 2024-12-05 14:11:31 -06:00
SpaceCat404
53e6c2e251 Added Nyanese language, "Catpain" Captain title, Old Glory sunflower seeds. 2024-12-05 04:11:07 -06:00
ariaworld
e23b1f84fd BEESTATION PORT PR#4567: Filters + plane_master atomized 2024-11-30 16:39:30 +01:00
Mosley
a44046076a Merge remote-tracking branch 'upstream/master' 2024-11-21 22:44:41 -05:00
SandPoot
1d6008397a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-11-19 23:22:26 -03:00
Darius
685221b840 Remove invalid quirk 
Removes a mistakenly added reference to a new-codebase quirk.
 2024-11-04 15:05:49 -05:00
Darius
e70aeea39b Quirk file separations 
This does the following:
- Separates all modular quirks into separate files, with no other changes.
- Modularizes some non-modular edits into a new file
- Fixes location of hydra trait definition
 2024-11-04 13:49:08 -05:00
Mosley
6f5b714487 fein fein fein fein fein 
I better get a dommy mommy for this
 2024-11-03 12:40:03 -05:00
Metis
f6af059a06 job titles 2024-11-02 03:16:16 -04:00
Mosley
cd03ca1151 Merge branch 'master' into content-stuff 2024-10-24 15:21:03 -05:00
Mosley
f9c16b467d thanks for porting these too btw 2024-10-11 03:57:11 -05:00
Mosley
928b4c62b0 Merge remote-tracking branch 'venus/master' into content-stuff 2024-10-11 03:47:54 -05:00
Sim
50c16ccfad [PORT] Adds Immersion from tgstation/tgstation/47704 
Please roleplay appropriately, okay?
Commit can also be called "How I Lost My Entire Playerbase"
 2024-10-08 18:29:20 -03:00
Sim
3e4f8da97c [Port] The Ocky Icky Phobia from tgstation/tgstation#57450 & tgstation/tgstation#80247 2024-10-08 15:06:28 -03:00
Sim
c8983e1b03 Did you know Mosley pulls from downstreams without knowing what he pulls? 
AKA [PORT] Refactors smiting, adds smite build mode tgstation/tgstation#55327

!! NOT!! A!! RUNNING!! BUILD!!

LIGHTNING IS BROKEN
IMMERSE IS COMMENTED OUT
HALF OF THIS SHIT IS BROKEN
DO NOT BASE YOURSELF ON THIS BUILD!!
 2024-10-08 01:50:15 -03: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
14380b60a5 Merge remote-tracking branch 'venus/master' into content-stuff 2024-10-07 17:12:36 -05:00
Sara
4d2ef193e0 Forgor 2024-10-06 19:18:20 -06:00
Sara
e18e61dda8 Merge branch 'SPLURT-Station:master' into 4nal 2024-10-06 12:32:18 -06:00
Sim
8825218293 initial commit 2024-09-27 16:13:51 -03:00
Mosley
8c06e5984c how about another joke murray? 2024-09-20 02:49:07 -05:00
Sara
6fd36ddc0a Merge branch 'SPLURT-Station:master' into 4nal 2024-09-10 21:03:06 -06:00
ariaworld
27e2e80cb8 Add: random-gen maintenance and other useful things 2024-09-08 22:46:28 +02:00
ariaworld
e0b2d50710 Merge remote-tracking branch 'splurt/master' 2024-09-08 01:20:49 +02:00
Mosley
dd7eba9d94 followup 2024-09-07 15:56:45 -05:00
Mosley
bd1993e2a8 Merge remote-tracking branch 'upstream/master' 2024-09-07 15:56:35 -05:00
SandPoot
8063d4412c not really trading so don't call it that anymore 2024-09-07 16:51:12 -03:00
SandPoot
6c30fa6883 push 2024-09-07 16:45:30 -03:00
Sara
9bf3c333af Merge branch 'SPLURT-Station:master' into 4nal 2024-09-06 13:31:29 -06:00
ariaworld
0601002cd1 Space update 2024-09-02 00:20:38 +02:00
ariaworld
d42c7a4f2a Merge remote-tracking branch 2024-08-29 14:42:55 +02:00
Mosley
7f51928639 problem fixed 
lol
 2024-08-28 22:28:24 -05:00
Mosley
e286bd40f3 Merge remote-tracking branch 'upstream/master' 2024-08-27 15:43:55 -05:00
SandPoot
75d1a7d69c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-26 04:31:35 -03:00
Sara
7c9852b115 Merge branch 'SPLURT-Station:master' into 4nal 2024-08-25 12:27:54 -06:00
SandPoot
dc08550162 push 2024-08-25 04:38:03 -03:00
Mosley
fdd494c1cf Merge remote-tracking branch 'upstream/master' 2024-08-18 15:49:07 -05:00