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
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
1763 Commits
Author SHA1 Message Date
Putnam 51100c9bf9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-20 18:38:52 -08:00
SandPoot 8582f93800 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-20 19:14:59 -03:00
Letter N 021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
SandPoot 0d1a6c73fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 23:31:15 -03:00
Putnam 158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
SandPoot e7e655112d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-14 20:21:02 -03:00
siliconsandGitHub 1df2257e61 Merge pull request #14052 from SiliconMain/baitbegone 
Update engineering.dm
 2021-01-13 22:43:01 -07:00
SiliconMainandGitHub cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
SandPoot e10c783cf0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-13 20:59:40 -03:00
siliconsandGitHub bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone 
Comments out hololocks
 2021-01-13 16:53:01 -07:00
SiliconMainandGitHub 2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00
SandPoot befd9b7e8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-10 13:32:36 -03:00
silicons 9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
siliconsandGitHub 656691912e Merge pull request #13965 from Xantholne/GoodNightDisky 
Good Night Disky
 2021-01-09 15:39:06 -07:00
silicons bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
SandPoot c79e8434cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-08 11:31:10 -03:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Putnam 186bb483b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-06 23:55:24 -08:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
Xantholne 18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
Xantholne fe4f184792 good night disky 2021-01-04 03:50:43 -07:00
SandPoot 168799038d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-04 02:05:26 -03:00
Timothy Teakettle 813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
SandPoot 2ed9583fc1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-31 16:40:19 -03:00
siliconsandGitHub da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice 
Paramed office on box + Surgery remodel
 2020-12-29 01:27:49 -07:00
SandPoot acad841ef4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-28 13:32:08 -03:00
Letter N ce5ab2f3a4 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-28 09:35:58 +08:00
Timothy Teakettle c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
raspy-on-osu 0e652cb64c init 2020-12-26 06:02:09 -05:00
silicons bff30f587b sigh 2020-12-23 09:16:16 -07:00
Chiirno 35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
Letter N abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
SandPoot 23ac8a1963 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-14 11:30:47 -03:00
MrJWhit 939d6b7ad8 goose barsign 2020-12-13 00:57:05 -05:00
SandPoot c585095ba5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-04 12:29:55 -03:00
shellspeed1 3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
Putnam3145andGitHub cd3b3e52ea Merge pull request #13662 from Citadel-Station-13/silicons-patch-3 
re-allows angel species on magic mirrors
 2020-11-18 17:51:02 -08:00
Putnam 30fb673670 Superconductivity is gone. Only rustmos now. 2020-11-17 02:35:10 -08:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
siliconsandGitHub d0f41ffa83 Update mirror.dm 2020-11-07 00:35:27 -07:00
SandPoot 7181e558b3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 02:42:29 -03:00
siliconsandGitHub 8b48cab574 Merge pull request #13233 from Hatterhat/za-hando 
[READY] za hando - a pr about ling claws and punching shit
 2020-10-10 21:59:05 -07:00
SandPoot 273ad286d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-10 14:43:38 -03:00
siliconsGitHubLetter NPutnam3145
 		19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
SandPoot 08f8360f31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-06 23:10:33 -03:00
siliconsandGitHub 3fa0bf37ff Merge pull request #13501 from Putnam3145/fix-firelocks 
Made holofirelocks work.
 2020-10-06 17:04:01 -07:00
SandPoot 8cb9f76fd2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-04 00:23:01 -03:00