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
118 Commits
Author SHA1 Message Date
SandPoot fd124b03e4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-03 21:27:30 -03:00
SandPoot 55e0e5de06 real quick 2023-10-28 17:54:31 -03:00
SandPoot 0b6d743e22 go 2023-10-28 17:51:02 -03:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
SandPootandGitHub a21a047c3d Fixes custom roundstart items (#272) 2022-10-28 20:30:36 -03:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
SandPoot d046c26513 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-27 00:28:17 -03:00
deathride58andGitHub e577995c69 Merge pull request #15231 from Tupinambis/Assistantagging 
Antag roles will now respect your backup role preferences if none of the enabled roles are available
 2022-05-24 14:48:34 -04:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPootandGitHub e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
SandPoot cccd49fa5c Update job.dm 2021-11-06 15:42:31 -03:00
SandPoot 80dce37eb4 Upload files 2021-11-06 15:38:13 -03:00
SandPoot d55d628efe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-08 21:34:03 -03:00
Putnam3145andGitHub 3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport 
(Probably ready for test merge) DYNAMIC 2021
 2021-10-07 18:14:59 -07:00
Tupinambis f4b365c610 Stopsforcing people into undesired roles when they get antag 2021-10-01 20:46:46 -05:00
keronshb 792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
siliconsandGitHub 20b21549fa Update job.dm 2021-09-12 20:21:29 -07:00
SandPoot afae5c3247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-23 19:49:58 -03:00
siliconsandGitHub 4e22ad7484 Update job.dm 2021-03-21 02:07:03 -07:00
siliconsandGitHub 661ed14c83 Update job.dm 2021-03-21 02:05:43 -07:00
SandPootandGitHub 9d60cd6df5 Alternative job titles (#146) 
* upload files

* more titles + fix hydro
 2021-03-18 14:12:00 -03:00
SmArtKar e925aea454 Fixes 2021-02-23 12:44:11 +03:00
SmArtKar b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
SmArtKar fecf879b0c Fixed 2021-02-17 18:54:59 +03:00
SmArtKar 756be084bc Decks are saveable! 2021-02-17 18:50:23 +03:00
SmArtKar 3e95e28f85 Illegal cards will now permanently be marked, not for just one round 2021-02-16 20:05:59 +03:00
SmArtKar 348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
SmArtKar b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
timothyteakettle 837e766306 fixes sanitization 2021-01-19 01:04:01 +00:00
Timothy Teakettle b956df2226 name description implement 2021-01-18 21:59:00 +00:00
Blue Wildrose 0e5b2c60ee Fixes loadout specific polychromic hoodies 2020-12-31 03:42:29 -07:00
Timothy Teakettle 132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
Timothy Teakettle ac9e383638 WOOPS ONE MORE DEBUG MESSAGE 2020-12-07 21:28:17 +00:00
timothyteakettle 5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle fa26f4c402 b 2020-12-06 00:02:14 +00:00
Timothy Teakettle afdbac31fa test 2020-12-05 22:35:27 +00:00
timothyteakettle b1379dd49e still not working 2020-10-27 21:11:42 +00:00
timothyteakettle e35b3e4a33 color editing 2020-10-26 00:47:40 +00:00
Timothy Teakettle 0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
timothyteakettle a39dea1b4d json loadout 2020-10-24 00:31:45 +01:00
BlackMajorandGitHub bf7d68884b Merge pull request #13510 from silicons/google 
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
 2020-10-11 18:39:10 +13:00
silicons 21d3d8fcd9 sigh 2020-10-03 14:17:13 -07:00