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-14 03:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,498 Commits 55 Branches 0 Tags
a797436f455a5a8a733b51cbbbc839459deedcb5
Commit Graph

2205 Commits

Author SHA1 Message Date
SandPoot
a797436f45 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-15 15:03:21 -03:00
SandPoot
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
SandPoot
5f72ad8d61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-11 20:33:04 -03:00
Putnam3145
3209917830 Merge pull request #15173 from silicons/vpn_block 
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
 2021-10-11 15:51:52 -07:00
SandPoot
2541ad050b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-10 21:07:48 -03:00
silicons
84c6970c27 Merge pull request #15250 from SandPoot/you-are-now-rate-limited 
You are now rate limited
 2021-10-09 22:14:45 -07:00
SandPoot
d55d628efe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-08 21:34:03 -03:00
Putnam3145
3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport 
(Probably ready for test merge) DYNAMIC 2021
 2021-10-07 18:14:59 -07:00
Putnam3145
ac84eed0d1 Merge pull request #15129 from Citadel-Station-13/silicons-patch-15 
if you recognize this is not the way to do it, don't do it (bandaid to polychromatic loadout lookup)
 2021-10-07 00:05:06 -07:00
SandPoot
e88368cd4c Update fail2topic.dm 2021-10-06 16:27:06 -03:00
keronshb
fb5653e12c Voting fix 2021-09-25 12:59:18 -04:00
keronshb
a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
SandPoot
e7d5275a70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-20 14:32:29 -03:00
keronshb
c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb
cd00d1589e fucking hell 2021-09-19 18:06:24 -04:00
silicons
ae513d3114 feautre 2021-09-17 21:58:26 -07:00
keronshb
408517fb1d SHOULD? FIX? 2021-09-16 20:53:46 -04:00
keronshb
372725c1f4 Fixes everything???? 2021-09-16 15:40:21 -04:00
keronshb
792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
keronshb
7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
Putnam3145
9a8698230b Added a config entry for monstermos 2021-09-14 14:18:14 -07:00
silicons
20b21549fa Update job.dm 2021-09-12 20:21:29 -07:00
SandPoot
51fdbc73d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-10 23:14:02 -03:00
silicons
4836f222d0 Merge pull request #15097 from LetterN/generic-housekeeping-pr 
Generic syncs
 2021-09-10 00:16:25 -07:00
SandPoot
2627ae7aa1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 23:17:18 -03:00
silicons
448199665d Update research.dm 2021-09-08 23:10:24 -07:00
SandPoot
e3c17dc05e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 01:57:47 -03:00
LetterN
6739e349a0 heretics LOVES this - Also ian's birthday! 2021-09-08 09:50:07 +08:00
LetterN
c25dc84da0 what the cat doing with the yarn dependencies?? 2021-09-08 09:25:38 +08:00
LetterN
e203abb25c generic controller update 2021-09-08 09:10:28 +08:00
Putnam3145
f04b0a68d2 division by zero, oh dear 2021-09-07 12:44:38 -07:00
Putnam3145
66fea518b8 Allow atmos thread to slow itself down 2021-09-07 12:30:54 -07:00
SandPoot
ed83bb4b24 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-05 00:45:29 -03:00
DeltaFire
1d18c24deb e 2021-09-03 21:22:08 +02:00
SandPoot
e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
silicons
841ff4f81c Merge pull request #15011 from Putnam3145/lavaland-random-atmos 
Port of randomized planet atmos
 2021-08-26 21:39:23 -07:00
Putnam3145
b26570e288 Adds a toggle for monstermos doing planet decomp (off by default) 2021-08-19 22:10:41 -07:00
Putnam3145
ff52c241f4 Procedural planet atmos 2021-08-14 21:13:45 -07:00
SandPoot
ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
SandPoot
a9e4dd336c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-06 13:58:02 -03:00
Putnam3145
7e34540903 Enables monstermos. 2021-08-04 00:54:52 -07:00
Artur
dc40dfca81 goddamn stupid runtimes 2021-07-30 01:24:43 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot
dbf3b3f057 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-28 14:22:48 -03:00
Putnam3145
639630b4fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into reenable-tests 2021-07-27 19:05:00 -07:00