cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,788 Commits 8 Branches 0 Tags
modsuit-update
Commit Graph
272 Commits
Author SHA1 Message Date
SandPoot 1e29739a34 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-16 03:23:37 -03:00
Putnam3145 c6cf921e7a Makes station trait on round start work 2022-08-14 23:29:40 -07: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 6bff4b4165 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-05 01:38:42 -03:00
deathride58andGitHub e75c413d42 Merge pull request #15652 from SandPoot/title-screen 
Updates the title screen
 2022-06-05 00:27:44 -04:00
SandPoot d1c44afdae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 19:21:46 -03:00
SandPoot 8bb1c2b32a Upload files 2022-05-30 01:31:54 -03:00
deathride58 14d885093e yknow lets just add a linebreak there it looks better with it 2022-05-19 15:32:48 -04: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
SandPoot 00eb92701f a 2022-03-14 14:24:50 -03:00
SandPoot 5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
keronshb 6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
SandPoot a797436f45 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-15 15:03:21 -03:00
SandPootandGitHub bdd0cee2eb Update ticker.dm 
shhhh
 2021-10-13 19:12:23 -03:00
SandPoot 39a7449625 Update ticker.dm 2021-10-13 16:57:00 -03:00
SandPoot 4d7e1b32db Update ticker.dm 2021-10-13 16:49:44 -03:00
SandPoot 5153dba0f2 Upload files 2021-10-13 15:11:25 -03:00
SandPoot 37b5020729 biggest fuck-up in the world 2021-10-13 13:56:31 -03:00
keronshb e2ab532de2 Removes old gangs, families is almost ready 2021-10-12 16:34:27 -04:00
keronshb 41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
SandPoot d55d628efe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-08 21:34:03 -03:00
keronshb a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
keronshb 408517fb1d SHOULD? FIX? 2021-09-16 20:53:46 -04:00
SandPoot ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot 03bdaad203 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-19 15:55:34 -03:00
zeroisthebiggayandGitHub 5e01bb9c22 Update ticker.dm 2021-05-15 08:35:46 -04:00
zerothebigboy e06b354613 sex!!!!!!!!!! 2021-05-15 06:58:20 -04:00
SandPoot afae5c3247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-23 19:49:58 -03:00
LetterN 69982f6315 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452 
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
 2021-03-17 11:49:50 +08:00
SandPootandGitHub f1b8802c58 Force gamemode config (#145) 2021-03-10 17:22:04 -03:00
SandPoot 20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00
Letter N ea4cb2c14d stop spamming text pls 2021-03-04 10:26:41 +08:00
SandPoot af6a8bdd5c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-03 12:05:27 -03:00
SandPoot 71214f50c0 found out this actually might be a better way 2021-01-05 14:07:09 -03:00
SandPoot c2f7c4a844 quick fix for round start pings 2021-01-05 14:04:54 -03:00
Letter N cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00
SandPoot 766493cc16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-22 18:03:33 -03:00
silicons a4688557d7 Cryo 2020-12-13 02:29:31 -07:00
silicons 07d8e72125 fix 2020-12-12 11:19:45 -07:00
silicons 45a7c68da1 wow 2020-12-11 15:05:00 -07:00
SandPootandGitHub 01dc62502a Roundstart pings (#106) 2020-11-21 16:17:17 -03:00
SandPoot b28fce9ebb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-28 13:36:59 -03:00
Putnam 558d11bc73 Stringified the vote #defines for easier config stuff 2020-10-18 14:49:43 -07:00
Enric Gabriel 4de9baf690 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-21 14:10:28 -03:00
Artur 435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Enric Gabriel d85ebed8db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-16 16:22:36 -03:00
timothyteakettle cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00