cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-21 12:18:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
2004 Commits
Author SHA1 Message Date
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
Putnam f1e55f2df0 Paranoid updates to maybe fix air duplication 2021-03-20 22:02:47 -07:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
kappa-samaandqweq12yt 524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
SandPootandGitHub 9d60cd6df5 Alternative job titles (#146) 
* upload files

* more titles + fix hydro
 2021-03-18 14:12:00 -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
SandPoot 7cb53f0a63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-15 13:02:58 -03:00
DeltaFireandGitHub be41ead215 Merge pull request #14319 from silicons/async_2 
enforces SHOULD_NOT_SLEEP on Life(), fixes some more process() sleeps that might be causing controller lockups
 2021-03-15 17:01:42 +01:00
SandPoot ad22129f75 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-13 22:53:31 -03:00
LinandGitHub 907ac9fc8a Merge pull request #14423 from Putnam3145/mode-chaos 
makes the chaos thing actually work (whoops)
 2021-03-12 18:21:40 -06:00
Putnam 49e1673047 how did i mess up a copypasta like this 2021-03-12 15:44:15 -08:00
Putnam 4fb560ea98 makes the chaos thing actually work (whoops) 2021-03-12 14:46:58 -08:00
SandPoot 86fdf94fa8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-12 15:03:06 -03:00
Letter N 935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
siliconsandGitHub 7e3d72eddb Merge pull request #14376 from Putnam3145/mode-chaos 
Adds recent-chaos weighting for secret
 2021-03-10 14:02:11 -07:00
SandPootandGitHub f1b8802c58 Force gamemode config (#145) 2021-03-10 17:22:04 -03:00
SandPoot 82caedb1ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-10 12:26:52 -03:00
siliconsandGitHub 939a493334 Merge pull request #14306 from Putnam3145/supernova 
Adds a supernova event, with tweaks to allow this
 2021-03-10 01:32:52 -07:00
Putnam 25b021a343 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mode-chaos 2021-03-10 00:06:40 -08:00
siliconsandGitHub 771809a6d0 Merge branch 'master' into async_2 2021-03-09 00:17:26 -07:00
Putnam cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08: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
Putnam 5f6d478509 Added a "desired mode chaos" system 2021-03-07 20:14:11 -08:00
Letter N a43309a097 shuttle pog 2021-03-05 22:26:55 +08: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
Letter N a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
siliconsandGitHub 8989394742 Merge pull request #14270 from LetterN/rustsql 
Removes bsql 2
 2021-03-03 00:53:46 -07:00
Putnam f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Putnam 291fc2add6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into supernova 2021-03-02 01:33:22 -08:00
Letter N 1fdb7fd639 cleanup 2021-03-02 09:49:49 +08:00
SandPoot 7a5c5eb2ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-01 12:09:53 -03:00
silicons 50f7d89367 whew 2021-02-25 23:29:23 -07:00
silicons 37eaebe54a fix 2021-02-25 23:22:46 -07:00
Putnam 0211e78c0c ensured consistency with air-spawning atoms 2021-02-25 00:43:43 -08:00
Putnam 23eaf250a9 Make sure to hit the funny tick 2021-02-24 03:12:01 -08:00
Putnam 311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
SmArtKar e925aea454 Fixes 2021-02-23 12:44:11 +03:00
Letter N 2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
SandPoot 2c618200f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 12:14:31 -03:00
Letter N 7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Letter N 0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
Letter N 6abad913ff the sqel 2021-02-19 14:52:18 +08:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SmArtKar b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
SandPoot 1bdabd4e82 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-17 17:35:20 -03:00
SandPootandGitHub 9a6dbc2141 Additional languages rework (#143) 
* upload files

* upload files
 2021-02-17 16:23:58 -03:00