cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 13:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
183 Commits
Author SHA1 Message Date
SandPoot 76042510df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-28 19:21:39 -03:00
SandPoot cae94afdb7 push 2025-01-26 18:06:36 -03:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
Jerry WesterandKrissKr0ss 44c029176c remove signals_atom_movable.dm, revert jetpack 2023-05-01 00:19:48 -05:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Jerry Wester b52e7a5657 ion jetpack module 2022-12-14 23:36:47 -07:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
PeriodicChaosandJerry Wester 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -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
SandPoot c0e1198702 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-05 18:25:05 -03:00
LinandGitHub 2379a2a342 Merge pull request #15370 from Putnam3145/genericized-plasma-trit 
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
 2022-01-03 22:31:40 +00:00
SandPoot 72db0e8ef2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-11 17:20:05 -03:00
DeltaFire 50be57f107 grrrr 2021-12-08 18:33:06 +01:00
Putnam3145 1da28b8ec6 Chem gas tweaks, + toxins rebalance 2021-11-15 16:29:30 -08:00
SandPoot 3da59fc38c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-05 14:27:17 -03:00
silicons 186b552103 merge 2021-10-29 21:50:58 -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
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot d863f9f437 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-27 15:54:58 -03:00
Putnam 86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07:00
Putnam d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
silicons 47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -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
Putnam f1e55f2df0 Paranoid updates to maybe fix air duplication 2021-03-20 22:02:47 -07: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 2e0a50f8b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-15 10:31:43 -03:00
Letter N 59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08: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
Letter N e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Putnam 9785b996ac Removed an unfortunate add_to_active 2021-01-29 16:49:33 -08:00
SandPoot 60e78f4ac7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-26 12:27:08 -03:00
Artur 4457d568dd Tank memes finished 2021-01-20 20:25:36 +02:00