cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-31 09:16:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
1006 Commits
Author SHA1 Message Date
SandPootGitHubDeltaFire
 		a0e95b7c3d Update code/modules/mining/ores_coins.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2020-12-31 16:59:33 -03:00
SandPoot 1fa828a3f7 upload files 2020-12-30 13:57:10 -03:00
Timothy Teakettle c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
SandPoot 766493cc16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-22 18:03:33 -03:00
Artur d72617e7d7 Fixes mint machine 2020-12-22 12:35:21 +02:00
SandPoot c585095ba5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-04 12:29:55 -03:00
The0bserver 4559a153c3 Map Tweak 2020-11-27 16:51:55 -05:00
The0bserver 884fbd0a52 found you. 2020-11-27 03:45:08 -05:00
SandPoot 9ef37ce51b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-23 13:51:04 -03:00
SandPoot 488a0c5a69 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-21 22:46:01 -03:00
siliconsandGitHub 75d807df4e Merge pull request #13694 from TheObserver-sys/PublicMiningRevival 
Local Assistant man can now bash rock again!*
 2020-11-21 18:25:13 -07:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
The0bserver 6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
SandPoot 7c3bbd127d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-04 22:47:02 -03:00
DeltaFire15andGitHub 91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
SandPoot b28fce9ebb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-28 13:36:59 -03:00
siliconsandGitHub 1baa3013b3 Merge pull request #13626 from zeroisthebiggay/GOD 
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
 2020-10-28 07:53:44 -07:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
zeroisthebiggayandGitHub 2c278ba370 A 
A
 2020-10-25 05:34:53 -04:00
zeroisthebiggayandGitHub 5eec2b76f5 OK MAYBE NOT INDESTRUCTIBLE 
OK
 2020-10-25 05:34:24 -04:00
zerothebigboy 6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04: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
Hatterhat 4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
Enric Gabriel 7df07d2859 Merge branch 'master' of upstream into master 2020-10-01 12:49:01 -03:00
siliconsandGitHub 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Timothy TeakettleandGitHub 106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01: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 0b427c9f6f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-15 23:32:38 -03:00
DeltaFire 9e3710bb51 kev request 
malf disk gone from the /misc chest type
 2020-09-11 23:19:55 +02:00
timothyteakettle d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00
Timothy Teakettle f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Enric Gabriel 242400a5d6 push the files 2020-09-07 20:40:03 -03:00
DeltaFire f92b68d591 oh. 2020-09-07 21:12:19 +02:00
Enric Gabriel 499fec6a16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-06 10:42:43 -03:00
siliconsandGitHub 9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
Enric Gabriel 20b25372e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-05 13:09:14 -03:00
siliconsandGitHub 7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants 
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
 2020-09-05 02:20:11 -07:00
Artur 3fb72e0fea Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-04 11:43:31 +03:00
Enric Gabriel 05485c4b2c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-03 15:26:38 -03:00
Ghommie dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
Artur debc300563 https://github.com/tgstation/tgstation/pull/53236/ 2020-09-02 18:39:00 +03:00
Artur d59748ceaa https://github.com/tgstation/tgstation/pull/53168/ 2020-09-02 18:38:47 +03:00
lolman360 05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
TrilbyspacecloneandGitHub da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
TrilbyspacecloneandGitHub 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
siliconsandGitHub 033feebcd0 Merge pull request #12957 from kappa-sama/patch-34 
removes malf disk from tendril loot
 2020-08-29 21:31:24 -07:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00